Feat: update tabulate version

possible

mapytex/calculus/API/__init__.py

@@ -108,12 +108,52 @@ 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,33 +56,7 @@ 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
@@ -136,9 +110,11 @@ class Expression(object):
         :returns: TODO
 
         :example:
-        >>> Expression.random("{a}/{a*k}") # doctest: +SKIP
+        >>> e = Expression.random("{a}/{a*k}")
+        >>> e # doctest: +SKIP
         <Exp: -3 / -15>
-        >>> Expression.random("{a}/{a*k} - 3*{b}", variables_scope={'a':{'min_max':(10, 30)}}) # doctest: +SKIP
+        >>> e = Expression.random("{a}/{a*k} - 3*{b}", variables_scope={'a':{'min_max':(10, 30)}})
+        >>> e # doctest: +SKIP
         <Exp: 18 / 108 - 3 * 9>
         >>> e = Expression.random("{a}*x + {b}*x + 3", ["a>b"], rejected=[0, 1])
         >>> ee = e.simplify()
@@ -181,7 +157,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
@@ -202,7 +178,8 @@ 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)
@@ -219,7 +196,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)
@@ -260,7 +237,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__))
@@ -305,7 +282,7 @@ class Expression(object):
 
     def _compute(self):
         """" Compute one step of self
-        
+
         """
         try:
             return Expression(self._tree.apply_on_last_level(compute))
@@ -370,7 +347,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

@@ -44,7 +44,7 @@ class Token(object):
 
     def explain(self):
         """ Yield every calculus step which have lead to self
-        
+
         :example:
         >>> from mapytex.calculus.API import Expression
         >>> e = Expression.from_str("2+3*4")
@@ -64,25 +64,10 @@ class Token(object):
             yield self
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} {self.__txt__}>"
+        return f"<{self.__class__.__name__} {renders['txt'](self._mo)}>"
 
     def __str__(self):
-        if self.RENDER == "tex":
+        return renders[self.RENDER](self._mo)
-            return self.__tex__
-        elif self.RENDER == "txt":
-            return self.__txt__
-        else:
-            raise ValueError(f"Unknow render {self.RENDER}")
-
-        # return renders[self.RENDER](self._mo)
-
-    @property
-    def __txt__(self):
-        return self._mo.__txt__
-
-    @property
-    def __tex__(self):
-        return self._mo.__tex__
 
     @property
     def raw(self):
@@ -261,11 +246,10 @@ class Token(object):
         >>> c = a ** 2
         >>> c
         <Decimal 5.29>
+        """
 
-    """
         return self._operate(other, "^")
 
-
     def _roperate(self, other, operation):
         """ Make a operation between 2 Tokens """
         from ..expression import Expression
@@ -315,6 +299,7 @@ class Token(object):
         <Linear x - 3>
         """
         return self._roperate(other, "-")
+
     def __rmul__(self, other):
         """ Multiply 2 Tokens or a Token and a Expression
 
@@ -342,7 +327,6 @@ class Token(object):
         """
         return self._roperate(other, "/")
 
-
     def _get_soul(self, other=None):
         """ Get the builtin soul of self or other """
         if isinstance(other, Token):

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,7 +259,8 @@ 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.__txt__)
+        >>> print(f.tree)
-        2 / 3
+        /
-        >>> print(f.__tex__)
+         > 2
-        \\dfrac{2}{3}
+         > 3
         >>> print(f)
         2 / 3
         >>> f = MOFraction(2, 3, negative = True)
@@ -44,11 +44,13 @@ 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,20 +57,12 @@ class MO(ABC):
         pass
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} {self.__txt__}>"
+        return f"<{self.__class__.__name__} {self.__str__()}>"
 
     @abstractmethod
     def __str__(self):
         pass
 
-    @abstractmethod
-    def __txt__(self):
-        pass
-
-    @abstractmethod
-    def __tex__(self):
-        pass
-
     def __hash__(self):
         try:
             return self._tree.__hash__()
@@ -161,21 +153,21 @@ class Molecule(MO):
 
     It is a wrapping of tree
 
-    Its wrapping tree can be access throw .tree property
+    Its wrapping tree can be access through .tree property
     """
 
     MAINOP = None
 
-    def __init__(self, value):
+    def __init__(self, tree):
         """ Initiate the MO
 
         It should be idempotent.
 
         """
         try:
-            self._tree = value._tree
+            self._tree = tree._tree
         except AttributeError:
-            self._tree = value
+            self._tree = tree
 
         self.is_scalar = True
         self._signature = None
@@ -186,18 +178,10 @@ class Molecule(MO):
 
     @property
     def content(self):
-        return self._tree
+        return self.tree
 
     def __str__(self):
-        return str(self.__txt__)
+        return tree2txt(self.tree)
-
-    @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.__txt__)
+        >>> print(s.tree)
-        x^2
+        ^
-        >>> print(s.__tex__)
+         > x
-        x^{2}
+         > 2
         >>> MOstrPower(3, 1)
         Traceback (most recent call last):
         ...
@@ -59,7 +59,8 @@ 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)
@@ -102,7 +103,7 @@ class MOstrPower(Molecule):
     @property
     def signature(self):
         """ Name of the mo in the API
-        
+
         :example:
         >>> MOstrPower("x", 3).signature
         'monome3'
@@ -123,7 +124,8 @@ 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))
 
@@ -147,22 +149,20 @@ class MOMonomial(Molecule):
         <MOMonomial 4x>
         >>> print(m)
         4x
-        >>> print(m.__txt__)
+        >>> print(m.tree)
-        4x
+        *
-        >>> print(m.__tex__)
+         > 4
-        4x
+         > x
         >>> x = MOstrPower('x', 2)
         >>> MOMonomial(4, x)
         <MOMonomial 4x^2>
-        >>> m = MOMonomial(4, 'x')
+        >>> m = MOMonomial(-1, 'x')
         >>> m
-        <MOMonomial 4x>
+        <MOMonomial - x>
-        >>> print(m)
+        >>> print(m.tree)
-        4x
+        -
-        >>> print(m.__txt__)
+         > None
-        4x
+         > x
-        >>> print(m.__tex__)
-        4x
         >>> MOMonomial(4, 'x', 1)
         <MOMonomial 4x>
         >>> MOMonomial(4, 'x', 2)
@@ -170,6 +170,13 @@ 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):
             ...
@@ -199,34 +206,21 @@ class MOMonomial(Molecule):
         self._power = _power
 
         try:
-            if self._coefficient.value != 1:
+            if self.coefficient.value == 1:
-                _tree = Tree("*", self._coefficient, self.strpower)
-            else:
                 _tree = self.strpower
+            else:
+                _tree = Tree("*", self.coefficient, self.strpower)
         except AttributeError:
-            _tree = Tree("*", self._coefficient, self.strpower)
+            _tree = Tree("*", self.coefficient, self.strpower)
 
         Molecule.__init__(self, _tree)
 
-    def __str__(self):
-        if self._coefficient != -1:
-            return super(MOMonomial, self).__str__()
-        else:
-            return "- " + self.strpower.__str__()
-
     @property
-    def __txt__(self):
+    def tree(self):
-        if self._coefficient != -1:
+        if self._coefficient == -1:
-            return super(MOMonomial, self).__txt__
+            return Tree("-", None, self.strpower)
-        else:
-            return "- " + self.strpower.__txt__
 
-    @property
+        return Tree("*", self.coefficient, self.strpower)
-    def __tex__(self):
-        if self._coefficient != -1:
-            return super(MOMonomial, self).__tex__
-        else:
-            return "- " + self.strpower.__tex__
 
     @property
     def coefficient(self):
@@ -265,7 +259,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,7 +70,8 @@ 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/random/__init__.py

@@ -71,7 +71,7 @@ This function ignores tree structure and works with lists
 {'a': -8, 'a*b': -40, 'b': 5, 'c': 4}
 """
 
-__all__ = ["generator"]
+__all__ = ["list_generator"]
 
 from random import choice
 from functools import reduce
@@ -256,7 +256,7 @@ def build_variable_scope(rd_variables, rejected, min_max, variables_scope):
     return complete_scope
 
     
-def list_generator(var_list, conditions=[], rejected=[0], min_max=(-10, 10), variables_scope={}):
+def list_generator(var_list, conditions=[], rejected=[0], min_max=(-10, 10), variables_scope={}, dictionnary=False):
     """ Generate random computed values from the list
 
     :param rd_variables: list of random variables to generate (can be computed value - "a*b")
@@ -264,17 +264,25 @@ def list_generator(var_list, conditions=[], rejected=[0], min_max=(-10, 10), var
     :param rejected: Rejected values for the generator (default [0])
     :param min_max: (min, max) limits in between variables will be generated
     :param variables_scope: rejected and min_max define for individual variables
+    :param dictionnary: the return value will be a dictionnary with var_list as keys (default False)
     :return: dictionnary of generated variables
 
     :example:
-    >>> values = list_generator(["a", "a*b", "b", "c"])
+    >>> a, ab, b, c = list_generator(["a", "a*b", "b", "c"])
-    >>> values  # doctest: +SKIP
+    >>> a, ab, b, c # doctest: +SKIP
-    >>> values["a"] * values["b"] == values["a*b"]
+    (5, -20, -4, -3)
+    >>> a * b == ab
     True
-    >>> values["a*b"] # doctest: +SKIP
+    >>> ab # doctest: +SKIP
-    >>> values["a"] * values["b"] # doctest: +SKIP
+    -20
+    >>> a, b # doctest: +SKIP
+    5, -4
+    >>> list_generator(["a", "a*b", "b", "c"], dictionnary=True) # doctest: +SKIP
+    {'a': -3, 'a*b': 18, 'b': -6, 'c': -4}
     """
     rv = extract_rv(var_list)
     rv_gen = random_generator(rv, conditions, rejected, min_max, variables_scope)
     generated = compute_leafs(var_list, rv_gen)
-    return generated
+    if dictionnary:
+        return generated
+    return [generated[v] for v in var_list]

mapytex/calculus/core/renders/tree2tex.py

@@ -210,7 +210,8 @@ def render_with_parenthesis(subtree, operator):
     return subtree_
 
 
-OPERATOR2TEX = {"+": plus2tex, "-": minus2tex, "*": mul2tex, "/": div2tex, "^": pow2tex}
+OPERATOR2TEX = {"+": plus2tex, "-": minus2tex,
+                "*": mul2tex, "/": div2tex, "^": pow2tex}
 
 
 def tree2tex(tree):
@@ -230,8 +231,17 @@ 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})")
+        raise ValueError(
-    return OPERATOR2TEX[tree.node](tree.left_value, tree.right_value)
+            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)
 
 
 # -----------------------------

mapytex/calculus/core/renders/tree2txt.py

@@ -214,7 +214,8 @@ def render_with_parenthesis(subtree, operator):
     return subtree_
 
 
-OPERATOR2TXT = {"+": plus2txt, "-": minus2txt, "*": mul2txt, "/": div2txt, "^": pow2txt}
+OPERATOR2TXT = {"+": plus2txt, "-": minus2txt,
+                "*": mul2txt, "/": div2txt, "^": pow2txt}
 
 
 def tree2txt(tree):
@@ -234,8 +235,17 @@ 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})")
+        raise ValueError(
-    return OPERATOR2TXT[tree.node](tree.left_value, tree.right_value)
+            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)
 
 
 # -----------------------------

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,7 +484,8 @@ 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
@@ -802,7 +803,8 @@ 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)
@@ -819,7 +821,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>]]
     """
@@ -828,7 +830,8 @@ 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.2
+tabulate==0.8.7
 traitlets==4.3.2
 wcwidth==0.1.7

setup.py

@@ -7,7 +7,7 @@ except ImportError:
 
 setup(
     name="mapytex",
-    version="2.3.1",
+    version="2.3.2",
     description="Computing like a student",
     author="Benjamin Bertrand",
     author_email="programming@opytex.org",