Build minus with multipledispatcher

mapytex/calculus/core/compute/minus.py

@@ -10,62 +10,66 @@
 Minus MO: take the opposit
 """
 
+from multipledispatch import Dispatcher
 from ..MO.mo import MO, MOnumber
 from ..MO.fraction import MOFraction
 from .exceptions import MinusError
 
+minus_doc = """ Opposite of a MO
 
-def minus(left, right):
+:param left: None
-    """ Perform the minusition of left and right
+:param right: right MO
+:returns: Tree or MO
 
-    :param left: left MO
+"""
-    :param right: right MO
-    :returns: Tree or MO
 
-    >>> a = MOnumber(4)
+minus = Dispatcher("minus", doc=minus_doc)
-    >>> minus(None, a)
-    <MOnumber - 4>
-    >>> a = MOnumber(-4)
-    >>> minus(None, a)
-    <MOnumber 4>
-    >>> b = MOnumber(0)
-    >>> minus(None, b)
-    <MOnumber 0>
 
+@minus.register(type(None), MOnumber)
+def monumber(left, right):
     """
-    if not left is None:
-        raise MinusError(f"'-' is a 1 arity operator, left should be None (got {left})")
-
-    return MINUSFUNCTIONS[type(right)](right)
-
-def monumber(right):
-    """ Minusing monumber
-
-    :param right: right MOnumber
-    :returns: MONumber
 
     >>> a = MOnumber(4)
-    >>> monumber(a)
+    >>> minus(None, a)
     <MOnumber - 4>
 
     """
     return MO.factory(- right.value)
 
-def mofraction(right):
+@minus.register(type(None), MOFraction)
-    """ Minusing a mofraction
+def mofraction(left, right):
+    """ 4 differents cases
 
-    :param right: a mofraction
+    Either fraction , numerator or denominator is negative
-    :returns: Tree with the number converted into a mofraction
 
     >>> a = MOFraction(6, 5)
-    >>> print(mofraction(a))
+    >>> print(minus(None, a))
     -
      > None
      > /
      | > 6
      | > 5
+
+    The fraction is negative
+
     >>> a = MOFraction(6, 5, True)
-    >>> print(mofraction(a))
+    >>> print(minus(None, a))
+    /
+     > 6
+     > 5
+
+    Numerator is negative
+
+    >>> a = MOFraction(-6, 5)
+    >>> print(minus(None, a))
+    /
+     > 6
+     > 5
+
+    Denominators is negative
+
+    >>> a = MOFraction(6, -5)
+    >>> print(minus(None, a))
     /
      > 6
      > 5
@@ -87,12 +91,6 @@ def mofraction(right):
 
     return MOFraction(right._numerator, right._denominator, True)
 
-# TODO: Faire un décorateur pour un enregistrement automatique |dim. mars 11 18:24:32 EAT 2018
-MINUSFUNCTIONS = {
-    MOnumber: monumber,
-    MOFraction: mofraction,
-    }
-
 # -----------------------------
 # Reglages pour 'vim'
 # vim:set autoindent expandtab tabstop=4 shiftwidth=4: