Changeset d15a908 in sasmodels for sasmodels/compare.py

Timestamp:

Jan 27, 2016 5:35:15 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fdc538a

Parents:

37a7252

Message:

doc and delint

File:

• sasmodels/compare.py (modified) (15 diffs)

sasmodels/compare.py

@@ -72 +72 @@
 # doc string so that we can display it at run time if there is an error.
 # lin
-__doc__ = __doc__ + """
+__doc__ = (__doc__  # pylint: disable=redefined-builtin
+           + """
 Program description
 -------------------
 
-""" + USAGE
+"""
+           + USAGE)
 
 
@@ -281 +283 @@
             theory = lambda: smearer.get_value()
         else:
-            theory = lambda: model.evalDistribution([data.qx_data[index], data.qy_data[index]])
+            theory = lambda: model.evalDistribution([data.qx_data[index],
+                                                     data.qy_data[index]])
     elif smearer is not None:
         theory = lambda: smearer(model.evalDistribution(data.x))
@@ -416 +419 @@
         try:
             base_value, base_time = time_calculation(base, pars, Nbase)
-            print("%s t=%.1f ms, intensity=%.0f"%(base.engine, base_time, sum(base_value)))
+            print("%s t=%.1f ms, intensity=%.0f"
+                  % (base.engine, base_time, sum(base_value)))
         except ImportError:
             traceback.print_exc()
@@ -426 +430 @@
         try:
             comp_value, comp_time = time_calculation(comp, pars, Ncomp)
-            print("%s t=%.1f ms, intensity=%.0f"%(comp.engine, comp_time, sum(comp_value)))
+            print("%s t=%.1f ms, intensity=%.0f"
+                  % (comp.engine, comp_time, sum(comp_value)))
         except ImportError:
             traceback.print_exc()
@@ -433 +438 @@
     # Compare, but only if computing both forms
     if Nbase > 0 and Ncomp > 0:
-        #print("speedup %.2g"%(comp_time/base_time))
-        #print("max |base/comp|", max(abs(base_value/comp_value)), "%.15g"%max(abs(base_value)), "%.15g"%max(abs(comp_value)))
-        #comp *= max(base_value/comp_value)
         resid = (base_value - comp_value)
         relerr = resid/comp_value
-        _print_stats("|%s-%s|"%(base.engine, comp.engine) + (" "*(3+len(comp.engine))),
+        _print_stats("|%s-%s|"
+                     % (base.engine, comp.engine) + (" "*(3+len(comp.engine))),
                      resid)
-        _print_stats("|(%s-%s)/%s|"%(base.engine, comp.engine, comp.engine),
+        _print_stats("|(%s-%s)/%s|"
+                     % (base.engine, comp.engine, comp.engine),
                      relerr)
 
@@ -591 +595 @@
     invalid = [o[1:] for o in flags
                if o[1:] not in NAME_OPTIONS
-                   and not any(o.startswith('-%s='%t) for t in VALUE_OPTIONS)]
+               and not any(o.startswith('-%s='%t) for t in VALUE_OPTIONS)]
     if invalid:
         print("Invalid options: %s"%(", ".join(invalid)))
@@ -597 +601 @@
 
 
+    # pylint: disable=bad-whitespace
     # Interpret the flags
     opts = {
@@ -651 +656 @@
         elif arg == '-sasview': engines.append(arg[1:])
         elif arg == '-edit':    opts['explore'] = True
+    # pylint: enable=bad-whitespace
 
     if len(engines) == 0:
@@ -675 +681 @@
     presets = {}
     for arg in values:
-        k,v = arg.split('=',1)
+        k, v = arg.split('=', 1)
         if k not in pars:
             # extract base name without polydispersity info
             s = set(p.split('_pd')[0] for p in pars)
-            print("%r invalid; parameters are: %s"%(k,", ".join(sorted(s))))
+            print("%r invalid; parameters are: %s"%(k, ", ".join(sorted(s))))
             sys.exit(1)
         presets[k] = float(v) if not k.endswith('type') else v
@@ -697 +703 @@
 
     # Create the computational engines
-    data, _index = make_data(opts)
+    data, _ = make_data(opts)
     if n1:
         base = make_engine(model_definition, data, engines[0], opts['cutoff'])
@@ -707 +713 @@
         comp = None
 
+    # pylint: disable=bad-whitespace
     # Remember it all
     opts.update({
@@ -718 +725 @@
         'engines'   : [base, comp],
     })
+    # pylint: enable=bad-whitespace
 
     return opts
 
-def main():
-    opts = parse_opts()
-    if opts['explore']:
-        explore(opts)
-    else:
-        compare(opts)
-
 def explore(opts):
+    """
+    Explore the model using the Bumps GUI.
+    """
     import wx
     from bumps.names import FitProblem
@@ -734 +738 @@
 
     problem = FitProblem(Explore(opts))
-    isMac = "cocoa" in wx.version()
+    is_mac = "cocoa" in wx.version()
     app = wx.App()
     frame = AppFrame(parent=None, title="explore")
-    if not isMac: frame.Show()
+    if not is_mac: frame.Show()
     frame.panel.set_model(model=problem)
     frame.panel.Layout()
     frame.panel.aui.Split(0, wx.TOP)
-    if isMac: frame.Show()
+    if is_mac: frame.Show()
     app.MainLoop()
 
 class Explore(object):
     """
-    Return a bumps wrapper for a SAS model comparison.
+    Bumps wrapper for a SAS model comparison.
+
+    The resulting object can be used as a Bumps fit problem so that
+    parameters can be adjusted in the GUI, with plots updated on the fly.
     """
     def __init__(self, opts):
@@ -787 +794 @@
         Return cost.
         """
+        # pylint: disable=no-self-use
         return 0.  # No nllf
 
@@ -804 +812 @@
 
 
+def main():
+    """
+    Main program.
+    """
+    opts = parse_opts()
+    if opts['explore']:
+        explore(opts)
+    else:
+        compare(opts)
+
 if __name__ == "__main__":
     main()