__eval_binary

Author: cadenmyers13

src/diffpy/srfit/equation/builder.py

@@ -332,7 +332,7 @@ def _prepare_builders(self, eqstr, buildargs, argclass, argkw):
         Returns a dictionary of the name, BaseBuilder pairs.
         """
 
-        eqargs = self._getUndefinedArgs(eqstr)
+        eqargs = self._get_undefined_args(eqstr)
 
         # Raise an error if there are arguments that need to be created, but
         # this is disallowed.
@@ -353,7 +353,7 @@ def _prepare_builders(self, eqstr, buildargs, argclass, argkw):
 
         return
 
-    def _getUndefinedArgs(self, eqstr):
+    def _get_undefined_args(self, eqstr):
         """Get the undefined arguments from eqstr.
 
         This tokenizes eqstr and extracts undefined arguments. An
@@ -441,7 +441,7 @@ def getEquation(self):
         eq = Equation(name, self.literal)
         return eq
 
-    def __evalBinary(self, other, OperatorClass, onleft=True):
+    def __eval_binary(self, other, OperatorClass, onleft=True):
         """Evaluate a binary function.
 
         Other can be an BaseBuilder or a constant.
@@ -488,28 +488,30 @@ def __evalUnary(self, OperatorClass):
         return opbuilder
 
     def __add__(self, other):
-        return self.__evalBinary(other, literals.AdditionOperator)
+        return self.__eval_binary(other, literals.AdditionOperator)
 
     def __radd__(self, other):
-        return self.__evalBinary(other, literals.AdditionOperator, False)
+        return self.__eval_binary(other, literals.AdditionOperator, False)
 
     def __sub__(self, other):
-        return self.__evalBinary(other, literals.SubtractionOperator)
+        return self.__eval_binary(other, literals.SubtractionOperator)
 
     def __rsub__(self, other):
-        return self.__evalBinary(other, literals.SubtractionOperator, False)
+        return self.__eval_binary(other, literals.SubtractionOperator, False)
 
     def __mul__(self, other):
-        return self.__evalBinary(other, literals.MultiplicationOperator)
+        return self.__eval_binary(other, literals.MultiplicationOperator)
 
     def __rmul__(self, other):
-        return self.__evalBinary(other, literals.MultiplicationOperator, False)
+        return self.__eval_binary(
+            other, literals.MultiplicationOperator, False
+        )
 
     def __truediv__(self, other):
-        return self.__evalBinary(other, literals.DivisionOperator)
+        return self.__eval_binary(other, literals.DivisionOperator)
 
     def __rtruediv__(self, other):
-        return self.__evalBinary(other, literals.DivisionOperator, False)
+        return self.__eval_binary(other, literals.DivisionOperator, False)
 
     # Python 2 Compatibility -------------------------------------------------
 
@@ -520,16 +522,18 @@ def __rtruediv__(self, other):
     # ------------------------------------------------------------------------
 
     def __pow__(self, other):
-        return self.__evalBinary(other, literals.ExponentiationOperator)
+        return self.__eval_binary(other, literals.ExponentiationOperator)
 
     def __rpow__(self, other):
-        return self.__evalBinary(other, literals.ExponentiationOperator, False)
+        return self.__eval_binary(
+            other, literals.ExponentiationOperator, False
+        )
 
     def __mod__(self, other):
-        return self.__evalBinary(other, literals.RemainderOperator)
+        return self.__eval_binary(other, literals.RemainderOperator)
 
     def __rmod__(self, other):
-        return self.__evalBinary(other, literals.RemainderOperator, False)
+        return self.__eval_binary(other, literals.RemainderOperator, False)
 
     def __neg__(self):
         return self.__evalUnary(literals.NegationOperator)