Fix lint check errors on calculatorand testfitrecipe.py

Author: stevenhua0320

src/diffpy/srfit/fitbase/calculator.py

@@ -29,6 +29,7 @@
 from diffpy.srfit.fitbase.parameterset import ParameterSet
 from diffpy.srfit.equation.literals.operators import Operator
 
+
 class Calculator(Operator, ParameterSet):
     """Base class for calculators.
 
@@ -75,12 +76,10 @@ def __init__(self, name):
         Operator.__init__(self, name)
         return
 
-
     @property
     def symbol(self):
         return self.name
 
-
     # Overload me!
     def __call__(self, *args):
         """Calculate something.
@@ -92,12 +91,10 @@ def __call__(self, *args):
         """
         return 0
 
-
     def operation(self, *args):
         self._value = self.__call__(*args)
         return self._value
 
-
     def _validate(self):
         """Validate my state.
 

src/diffpy/srfit/tests/testfitrecipe.py

@@ -53,8 +53,8 @@ def testFixFree(self):
         recipe = self.recipe
         con = self.fitcontribution
 
-        recipe.addVar(con.A, 2, tag = "tagA")
-        recipe.addVar(con.k, 1, tag = "tagk")
+        recipe.addVar(con.A, 2, tag="tagA")
+        recipe.addVar(con.k, 1, tag="tagk")
         recipe.addVar(con.c, 0)
         recipe.newVar("B", 0)
 
@@ -78,7 +78,7 @@ def testFixFree(self):
         self.assertTrue(recipe.isFree(recipe.k))
         self.assertTrue(recipe.isFree(recipe.c))
         self.assertTrue(recipe.isFree(recipe.B))
-        recipe.fix(recipe.A, "tagk", c = 3)
+        recipe.fix(recipe.A, "tagk", c=3)
         self.assertFalse(recipe.isFree(recipe.A))
         self.assertFalse(recipe.isFree(recipe.k))
         self.assertFalse(recipe.isFree(recipe.c))
@@ -91,7 +91,7 @@ def testFixFree(self):
         self.assertFalse(recipe.isFree(recipe.B))
 
         self.assertRaises(ValueError, recipe.free, "junk")
-        self.assertRaises(ValueError, recipe.fix, tagA = 1)
+        self.assertRaises(ValueError, recipe.fix, tagA=1)
         self.assertRaises(ValueError, recipe.fix, "junk")
         return
 
@@ -143,7 +143,6 @@ def testVars(self):
         self.assertTrue(2 in values)
         return
 
-
     def testResidual(self):
         """Test the residual and everything that can change it."""
 
@@ -156,13 +155,13 @@ def testResidual(self):
         y = sin(x+1)
         self.recipe.cont.c.setValue(1)
         res = self.recipe.residual()
-        self.assertTrue( array_equal(y-self.profile.y, res) )
+        self.assertTrue(array_equal(y-self.profile.y, res))
 
         # Try some constraints
         # Make c = 2*A, A = Avar
         var = self.recipe.newVar("Avar")
-        self.recipe.constrain(self.fitcontribution.c, "2*A",
-                {"A" : self.fitcontribution.A})
+        self.recipe.constrain(self.fitcontribution.c,
+                              "2*A", {"A": self.fitcontribution.A})
         self.assertEqual(2, self.fitcontribution.c.value)
         self.recipe.constrain(self.fitcontribution.A, var)
         self.assertEqual(1, var.getValue())
@@ -173,39 +172,39 @@ def testResidual(self):
         x = self.profile.x
         y = sin(x+2)
         res = self.recipe.residual()
-        self.assertTrue( array_equal(y-self.profile.y, res) )
+        self.assertTrue(array_equal(y-self.profile.y, res))
 
         # Now try some restraints. We want c to be exactly zero. It should give
         # a penalty of (c-0)**2, which is 4 in this case
         r1 = self.recipe.restrain(self.fitcontribution.c, 0, 0, 1)
         self.recipe._ready = False
         res = self.recipe.residual()
         chi2 = 4 + dot(y - self.profile.y, y - self.profile.y)
-        self.assertAlmostEqual(chi2, dot(res, res) )
+        self.assertAlmostEqual(chi2, dot(res, res))
 
         # Clear the constraint and restore the value of c to 0. This should
         # give us chi2 = 0 again.
         self.recipe.unconstrain(self.fitcontribution.c)
         self.fitcontribution.c.setValue(0)
         res = self.recipe.residual([self.recipe.cont.A.getValue()])
         chi2 = 0
-        self.assertAlmostEqual(chi2, dot(res, res) )
+        self.assertAlmostEqual(chi2, dot(res, res))
 
         # Remove the restraint and variable
         self.recipe.unrestrain(r1)
         self.recipe.delVar(self.recipe.Avar)
         self.recipe._ready = False
         res = self.recipe.residual()
         chi2 = 0
-        self.assertAlmostEqual(chi2, dot(res, res) )
+        self.assertAlmostEqual(chi2, dot(res, res))
 
         # Add constraints at the fitcontribution level.
         self.fitcontribution.constrain(self.fitcontribution.c, "2*A")
         # This should evaluate to sin(x+2)
         x = self.profile.x
         y = sin(x+2)
         res = self.recipe.residual()
-        self.assertTrue( array_equal(y-self.profile.y, res) )
+        self.assertTrue(array_equal(y-self.profile.y, res))
 
         # Add a restraint at the fitcontribution level.
         r1 = self.fitcontribution.restrain(self.fitcontribution.c, 0, 0, 1)
@@ -215,7 +214,7 @@ def testResidual(self):
         x = self.profile.x
         y = sin(x+2)
         chi2 = 4 + dot(y - self.profile.y, y - self.profile.y)
-        self.assertAlmostEqual(chi2, dot(res, res) )
+        self.assertAlmostEqual(chi2, dot(res, res))
 
         # Remove those
         self.fitcontribution.unrestrain(r1)
@@ -224,7 +223,7 @@ def testResidual(self):
         self.fitcontribution.c.setValue(0)
         res = self.recipe.residual()
         chi2 = 0
-        self.assertAlmostEqual(chi2, dot(res, res) )
+        self.assertAlmostEqual(chi2, dot(res, res))
 
         # Now try to use the observed profile inside of the equation
         # Set the equation equal to the data
@@ -239,7 +238,6 @@ def testResidual(self):
 
         return
 
-
     def testPrintFitHook(self):
         "check output from default PrintFitHook."
         self.recipe.addVar(self.fitcontribution.c)
@@ -266,5 +264,6 @@ def testPrintFitHook(self):
 
 # ----------------------------------------------------------------------------
 
+
 if __name__ == "__main__":
     unittest.main()