Refactors Log operation

Author: DrPaulSharp

sasdata/quantities/quantity.py

@@ -713,27 +713,52 @@ def _clean_ab(self, a, b):
             return Div(a, b)
 
 
-class Log(BinaryOperation):
+class Log(Operation):
 
     serialisation_name = "log"
 
+    def __init__(self, a: Operation, base: float):
+        self.a = a
+        self.base = base
+
     def evaluate(self, variables: dict[int, T]) -> Operation:
-        return log(self.a.evaluate(variables), self.b.evaluate(variables))
+        return log(self.a.evaluate(variables), self.base)
 
     def _derivative(self, hash_value: int) -> Operation:
-        return Inv(Mul(self.a, Ln(self.b)))
+        return Inv(Mul(self.a, Ln(Constant(self.base))))
+
+    def _clean_ab(self) -> Operation:
+        a = self.a._clean()
 
-    def _clean_ab(self, a, b):
         if isinstance(a, MultiplicativeIdentity):
             # Convert log(1) to 0
             return AdditiveIdentity()
 
-        elif a == b:
-            # Convert log(b) to 1
+        elif a == self.base:
+            # Convert log(base) to 1
             return MultiplicativeIdentity()
 
         else:
-            return Log(a, b)
+            return Log(a, self.base)
+
+    def _serialise_parameters(self) -> dict[str, Any]:
+        return {"a": Operation._serialise_json(self.a),
+                "base": self.base}
+
+    @staticmethod
+    def _deserialise(parameters: dict) -> "Operation":
+        return Log(Operation.deserialise_json(parameters["a"]), parameters["base"])
+
+    def summary(self, indent_amount: int=0, indent="  "):
+        return (f"{indent_amount*indent}Log(\n" +
+                self.a.summary(indent_amount+1, indent) + "\n" +
+                f"{(indent_amount+1)*indent}{self.base}\n" +
+                f"{indent_amount*indent})")
+
+    def __eq__(self, other):
+        if isinstance(other, Log):
+            return self.a == other.a and self.base == other.base
+        return False
 
 
 class Pow(Operation):

test/quantities/utest_operations.py

@@ -31,7 +31,7 @@
                     Add(
                         Neg(Inv(MultiplicativeIdentity())),
                         Ln(Transpose(Variable("x")))),
-                    Log(Constant(7), Constant(2))),
+                    Log(Constant(7), 2)),
                 AdditiveIdentity()),
             2),
         Variable("y"))
@@ -69,7 +69,7 @@ def test_unary_summary(op):
 
 @pytest.mark.parametrize("op", [Add, Div, Dot, Log, MatMul, Mul, Pow, Sub])
 def test_binary_summary(op):
-    f = op(Constant(1), 1 if op == Pow else Constant(1))
+    f = op(Constant(1), 1 if op == Log or op == Pow else Constant(1))
     assert f.summary() == f"{op.__name__}(\n  1\n  1\n)"
 
 
@@ -114,7 +114,7 @@ def test_unary_evaluation(op, a, result):
     (Log, 100, 10, 2),
     (Log, 256, 2, 8)])
 def test_binary_evaluation(op, a, b, result):
-    f = op(Constant(a), b if op == Pow else Constant(b))
+    f = op(Constant(a), b if op == Log or op == Pow else Constant(b))
     assert f.evaluate({}) == result
 
 @pytest.mark.parametrize("op, a, b, result", [