style: line lengths in src

Author: sbillinge

src/diffpy/srfit/fitbase/fithook.py

@@ -144,13 +144,17 @@ def postcall(self, recipe, chiv):
             print("Variables")
             vnames = recipe.getNames()
             vals = recipe.getValues()
-            byname = lambda nv: sortKeyForNumericString(nv[0])
-            items = sorted(zip(vnames, vals), key=byname)
+            # byname = _byname()
+            items = sorted(zip(vnames, vals), key=_byname)
             for name, val in items:
                 print("  %s = %f" % (name, val))
         return
 
 
+def _byname(nv):
+    return sortKeyForNumericString(nv[0])
+
+
 # End class PrintFitHook
 
 

src/diffpy/srfit/fitbase/fitresults.py

@@ -108,8 +108,8 @@ def __init__(self, recipe, update=True, showfixed=True, showcon=False):
 
     def update(self):
         """Update the results according to the current state of the recipe."""
-        ## Note that the order of these operations are chosen to reduce
-        ## computation time.
+        # Note that the order of these operations are chosen to reduce
+        # computation time.
 
         recipe = self.recipe
 
@@ -173,8 +173,8 @@ def _calculateCovariance(self):
             self.cov = numpy.dot(vh.T.conj() / s**2, vh)
         except numpy.linalg.LinAlgError:
             self.messages.append("Cannot compute covariance matrix.")
-            l = len(self.varvals)
-            self.cov = numpy.zeros((l, l), dtype=float)
+            lvarvals = len(self.varvals)
+            self.cov = numpy.zeros((lvarvals, lvarvals), dtype=float)
         return
 
     def _calculateJacobian(self):
@@ -324,17 +324,19 @@ def formatResults(self, header="", footer="", update=False):
             lines.append(header)
 
         if not certain:
-            l = "Some quantities invalid due to missing profile uncertainty"
-            if not l in self.messages:
-                self.messages.append(l)
+            err_msg = (
+                "Some quantities invalid due to missing profile uncertainty"
+            )
+            if err_msg not in self.messages:
+                self.messages.append(err_msg)
 
         lines.extend(self.messages)
 
-        ## Overall results
-        l = "Overall"
+        # Overall results
+        err_msg = "Overall"
         if not certain:
-            l += " (Chi2 and Reduced Chi2 invalid)"
-        lines.append(l)
+            err_msg += " (Chi2 and Reduced Chi2 invalid)"
+        lines.append(err_msg)
         lines.append(_DASHEDLINE)
         formatstr = "%-14s %.8f"
         lines.append(formatstr % ("Residual", self.residual))
@@ -346,16 +348,16 @@ def formatResults(self, header="", footer="", update=False):
         lines.append(formatstr % ("Reduced Chi2", self.rchi2))
         lines.append(formatstr % ("Rw", self.rw))
 
-        ## Per-FitContribution results
+        # Per-FitContribution results
         if len(self.conresults) > 1:
             keys = list(self.conresults.keys())
             keys.sort(key=numstr)
 
             lines.append("")
-            l = "Contributions"
+            err_msg = "Contributions"
             if not certain:
-                l += " (Chi2 and Reduced Chi2 invalid)"
-            lines.append(l)
+                err_msg += " (Chi2 and Reduced Chi2 invalid)"
+            lines.append(err_msg)
             lines.append(_DASHEDLINE)
             formatstr = "%-10s %-42.8f"
             for name in keys:
@@ -368,14 +370,14 @@ def formatResults(self, header="", footer="", update=False):
                 lines.append(formatstr % ("Chi2", res.chi2))
                 lines.append(formatstr % ("Rw", res.rw))
 
-        ## The variables
+        # The variables
         if self.varnames:
             lines.append("")
-            l = "Variables"
+            err_msg = "Variables"
             if not certain:
-                m = "Uncertainties invalid"
-                l += " (%s)" % m
-            lines.append(l)
+                err_msg2 = "Uncertainties invalid"
+                err_msg += " (%s)" % err_msg2
+            lines.append(err_msg)
             lines.append(_DASHEDLINE)
 
             varnames = self.varnames
@@ -407,13 +409,13 @@ def formatResults(self, header="", footer="", update=False):
             varlines.sort()
             lines.extend(varlines)
 
-        ## The constraints
+        # The constraints
         if self.connames and self.showcon:
             lines.append("")
-            l = "Constrained Parameters"
+            err_msg = "Constrained Parameters"
             if not certain:
-                l += " (Uncertainties invalid)"
-            lines.append(l)
+                err_msg += " (Uncertainties invalid)"
+            lines.append(err_msg)
             lines.append(_DASHEDLINE)
 
             w = 0
@@ -436,13 +438,13 @@ def formatResults(self, header="", footer="", update=False):
                 val, unc = vals[name]
                 lines.append(formatstr % (name, val, unc))
 
-        ## Variable correlations
+        # Variable correlations
         lines.append("")
         corint = int(corrmin * 100)
-        l = "Variable Correlations greater than %i%%" % corint
+        err_msg = "Variable Correlations greater than %i%%" % corint
         if not certain:
-            l += " (Correlations invalid)"
-        lines.append(l)
+            err_msg += " (Correlations invalid)"
+        lines.append(err_msg)
         lines.append(_DASHEDLINE)
         tup = []
         cornames = []
@@ -563,8 +565,8 @@ def __init__(self, con, weight, fitres):
 
     def _init(self, con, weight, fitres):
         """Initialize the attributes, for real."""
-        ## Note that the order of these operations is chosen to reduce
-        ## computation time.
+        # Note that the order of these operations is chosen to reduce
+        # computation time.
 
         if con.profile is None:
             return

src/diffpy/srfit/fitbase/parameter.py

@@ -253,17 +253,18 @@ def __init__(self, name, obj, getter=None, setter=None, attr=None):
         name    --  The name of this Parameter.
         obj     --  The object to be wrapped.
         getter  --  The unbound function that can be used to access the
-                    attribute containing the parameter value. getter(obj) should
-                    return the Parameter value.  If getter is None (default),
-                    it is assumed that an attribute is accessed via attr. If
-                    attr is also specified, then the Parameter value will be
-                    accessed via getter(obj, attr).
-        setter  --  The unbound function that can be used to modify the
-                    attribute containing the parameter value. setter(obj, value)
-                    should set the attribute to the passed value. If setter is
-                    None (default), it is assumed that an attribute is accessed
+                    attribute containing the parameter value. getter(obj)
+                    should return the Parameter value.  If getter is None
+                    (default), it is assumed that an attribute is accessed
                     via attr. If attr is also specified, then the Parameter
-                    value will be set via setter(obj, attr, value).
+                    value will be accessed via getter(obj, attr).
+        setter  --  The unbound function that can be used to modify the
+                    attribute containing the parameter value.
+                    setter(obj, value) should set the attribute to the
+                    passed value. If setter is None (default), it is assumed
+                    that an attribute is accessed via attr. If attr is also
+                    specified, then the Parameter value will be set via
+                    setter(obj, attr, value).
         attr    --  The name of the attribute that contains the value of the
                     parameter. If attr is None (default), then both getter and
                     setter must be specified.

src/diffpy/srfit/fitbase/profile.py

@@ -47,8 +47,8 @@ class Profile(Observable, Validatable):
     xobs    --  Read-only property of _xobs.
     _yobs   --  A numpy array of the observed signal (default None)
     yobs    --  Read-only property of _yobs.
-    _dyobs  --  A numpy array of the uncertainty of the observed signal (default
-                None, optional).
+    _dyobs  --  A numpy array of the uncertainty of the observed signal
+                (default None, optional).
     dyobs   --  Read-only property of _dyobs.
     x       --  A numpy array of the calculated independent variable (default
                 None, property for xpar accessors).

src/diffpy/srfit/fitbase/profilegenerator.py

@@ -111,7 +111,7 @@ def __call__(self, x):
         """
         return x
 
-    ## No need to overload anything below here
+    # No need to overload anything below here
 
     def operation(self):
         """Evaluate the profile.

src/diffpy/srfit/fitbase/profileparser.py

@@ -34,7 +34,8 @@ class ProfileParser(object):
     _format     --  Name of the data format that this parses (string, default
                     ""). The format string is a unique identifier for the data
                     format handled by the parser.
-    _banks      --  The data from each bank. Each bank contains a (x, y, dx, dy)
+    _banks      --  The data from each bank. Each bank contains a (x, y, dx,
+                    dy)
                     tuple:
                     x       --  A numpy array containing the independent
                                 variable read from the file.

src/diffpy/srfit/fitbase/recipeorganizer.py

@@ -510,7 +510,7 @@ def registerFunction(self, f, name=None, argnames=None):
             self._eqfactory.registerOperator(name, f)
             return f
 
-        #### Introspection code
+        # Introspection code
         if name is None or argnames is None:
 
             import inspect
@@ -547,7 +547,7 @@ def registerFunction(self, f, name=None, argnames=None):
                 argnames = list(fncode.co_varnames)
                 argnames = argnames[offset : fncode.co_argcount]
 
-        #### End introspection code
+        # End introspection code
 
         # Make missing Parameters
         for pname in argnames:
@@ -741,7 +741,7 @@ def clearConstraints(self, recurse=False):
             self.unconstrain(*self._constraints)
 
         if recurse:
-            f = lambda m: hasattr(m, "clearConstraints")
+            _constraint_clearer = lambda m: hasattr(m, "clearConstraints")
             for m in filter(f, self._iterManaged()):
                 m.clearConstraints(recurse)
         return
@@ -1057,3 +1057,7 @@ def equationFromString(
         factory.deRegisterBuilder(name)
 
     return eq
+
+
+def _constraint_clearer(msg):
+    return hasattr(msg, "clearConstraints")

src/diffpy/srfit/interface/__init__.py

@@ -20,16 +20,14 @@
 """
 
 
-from diffpy.srfit.interface.interface import ParameterInterface
+from diffpy.srfit.interface.interface import (
+    FitRecipeInterface,
+    ParameterInterface,
+    RecipeOrganizerInterface,
+)
 
 _parameter_interface = ParameterInterface
-
-from diffpy.srfit.interface.interface import RecipeOrganizerInterface
-
 _recipeorganizer_interface = RecipeOrganizerInterface
-
-from diffpy.srfit.interface.interface import FitRecipeInterface
-
 _fitrecipe_interface = FitRecipeInterface
 
 # End of file

src/diffpy/srfit/pdf/pdfparser.py

@@ -38,15 +38,15 @@ class PDFParser(ProfileParser):
     _format     --  Name of the data format that this parses (string, default
                     ""). The format string is a unique identifier for the data
                     format handled by the parser.
-    _banks      --  The data from each bank. Each bank contains a (x, y, dx, dy)
-                    tuple:
+    _banks      --  The data from each bank. Each bank contains a
+                    (x, y, dx, dy) tuple:
                     x       --  A numpy array containing the independent
                                 variable read from the file.
                     y       --  A numpy array containing the profile
                                 from the file.
                     dx      --  A numpy array containing the uncertainty in x
-                                read from the file. This is 0 if the uncertainty
-                                cannot be read.
+                                read from the file. This is 0 if the
+                                uncertainty cannot be read.
                     dy      --  A numpy array containing the uncertainty read
                                 from the file. This is 0 if the uncertainty
                                 cannot be read.

src/diffpy/srfit/sas/sasparser.py

@@ -36,15 +36,15 @@ class SASParser(ProfileParser):
     _format     --  Name of the data format that this parses (string, default
                     ""). The format string is a unique identifier for the data
                     format handled by the parser.
-    _banks      --  The data from each bank. Each bank contains a (x, y, dx, dy)
-                    tuple:
+    _banks      --  The data from each bank. Each bank contains a
+                    (x, y, dx, dy) tuple:
                     x       --  A numpy array containing the independent
                                 variable read from the file.
                     y       --  A numpy array containing the profile
                                 from the file.
                     dx      --  A numpy array containing the uncertainty in x
-                                read from the file. This is 0 if the uncertainty
-                                cannot be read.
+                                read from the file. This is 0 if the
+                                uncertainty cannot be read.
                     dy      --  A numpy array containing the uncertainty read
                                 from the file. This is 0 if the uncertainty
                                 cannot be read.