mapytex/calculus/API/__init__.py

@@ -108,52 +108,12 @@ x^7
 (6 + 6) * x + 4x^2 + 9
 4x^2 + 12x + 9
 
->>> e = Expression.from_str("(2x+3)(-x+1)")
->>> e_simplified = e.simplify()
->>> e_simplified
-<Quadratic - 2x^2 - x + 3>
->>> for s in e_simplified.explain():
-...    print(s)
 
 """
 
 from .expression import Expression
-from .tokens import Token
 from .tokens.number import Integer, Decimal
 
-
-def set_render(render):
-    """
-    :example:
-    >>> e = Expression.from_str("2+3*4")
-    >>> print(e)
-    2 + 3 * 4
-    >>> e = Expression.from_str("2+3/4")
-    >>> print(e)
-    2 + 3 / 4
-    >>> es = e.simplify()
-    >>> print(es)
-    11 / 4
-    >>> set_render('tex')
-    >>> Expression.RENDER
-    'tex'
-    >>> Token.RENDER
-    'tex'
-    >>> e = Expression.from_str("2+3*4")
-    >>> print(e)
-    2 + 3 \\times 4
-    >>> e = Expression.from_str("2+3/4")
-    >>> print(e)
-    2 + \\dfrac{3}{4}
-    >>> es = e.simplify()
-    >>> print(es)
-    \\dfrac{11}{4}
-    >>> set_render('txt')
-    """
-    Expression.set_render(render)
-    Token.set_render(render)
-
-
 if __name__ == "__main__":
     e = Expression.from_str("1+2/3/4/5")
     et = e._typing()

mapytex/calculus/API/expression.py

@@ -56,7 +56,33 @@ class Expression(object):
 
         :param render: render name (txt or tex)
 
+        :example:
+        >>> e = Expression.from_str("2+3*4")
+        >>> print(e)
+        2 + 3 * 4
+        >>> e = Expression.from_str("2+3/4")
+        >>> print(e)
+        2 + 3 / 4
+        >>> es = e.simplify()
+        >>> print(es)
+        11 / 4
+        >>> Expression.set_render('tex')
+        >>> Expression.RENDER
+        'tex'
+        >>> e = Expression.from_str("2+3*4")
+        >>> print(e)
+        2 + 3 \\times 4
+        >>> e = Expression.from_str("2+3/4")
+        >>> print(e)
+        2 + \\dfrac{3}{4}
+        >>> es = e.simplify()
+        >>> print(es)
+        \\dfrac{11}{4}
+        >>> Expression.set_render('txt')
         """
+        from .tokens.token import Token
+
+        Token.set_render(render)
         cls.RENDER = render
 
     @classmethod
@@ -157,7 +183,7 @@ class Expression(object):
         """ Order the expression base on types
 
         :example:
-
+        
         >>> e = Expression.from_str("1 + 2x + 3 + 4x")
         >>> print(e)
         1 + 2x + 3 + 4x
@@ -178,8 +204,7 @@ class Expression(object):
                     return type(leaf)
             else:
                 try:
-                    typed_leaf = typing(
-                        leaf.node, leaf.left_value, leaf.right_value)
+                    typed_leaf = typing(leaf.node, leaf.left_value, leaf.right_value)
                     return typed_leaf.signature
                 except (AttributeError, NotImplementedError, TypingError):
                     return type(leaf)
@@ -196,7 +221,7 @@ class Expression(object):
 
     def _optimize(self, exclude_nodes=["/", "**"]):
         """ Return a copy of self with an optimize tree
-
+        
         :example:
         >>> e = Expression.from_str("2x^2+2x+3x")
         >>> print(e._tree)
@@ -237,7 +262,7 @@ class Expression(object):
 
     def _typing(self):
         """ Build a copy of self with as much typing as possible
-
+        
         :example:
         >>> e = Expression.from_str("2x", typing=False)
         >>> print(e._tree.map_on_leaf(lambda x: type(x).__name__))
@@ -282,7 +307,7 @@ class Expression(object):
 
     def _compute(self):
         """" Compute one step of self
-
+        
         """
         try:
             return Expression(self._tree.apply_on_last_level(compute))
@@ -347,7 +372,7 @@ class Expression(object):
 
     def explain(self):
         """ Yield every calculus step which have lead to self
-
+        
         :example:
         >>> e = Expression.from_str("2+3*4")
         >>> f = e.simplify()

mapytex/calculus/API/tokens/token.py

@@ -246,8 +246,8 @@ class Token(object):
         >>> c = a ** 2
         >>> c
         <Decimal 5.29>
-        """
 
+    """
         return self._operate(other, "^")
 
     def _roperate(self, other, operation):

mapytex/calculus/core/MO/atoms.py

@@ -37,7 +37,7 @@ def moify_cor(target):
     >>> for i in [-2, "+", "x", "*", Decimal("3.3")]:
     ...    list2molist.send(i)
     >>> list2molist.throw(STOOOP)
-    [<MOnumber -2>, '+', <MOstr x>, '*', <MOnumber 3.3>]
+    [<MOnumber - 2>, '+', <MOstr x>, '*', <MOnumber 3.3>]
 
     """
     try:
@@ -78,7 +78,7 @@ class MOnumber(Atom):
         >>> MOnumber(23)
         <MOnumber 23>
         >>> MOnumber(-23)
-        <MOnumber -23>
+        <MOnumber - 23>
 
         As expected there will be trouble with float
 
@@ -90,13 +90,13 @@ class MOnumber(Atom):
         >>> MOnumber(Decimal("23.3"))
         <MOnumber 23.3>
         >>> MOnumber(Decimal("-23.3"))
-        <MOnumber -23.3>
+        <MOnumber - 23.3>
 
         Or directly passe a decimal string
         >>> MOnumber("23.3")
         <MOnumber 23.3>
         >>> MOnumber("-23.3")
-        <MOnumber -23.3>
+        <MOnumber - 23.3>
 
         MOnumber initialisation is idempotent
 
@@ -259,8 +259,7 @@ class MOstr(Atom):
                 f"An MOstr should be initiate with a single caracter string, got {val}"
             )
         if not val.isalpha():
-            raise MOError(
-                f"An MOstr should be initiate with a alpha string, got {val}")
+            raise MOError(f"An MOstr should be initiate with a alpha string, got {val}")
 
         Atom.__init__(self, val)
 

mapytex/calculus/core/MO/fraction.py

@@ -32,10 +32,10 @@ class MOFraction(Molecule):
         >>> f = MOFraction(2, 3)
         >>> f
         <MOFraction 2 / 3>
-        >>> print(f.tree)
-        /
-         > 2
-         > 3
+        >>> print(f.__txt__)
+        2 / 3
+        >>> print(f.__tex__)
+        \\dfrac{2}{3}
         >>> print(f)
         2 / 3
         >>> f = MOFraction(2, 3, negative = True)
@@ -44,13 +44,11 @@ class MOFraction(Molecule):
         """
         _numerator = MO.factory(numerator)
         _denominator = MO.factory(denominator)
-
         base_tree = Tree("/", _numerator, _denominator)
         if negative:
             tree = Tree("-", None, base_tree)
         else:
             tree = base_tree
-
         Molecule.__init__(self, tree)
 
         self._numerator = _numerator

mapytex/calculus/core/MO/mo.py

@@ -57,12 +57,20 @@ class MO(ABC):
         pass
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} {self.__str__()}>"
+        return f"<{self.__class__.__name__} {self.__txt__}>"
 
     @abstractmethod
     def __str__(self):
         pass
 
+    @abstractmethod
+    def __txt__(self):
+        pass
+
+    @abstractmethod
+    def __tex__(self):
+        pass
+
     def __hash__(self):
         try:
             return self._tree.__hash__()
@@ -153,21 +161,21 @@ class Molecule(MO):
 
     It is a wrapping of tree
 
-    Its wrapping tree can be access through .tree property
+    Its wrapping tree can be access throw .tree property
     """
 
     MAINOP = None
 
-    def __init__(self, tree):
+    def __init__(self, value):
         """ Initiate the MO
 
         It should be idempotent.
 
         """
         try:
-            self._tree = tree._tree
+            self._tree = value._tree
         except AttributeError:
-            self._tree = tree
+            self._tree = value
 
         self.is_scalar = True
         self._signature = None
@@ -178,10 +186,18 @@ class Molecule(MO):
 
     @property
     def content(self):
-        return self.tree
+        return self._tree
 
     def __str__(self):
-        return tree2txt(self.tree)
+        return str(self.__txt__)
+
+    @property
+    def __txt__(self):
+        return tree2txt(self._tree)
+
+    @property
+    def __tex__(self):
+        return tree2tex(self._tree)
 
 
 # -----------------------------

mapytex/calculus/core/MO/monomial.py

@@ -31,10 +31,10 @@ class MOstrPower(Molecule):
         <MOstrPower x^2>
         >>> print(s)
         x^2
-        >>> print(s.tree)
-        ^
-         > x
-         > 2
+        >>> print(s.__txt__)
+        x^2
+        >>> print(s.__tex__)
+        x^{2}
         >>> MOstrPower(3, 1)
         Traceback (most recent call last):
         ...
@@ -59,8 +59,7 @@ class MOstrPower(Molecule):
         """
         _variable = MO.factory(variable)
         if not isinstance(_variable, MOstr):
-            raise MOError(
-                "The variable of a monomial should be convertible into MOstr")
+            raise MOError("The variable of a monomial should be convertible into MOstr")
         self._variable = _variable
 
         _power = MO.factory(power)
@@ -103,7 +102,7 @@ class MOstrPower(Molecule):
     @property
     def signature(self):
         """ Name of the mo in the API
-
+        
         :example:
         >>> MOstrPower("x", 3).signature
         'monome3'
@@ -124,8 +123,7 @@ class MOstrPower(Molecule):
         """
         if self._power > 2:
             return Tree(
-                "*", self.power, MOstrPower(self.variable,
-                                            self._power._value - 1)
+                "*", self.power, MOstrPower(self.variable, self._power._value - 1)
             )
         return Tree("*", self.power, MOstr(self.variable))
 
@@ -149,20 +147,22 @@ class MOMonomial(Molecule):
         <MOMonomial 4x>
         >>> print(m)
         4x
-        >>> print(m.tree)
-        *
-         > 4
-         > x
+        >>> print(m.__txt__)
+        4x
+        >>> print(m.__tex__)
+        4x
         >>> x = MOstrPower('x', 2)
         >>> MOMonomial(4, x)
         <MOMonomial 4x^2>
-        >>> m = MOMonomial(-1, 'x')
+        >>> m = MOMonomial(4, 'x')
         >>> m
-        <MOMonomial - x>
-        >>> print(m.tree)
-        -
-         > None
-         > x
+        <MOMonomial 4x>
+        >>> print(m)
+        4x
+        >>> print(m.__txt__)
+        4x
+        >>> print(m.__tex__)
+        4x
         >>> MOMonomial(4, 'x', 1)
         <MOMonomial 4x>
         >>> MOMonomial(4, 'x', 2)
@@ -170,13 +170,6 @@ class MOMonomial(Molecule):
         >>> x2 = MOstrPower('x', 2)
         >>> MOMonomial(4, x2, 3)
         <MOMonomial 4x^6>
-        >>> m = MOMonomial(-1, 'x', 2)
-        >>> m
-        <MOMonomial - x^2>
-        >>> print(m.tree)
-        -
-         > None
-         > x^2
         >>> MOMonomial(0, x)
         Traceback (most recent call last):
             ...
@@ -206,21 +199,34 @@ class MOMonomial(Molecule):
         self._power = _power
 
         try:
-            if self.coefficient.value == 1:
-                _tree = self.strpower
+            if self._coefficient.value != 1:
+                _tree = Tree("*", self._coefficient, self.strpower)
             else:
-                _tree = Tree("*", self.coefficient, self.strpower)
+                _tree = self.strpower
         except AttributeError:
-            _tree = Tree("*", self.coefficient, self.strpower)
+            _tree = Tree("*", self._coefficient, self.strpower)
 
         Molecule.__init__(self, _tree)
 
-    @property
-    def tree(self):
-        if self._coefficient == -1:
-            return Tree("-", None, self.strpower)
+    def __str__(self):
+        if self._coefficient != -1:
+            return super(MOMonomial, self).__str__()
+        else:
+            return "- " + self.strpower.__str__()
 
-        return Tree("*", self.coefficient, self.strpower)
+    @property
+    def __txt__(self):
+        if self._coefficient != -1:
+            return super(MOMonomial, self).__txt__
+        else:
+            return "- " + self.strpower.__txt__
+
+    @property
+    def __tex__(self):
+        if self._coefficient != -1:
+            return super(MOMonomial, self).__tex__
+        else:
+            return "- " + self.strpower.__tex__
 
     @property
     def coefficient(self):
@@ -259,7 +265,7 @@ class MOMonomial(Molecule):
     @property
     def signature(self):
         """ Name of the mo in the API
-
+        
         :example:
         >>> MOMonomial(2, "x").signature
         'monome1'

mapytex/calculus/core/compute/__init__.py

@@ -40,7 +40,7 @@ def compute(node, left_v, right_v):
     >>> compute("+", MOnumber(1), MOnumber(2))
     <MOnumber 3>
     >>> compute("-", None, MOnumber(2))
-    <MOnumber -2>
+    <MOnumber - 2>
     >>> compute("*", MOnumber(1), MOnumber(2))
     <MOnumber 2>
     >>> compute("~", MOnumber(1), MOnumber(2))
@@ -70,8 +70,7 @@ def compute_capacities(node):
     op = OPERATIONS[node]
     lines = [[node] + [mo.__name__ for mo in MOS]]
     for left_mo in MOS:
-        lines.append([left_mo.__name__] +
-                     [(left_mo, i) in op.funcs for i in MOS])
+        lines.append([left_mo.__name__] + [(left_mo, i) in op.funcs for i in MOS])
     return lines
 
 

mapytex/calculus/core/compute/minus.py

@@ -35,7 +35,7 @@ def monumber(_, right):
 
     >>> a = MOnumber(4)
     >>> minus(None, a)
-    <MOnumber -4>
+    <MOnumber - 4>
 
     """
     return MO.factory(-right.value)

mapytex/calculus/core/renders/tree2tex.py

@@ -210,8 +210,7 @@ def render_with_parenthesis(subtree, operator):
     return subtree_
 
 
-OPERATOR2TEX = {"+": plus2tex, "-": minus2tex,
-                "*": mul2tex, "/": div2tex, "^": pow2tex}
+OPERATOR2TEX = {"+": plus2tex, "-": minus2tex, "*": mul2tex, "/": div2tex, "^": pow2tex}
 
 
 def tree2tex(tree):
@@ -231,17 +230,8 @@ def tree2tex(tree):
     from ..tree import Tree
 
     if not isinstance(tree, Tree):
-        raise ValueError(
-            f"Can only render a Tree (got {type(tree).__name__}: {tree})")
-
-    def expand(leaf):
-        try:
-            return leaf.tree
-        except AttributeError:
-            return leaf
-    expanded_tree = tree.map_on_leaf(expand)
-
-    return OPERATOR2TEX[expanded_tree.node](expanded_tree.left_value, expanded_tree.right_value)
+        raise ValueError(f"Can only render a Tree (got {type(tree).__name__}: {tree})")
+    return OPERATOR2TEX[tree.node](tree.left_value, tree.right_value)
 
 
 # -----------------------------

mapytex/calculus/core/renders/tree2txt.py

@@ -214,8 +214,7 @@ def render_with_parenthesis(subtree, operator):
     return subtree_
 
 
-OPERATOR2TXT = {"+": plus2txt, "-": minus2txt,
-                "*": mul2txt, "/": div2txt, "^": pow2txt}
+OPERATOR2TXT = {"+": plus2txt, "-": minus2txt, "*": mul2txt, "/": div2txt, "^": pow2txt}
 
 
 def tree2txt(tree):
@@ -235,17 +234,8 @@ def tree2txt(tree):
     from ..tree import Tree
 
     if not isinstance(tree, Tree):
-        raise ValueError(
-            f"Can only render a Tree (got {type(tree).__name__}: {tree})")
-
-    def expand(leaf):
-        try:
-            return leaf.tree
-        except AttributeError:
-            return leaf
-    expanded_tree = tree.map_on_leaf(expand)
-
-    return OPERATOR2TXT[expanded_tree.node](expanded_tree.left_value, expanded_tree.right_value)
+        raise ValueError(f"Can only render a Tree (got {type(tree).__name__}: {tree})")
+    return OPERATOR2TXT[tree.node](tree.left_value, tree.right_value)
 
 
 # -----------------------------

mapytex/calculus/core/str2.py

@@ -271,7 +271,7 @@ def concurent_broadcast(target, lookfors=[]):
     >>> a = searcher.throw(STOOOP)
     >>> print(a)
     ['az', 'ABC', 'a', 'b', 'az', 'b']
-
+    
     >>> lfop = lookfor(something_in("+-*/()"), lambda x: f"op{x}")
     >>> searcher = concurent_broadcast(list_sink, [lfop])
     >>> for i in '12+3+234':
@@ -484,8 +484,7 @@ def lookforNumbers(target):
                         if current.replace("-", "", 1).isdigit():
                             current += tok
                         else:
-                            raise ParsingError(
-                                f"Can't build decimal with '{current}'")
+                            raise ParsingError(f"Can't build decimal with '{current}'")
                     elif tok == "-":
                         if current == "":
                             current = tok
@@ -803,8 +802,7 @@ def str2(sink, convert_to_mo=True):
                 operator_corout(missing_times(moify_cor(pparser(sink))))
             )
         else:
-            str2_corout = lookforNumbers(
-                operator_corout(missing_times(pparser(sink))))
+            str2_corout = lookforNumbers(operator_corout(missing_times(pparser(sink))))
 
         for i in expression.replace(" ", ""):
             str2_corout.send(i)
@@ -821,7 +819,7 @@ def rdstr2(sink):
     :example:
     >>> rdstr2list = rdstr2(list_sink)
     >>> rdstr2list("{a}+{a*b}-2")
-    [<RdLeaf a>, '+', <RdLeaf a*b>, '+', <MOnumber -2>]
+    [<RdLeaf a>, '+', <RdLeaf a*b>, '+', <MOnumber - 2>]
     >>> rdstr2list("{a}({b}x+{c})")
     [<RdLeaf a>, '*', [<RdLeaf b>, '*', <MOstr x>, '+', <RdLeaf c>]]
     """
@@ -830,8 +828,7 @@ def rdstr2(sink):
 
     def pipeline(expression):
         str2_corout = look_for_rdleaf(
-            lookforNumbers(operator_corout(
-                missing_times(moify_cor(pparser(sink)))))
+            lookforNumbers(operator_corout(missing_times(moify_cor(pparser(sink)))))
         )
 
         for i in expression.replace(" ", ""):

requirements.txt

@@ -21,6 +21,6 @@ pyparsing==2.3.0
 pytest==3.10.1
 simplegeneric==0.8.1
 six==1.11.0
-tabulate==0.8.7
+tabulate==0.8.2
 traitlets==4.3.2
 wcwidth==0.1.7