refactor(MO): Separate value and tree in MOs

mapytex/calculus/core/MO/fraction.py

@@ -32,18 +32,20 @@ class MOFraction(MO):
         >>> f
         <MOFraction - 2 / 3>
         """
-        base_value = Tree("/",
-                          MO.factory(numerator),
-                          MO.factory(denominator),
+        _numerator = MO.factory(numerator)
+        _denominator = MO.factory(denominator)
+        base_tree = Tree("/",
+                          _numerator,
+                          _denominator,
                          )
         if negative:
-            value = Tree("-", None, base_value)
+            tree = Tree("-", None, base_tree)
         else:
-            value = base_value
-        MO.__init__(self, value)
+            tree = base_tree
+        MO.__init__(self, tree)
 
-        self._numerator = numerator
-        self._denominator = denominator
+        self._numerator = _numerator
+        self._denominator = _denominator
         self.negative = negative
 
     @property

mapytex/calculus/core/MO/mo.py

@@ -42,8 +42,10 @@ class MO(object):
 
     """MO for math object
 
-    This base class is representing int and Decimal. It stocks its value in
-    self.value and it
+    This base class is representing int and Decimal. 
+    
+    :attr value: sympy compatible version of the MO
+    :attr _tree: tree version of the MO
 
     """
 
@@ -60,9 +62,9 @@ class MO(object):
         <MO 3>
         """
         try:
-            self.value = value.value
+            self._tree = value._tree
         except AttributeError:
-            self.value = value
+            self._tree = value
 
         self.is_scalar = True
 
@@ -100,31 +102,31 @@ class MO(object):
         return f"<{self.__class__.__name__} {self.__txt__}>"
 
     def __str__(self):
-        return str(self.value)
+        return str(self._tree)
 
     @property
     def __txt__(self):
         try:
-            return tree2txt(self.value)
+            return tree2txt(self._tree)
         except AttributeError:
-            return str(self.value)
+            return str(self._tree)
 
     @property
     def __tex__(self):
         try:
-            return tree2tex(self.value)
+            return tree2tex(self._tree)
         except AttributeError:
-            return str(self.value)
+            return str(self._tree)
 
     def __hash__(self):
-        return self.value.__hash__()
+        return self._tree.__hash__()
 
     def __eq__(self, other):
         """ == a MOnumber """
         try:
-            return self.value == other.value
+            return self._tree == other._tree
         except AttributeError:
-            return self.value == other
+            return self._tree == other
 
 @total_ordering
 class MOnumber(MO):
@@ -154,17 +156,19 @@ class MOnumber(MO):
 
         """
         try:
-            val = value.value
+            val = value._tree
         except AttributeError:
             val = value
 
         if isinstance(val, (int, Decimal)):
-            MO.__init__(self, value)
+            MO.__init__(self, val)
         elif isinstance(val, float):
             MO.__init__(self, Decimal(val))
         else:
             raise MOError("The value of an MOnumber need to be a int, a float or a Decimal")
 
+        self.value = self._tree
+
     @property
     def __txt__(self):
         if self.value >= 0:
@@ -179,90 +183,6 @@ class MOnumber(MO):
 
         return f"- {abs(self.value)}"
 
-    def  __add__(self, other):
-        """ Adding a MOnumber """
-        try:
-            return self.value + other.value
-        except AttributeError:
-            return self.value + other
-
-    def  __radd__(self, other):
-        """ rAdding a MOnumber """
-        try:
-            return self.value + other.value
-        except AttributeError:
-            return self.value + other
-
-    def  __sub__(self, other):
-        """ Subing a MOnumber """
-        try:
-            return self.value - other.value
-        except AttributeError:
-            return self.value - other
-
-    def  __rsub__(self, other):
-        """ rSubing a MOnumber """
-        try:
-            return self.value - other.value
-        except AttributeError:
-            return self.value - other
-
-    def  __mul__(self, other):
-        """ Multiply a MOnumber """
-        try:
-            return self.value * other.value
-        except AttributeError:
-            return self.value * other
-
-    def  __rmul__(self, other):
-        """ rMultiply a MOnumber """
-        try:
-            return self.value * other.value
-        except AttributeError:
-            return self.value * other
-
-    def  __truediv__(self, other):
-        """ Divide a MOnumber """
-        try:
-            return self.value / other.value
-        except AttributeError:
-            return self.value / other
-
-    def  __rtruediv__(self, other):
-        """ rDivide a MOnumber """
-        try:
-            return self.value / other.value
-        except AttributeError:
-            return self.value / other
-
-    def  __floordiv__(self, other):
-        """ Integer Division a MOnumber """
-        try:
-            return self.value // other.value
-        except AttributeError:
-            return self.value // other
-
-    def  __rfloordiv__(self, other):
-        """ rInteger Division a MOnumber """
-        try:
-            return other.value // self.value
-        except AttributeError:
-            return other // self.value
-
-    def  __mod__(self, other):
-        """ Moduling a MOnumber """
-        try:
-            return self.value % other.value
-        except AttributeError:
-            return self.value % other
-
-    def  __rmod__(self, other):
-        """ rModuling a MOnumber """
-        try:
-            return other.value % self.value
-        except AttributeError:
-            return other % self.value
-
     def __lt__(self, other):
         """ < a MOnumber """
         try:
@@ -300,7 +220,7 @@ class MOstr(MO):
 
         """
         try:
-            val = value.value
+            val = value._tree
         except AttributeError:
             val = value
 

mapytex/calculus/core/MO/monomial.py

@@ -55,15 +55,15 @@ class MOstrPower(MO):
         _power = MO.factory(power)
         if power <= 1:
             raise MOError("The power of a MOstrPower should be greater than 1")
-        elif not isinstance(_power.value, int):
+        elif not isinstance(_power._tree, int):
             raise MOError("The power of a monomial should be a integer")
         self._power = _power
  
-        value = Tree("^",
+        _tree = Tree("^",
                      self._variable,
                      self._power
                     )
-        MO.__init__(self, value)
+        MO.__init__(self, _tree)
 
     @property
     def variable(self):
@@ -103,13 +103,13 @@ class MOMonomial(MO):
             raise 
         self._variable = variable
 
-        value = Tree("*",
+        _tree = Tree("*",
                      self._coefficient,
                      self._variable
 
                     )
 
-        MO.__init__(self, value)
+        MO.__init__(self, _tree)
 
     @property
     def coefficient(self):