style: last few lambdas etc

Author: sbillinge

src/diffpy/srfit/fitbase/recipeorganizer.py

@@ -24,6 +24,7 @@
 
 import re
 from collections import OrderedDict
+from functools import partial
 from itertools import chain, groupby
 
 import six
@@ -741,8 +742,7 @@ def clearConstraints(self, recurse=False):
             self.unconstrain(*self._constraints)
 
         if recurse:
-            _constraint_clearer = lambda m: hasattr(m, "clearConstraints")
-            for m in filter(f, self._iterManaged()):
+            for m in filter(_has_clear_constraints, self._iterManaged()):
                 m.clearConstraints(recurse)
         return
 
@@ -822,19 +822,16 @@ def clearRestraints(self, recurse=False):
                     found there as well.
         """
         self.unrestrain(*self._restraints)
-
         if recurse:
-            f = lambda m: hasattr(m, "clearRestraints")
-            for m in filter(f, self._iterManaged()):
-                m.clearRestraints(recurse)
+            for msg in filter(_has_clear_restraints(), self._iterManaged()):
+                msg.clearRestraints(recurse)
         return
 
     def _getConstraints(self, recurse=True):
         """Get the constrained Parameters for this and managed sub-objects."""
         constraints = {}
         if recurse:
-            f = lambda m: hasattr(m, "_getConstraints")
-            for m in filter(f, self._iterManaged()):
+            for m in filter(_has_get_constraints(), self._iterManaged()):
                 constraints.update(m._getConstraints(recurse))
 
         constraints.update(self._constraints)
@@ -848,8 +845,7 @@ def _getRestraints(self, recurse=True):
         """
         restraints = set(self._restraints)
         if recurse:
-            f = lambda m: hasattr(m, "_getRestraints")
-            for m in filter(f, self._iterManaged()):
+            for m in filter(_has_get_restraints(), self._iterManaged()):
                 restraints.update(m._getRestraints(recurse))
 
         return restraints
@@ -968,15 +964,13 @@ def show(self, pattern="", textwidth=78):
             the screen width.  Do not trim when negative or 0.
         """
         regexp = re.compile(pattern)
-        pmatch = lambda s: (
-            len(s.split(None, 1)) < 2 or regexp.search(s.split(None, 1)[0])
-        )
+        _pmatch_with_re = partial(_pmatch, regexp=regexp)
         # Show sub objects and their parameters
         lines = []
         tlines = self._formatManaged()
         if tlines:
             lines.extend(["Parameters", _DASHEDLINE])
-            linesok = filter(pmatch, tlines)
+            linesok = filter(_pmatch_with_re, tlines)
             lastnotblank = False
             # squeeze repeated blank lines
             for lastnotblank, g in groupby(linesok, bool):
@@ -1002,7 +996,7 @@ def show(self, pattern="", textwidth=78):
             if lines:
                 lines.append("")
             lines.extend(["Restraints", _DASHEDLINE])
-            lines.extend(filter(pmatch, tlines))
+            lines.extend(filter(_pmatch_with_re, tlines))
 
         # Determine effective text width tw.
         tw = textwidth if (textwidth is not None and textwidth > 0) else None
@@ -1059,5 +1053,22 @@ def equationFromString(
     return eq
 
 
-def _constraint_clearer(msg):
+def _has_clear_constraints(msg):
     return hasattr(msg, "clearConstraints")
+
+
+def _has_clear_restraints(msg):
+    return hasattr(msg, "clearRestraints")
+
+
+def _has_get_restraints(msg):
+    return hasattr(msg, "_getRestraints")
+
+
+def _has_get_constraints(msg):
+    return hasattr(msg, "_getConstraints")
+
+
+def _pmatch(inp_str, regexp):
+    parts = inp_str.split(None, 1)
+    return len(parts) < 2 or regexp.search(parts[0])

src/diffpy/srfit/pdf/characteristicfunctions.py

@@ -216,8 +216,6 @@ def lognormalSphericalCF(r, psize, psig):
     if psig <= 0:
         return sphericalCF(r, psize)
 
-    erfc = lambda x: 1.0 - erf(x)
-
     sqrt2 = sqrt(2.0)
     s = sqrt(log(psig * psig / (1.0 * psize * psize) + 1))
     mu = log(psize) - s * s / 2
@@ -427,4 +425,8 @@ def __call__(self, r):
         return fr
 
 
+def erfc(x):
+    return 1.0 - erf(x)
+
+
 # End of file

src/diffpy/srfit/sas/prcalculator.py

@@ -23,6 +23,8 @@
 
 __all__ = ["PrCalculator", "CFCalculator"]
 
+from functools import partial
+
 import numpy
 
 from diffpy.srfit.fitbase import Calculator
@@ -90,12 +92,15 @@ def __call__(self, r):
         self._invertor.y = iq
         self._invertor.err = diq
         c, c_cov = self._invertor.invert_optimize()
-        l = lambda x: self._invertor.pr(c, x)
-        pr = map(l, r)
+        _inverted_w_c = partial(self._inverted, c=c)
+        pr = map(_inverted_w_c, r)
 
         pr = numpy.array(pr)
         return self.scale.value * pr
 
+    def _inverted(self, x, c):
+        self._invertor.pr(c, x)
+
 
 # End class PrCalculator
 

tests/test_contribution.py

@@ -170,8 +170,7 @@ def test_releaseOldEquations(self):
     def test_registerFunction(self):
         """Ensure registered function works after second setEquation call."""
         fc = self.fitcontribution
-        fsquare = lambda x: x**2
-        fc.registerFunction(fsquare, name="fsquare")
+        fc.registerFunction(_fsquare, name="fsquare")
         fc.setEquation("fsquare")
         fc.x.setValue(5)
         self.assertEqual(25, fc.evaluate())
@@ -184,6 +183,10 @@ def test_registerFunction(self):
         return
 
 
+def _fsquare(x):
+    return x**2
+
+
 def testResidual(noObserversInGlobalBuilders):
     """Test the residual, which requires all other methods."""
     gen = ProfileGenerator("test")