Feat: Remove references to random in API

possible

mapytex/__init__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-from .calculus import Expression, Integer, Decimal, random_list
+from .calculus import Expression, render, random
 
 # Expression.set_render('tex')
 

mapytex/calculus/API/__init__.py

@@ -108,26 +108,35 @@ x^7
 (6 + 6) * x + 4x^2 + 9
 4x^2 + 12x + 9
 
-
+>>> e = Expression.from_str("(2x-3)(-x+2)")
+>>> e_simplified = e.simplify()
+>>> e_simplified
+<Quadratic - 2x^2 + 7x - 6>
+>>> for s in e_simplified.explain():
+...    print(s)
+(2x - 3)(- x + 2)
+(2x - 3)(- x + 2)
+2x(- x) + 2x * 2 - 3(- x) - 3 * 2
+2(- 1) * x^(1 + 1) + 2 * 2 * x - 3(- 1) * x - 6
+4x + 3x - 2x^2 - 6
+(4 + 3) * x - 2x^2 - 6
+- 2x^2 + 7x - 6
 """
 
+from .renders import render
 from .expression import Expression
-from .tokens.number import Integer, Decimal
+from .tokens import Token
+from .tokens.polynomial import Polynomial
+from .tokens.number import Integer, Decimal, Fraction
+
 
 if __name__ == "__main__":
-    e = Expression.from_str("1+2/3/4/5")
+    e = Expression.from_str("(2x-3)(-x+2)")
-    et = e._typing()
+    e_simplified = e.simplify()
-    print("typing")
+    e_simplified
-    print(e._tree)
+    for s in e_simplified.explain():
-    e = et._order()
+        print(s._tree.map_on_leaf(lambda x: type(x)))
-    print("order")
+        print(s)
-    print(e._tree)
-    e = e._optimize()
-    print("then optimize")
-    print(e._tree)
-    e = et._optimize()
-    print("optimize without order")
-    print(e._tree)
 
 # -----------------------------
 # Reglages pour 'vim'

mapytex/calculus/API/expression.py

@@ -12,16 +12,9 @@ Expression
 """
 from functools import partial
 from ..core import AssocialTree, Tree, compute, typing, TypingError
-from ..core.random import (
-    extract_rdleaf,
-    extract_rv,
-    random_generator,
-    compute_leafs,
-    replace_rdleaf,
-)
 from ..core.MO import moify
 from .tokens import factory
-from .renders import renders
+from .renders import render
 
 
 class Expression(object):
@@ -42,7 +35,6 @@ class Expression(object):
     14
     """
 
-    RENDER = "txt"
 
     def __init__(self, tree, ancestor=None):
         """
@@ -50,41 +42,6 @@ class Expression(object):
         self._tree = tree
         self._ancestor = ancestor
 
-    @classmethod
-    def set_render(cls, render):
-        """ Define default render function 
-
-        :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
     def from_str(cls, string, typing=True):
         """ Initiate the expression from a string
@@ -115,55 +72,6 @@ class Expression(object):
 
         return cls(t)
 
-    @classmethod
-    def random(
-        cls,
-        template,
-        conditions=[],
-        rejected=[0],
-        min_max=(-10, 10),
-        variables_scope={},
-        shuffle=False,
-    ):
-        """ Initiate randomly the expression
-
-        :param template: the template of the expression
-        :param conditions: conditions on randomly generate variable
-        :param rejected: Values to reject for all random variables
-        :param min_max: Min and max value for all random variables
-        :param variables_scope: Dictionnary for each random varaibles to fic rejected and min_max
-        :param shuffle: allowing to shuffle the tree
-        :returns: TODO
-
-        :example:
-        >>> e = Expression.random("{a}/{a*k}")
-        >>> e # doctest: +SKIP
-        <Exp: -3 / -15>
-        >>> 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()
-        >>> print(e) # doctest: +SKIP
-        10x - 6x + 3
-        >>> print(ee) # doctest: +SKIP
-        4x + 3
-
-        """
-        rd_t = Tree.from_str(template, random=True)
-        leafs = extract_rdleaf(rd_t)
-        rd_varia = extract_rv(leafs)
-        generated = random_generator(
-            rd_varia, conditions, rejected, min_max, variables_scope
-        )
-        computed = compute_leafs(leafs, generated)
-        t = replace_rdleaf(rd_t, computed).map_on_leaf(moify)
-
-        if shuffle:
-            raise NotImplemented("Can't suffle expression yet")
-
-        return cls._post_processing(t)
-
     @classmethod
     def _post_processing(cls, t):
         """ Post process the tree by typing it """
@@ -174,10 +82,10 @@ class Expression(object):
             return cls(t)
 
     def __str__(self):
-        return renders[self.RENDER](self._tree)
+        return render(self._tree)
 
     def __repr__(self):
-        return f"<Exp: {renders['txt'](self._tree)}>"
+        return f"<Exp: {render(self._tree, 'txt')}>"
 
     def _order(self, exclude_nodes=["*", "/", "**"]):
         """ Order the expression base on types
@@ -204,7 +112,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)
@@ -344,15 +253,15 @@ class Expression(object):
 
         comp_exp = opt_exp._compute()
 
-        if typed_exp == comp_exp:
+        if typed_exp != comp_exp:
-            typed_exp.set_ancestor(self._ancestor)
-            return typed_exp
-        else:
             comp_exp.set_ancestor(self)
             return comp_exp._simplify(optimize=optimize)
 
+        typed_exp.set_ancestor(self._ancestor)
+        return typed_exp
+
     def simplify(self, optimize=True):
-        """ Compute as much as possible the expression
+        """ Simplify the expression, keep the history and factory child
 
         :param optimize: bool to optimize tree when it's possible
         :return: an expression

mapytex/calculus/API/renders.py

@@ -12,34 +12,59 @@ Expression
 """
 from ..core import tree2txt, tree2tex
 
+class Render(object):
+    """ Object which render Expression or token """
 
-def _txt(mo_tree):
+    def __init__(self, default="txt"):
-    """ txt render for MOs or Trees"""
+        self._default = default
+        self._render = default
+        self.renders = {}
+
+    def register_render(self, name, func, attribute):
+        """ register a render """
         try:
-        return tree2txt(mo_tree)
+            self.renders[name]
+        except KeyError:
+            self.renders[name] = {"name": name, "func": func, "attribute": attribute}
+        else:
+            raise ValueError("This render name already exists")
+
+    @property
+    def render_name(self):
+        return self._render
+
+    @property
+    def render(self):
+        return self.renders[self._render]
+
+    def __call__(self, mo_tree, tmp_render=''):
+        if tmp_render:
+            r = self.renders[tmp_render]
+        else:
+            r = self.render
+
+        try:
+            return r["func"](mo_tree)
         except ValueError:
             pass
 
         try:
-        return mo_tree.__txt__
+            return getattr(mo_tree, r["attribute"])
         except AttributeError:
             return str(mo_tree)
 
-
+    def set_render(self, render):
-def _tex(mo_tree):
+        """ Define the render """
-    """ Tex render for MOs or Trees"""
+        if render in self.renders.keys():
-    try:
+            self._render = render
-        return tree2tex(mo_tree)
+        else:
-    except ValueError:
+            raise ValueError("This render does not exists")
-        pass
-
-    try:
-        return mo_tree.__tex__
-    except AttributeError:
-        return str(mo_tree)
 
 
-renders = {"txt": _txt, "tex": _tex}
+
+render = Render()
+render.register_render("txt", tree2txt, "__txt__")
+render.register_render("tex", tree2tex, "__tex__")
 
 # -----------------------------
 # Reglages pour 'vim'

mapytex/calculus/API/tokens/number.py

@@ -13,12 +13,10 @@ Tokens representing interger and decimal
 from decimal import Decimal as _Decimal
 from .token import Token
 from ...core.arithmetic import gcd
-from ...core.random.int_gene import filter_random
 from ...core.MO import MO, MOnumber
 from ...core.MO.fraction import MOFraction
-from random import random
 
-__all__ = ["Integer", "Decimal"]
+__all__ = ["Integer", "Decimal", "Fraction"]
 
 
 class Integer(Token):
@@ -54,23 +52,6 @@ class Integer(Token):
 
         return cls(mo, name, ancestor)
 
-    @classmethod
-    def random(
-        cls, name="", min_value=-10, max_value=10, rejected=[0, 1], accept_callbacks=[]
-    ):
-        """ Generate a random Integer
-
-        :param name: name of the Integer
-        :param min_value: minimum value
-        :param max_value: maximum value
-        :param rejected: rejected values
-        :param accept_callbacks: list of function for value acceptation
-
-        """
-        candidate = filter_random(min_value, max_value, rejected, accept_callbacks)
-
-        return Integer(candidate, name)
-
 
 class Decimal(Token):
 
@@ -108,40 +89,10 @@ class Decimal(Token):
 
         return cls(mo, name, ancestor)
 
-    @classmethod
-    def random(
-        cls,
-        name="",
-        min_value=-10,
-        max_value=10,
-        digits=2,
-        rejected=[0, 1],
-        reject_callbacks=[],
-    ):
-        """ Generate a random Decimal
-
-        :param name: name of the Integer
-        :param min_value: minimum value
-        :param max_value: maximum value
-        :param digits: digits after comas
-        :param rejected: rejected values
-        :param reject_callbacks: list of function for value rejection
-
-        """
-        conditions = [lambda x: x in rejected] + reject_callbacks
-
-        float_cand = (max_value - min_value) * random() + min_value
-        candidate = _Decimal(f"{float_cand:.{digits}f}")
-        while any(c(candidate) for c in conditions):
-            float_cand = (max_value - min_value) * random() + min_value
-            candidate = _Decimal(f"{float_cand:.{digits}f}")
-
-        return Decimal(candidate, name)
-
 
 class Fraction(Token):
 
-    """ Token representing a fraction
+    """ Token representing a fraction of numbers
 
     :example:
     >>> Fraction("3/4")
@@ -172,76 +123,27 @@ class Fraction(Token):
 
         return cls(mo, name, ancestor)
 
-    @classmethod
-    def random(
-        cls,
-        name="",
-        fix_num="",
-        min_num=-10,
-        max_num=10,
-        rejected_num=[0],
-        accept_num_callbacks=[],
-        fix_denom="",
-        min_denom=-10,
-        max_denom=10,
-        rejected_denom=[0, 1, -1],
-        accept_denom_callbacks=[],
-        irreductible=False,
-        not_integer=True,
-    ):
-        """ Generate a random Fraction
-
-        :param name: Name of the fraction
-        :param fix_num: if set, the numerator will get this value
-        :param min_num: minimum value for the numerator
-        :param max_num: maximum value for the numerator
-        :param rejected_num: rejected values for the numerator
-        :param accept_num_callbacks: list of function for numerator rejection
-        :param fix_denom: if set, the denomerator will get this value
-        :param min_denom: minimum value for the denominator
-        :param max_denom: maximum value for the denominator
-        :param rejected_denom: rejected values for the denominator
-        :param accept_denom_callbacks: list of function for denomerator rejection
-        :param irreductible: is the generated fraction necessary irreductible
-        :param not_integer: can the generated fraction be egal to an interger
-        """
-        if fix_num == "":
-            num = filter_random(min_num, max_num, rejected_num, accept_num_callbacks)
-        else:
-            num = fix_num
-
-        if fix_denom == "":
-            accept_callbacks = accept_denom_callbacks
-
-            if irreductible:
-
-                def prime_with_num(denom):
-                    return gcd(num, denom) == 1
-
-                accept_callbacks.append(prime_with_num)
-            if not_integer:
-
-                def not_divise_num(denom):
-                    return num % denom != 0
-
-                accept_callbacks.append(not_divise_num)
-
-            denom = filter_random(
-                min_denom, max_denom, rejected_denom, accept_callbacks
-            )
-        else:
-            denom = fix_denom
-
-        frac = MOFraction(num, denom)
-        return cls(frac, name)
-
     @property
     def numerator(self):
-        return self._mo.numerator
+        """ Get numerator of the fraction
+
+        :example:
+        >>> a = Fraction("3/4")
+        >>> a.numerator
+        <Integer 3>
+        """
+        return Integer(self._mo.numerator)
 
     @property
     def denominator(self):
-        return self._mo.denominator
+        """ Get denominator of the fraction
+
+        :example:
+        >>> a = Fraction("3/4")
+        >>> a.denominator
+        <Integer 4>
+        """
+        return Integer(self._mo.denominator)
 
     @property
     def decimal(self):
@@ -255,7 +157,58 @@ class Fraction(Token):
         >>> f.decimal
         <Decimal 0.3333333333333333333333333333>
         """
-        return Decimal(_Decimal(self._mo.numerator._value) / _Decimal(self._mo.denominator._value))
+        return Decimal(self._mo._value)
+
+    @property
+    def simplified(self):
+        """ Get the irreductible version of self
+
+        :example:
+        >>> f = Fraction("3/4")
+        >>> f.simplified
+        <Fraction 3 / 4>
+        >>> f = Fraction("12/9")
+        >>> f.simplified
+        <Fraction 4 / 3>
+        >>> f = Fraction("12/4")
+        >>> f.simplified
+        <Integer 3>
+
+        """
+        simplified = self._mo.simplified()
+
+        if isinstance(simplified, MOnumber):
+            return Integer(simplified)
+
+        return Fraction(simplified)
+
+    def simplify(self):
+        """ Itself or its simplified version
+
+        :example:
+        >>> f = Fraction("12/8")
+        >>> fs = f.simplify()
+        >>> for i in fs.explain():
+        ...    print(i)
+        12 / 8
+        3 / 2
+        >>> f = Fraction("5/8")
+        >>> fs = f.simplify()
+        >>> for i in fs.explain():
+        ...    print(i)
+        5 / 8
+        """
+        simplified = self.simplified
+        try:
+            if self.numerator == simplified.numerator:
+                return self
+        except AttributeError:
+            pass
+
+        simplified._ancestor = self
+        return simplified
+
+
 
 
 # -----------------------------

mapytex/calculus/API/tokens/polynomial.py

@@ -15,6 +15,7 @@ from .token import Token
 from . import to_be_token
 from ...core.MO import MO
 from ...core.MO.atoms import moify
+from ...core.MO.polynomial import MOpolynomial
 
 __all__ = ["Polynomial", "Quadratic", "Linear"]
 
@@ -44,13 +45,21 @@ class Polynomial(Token):
         return cls(mo, name, ancestor)
 
     @classmethod
-    def from_coefficients(cls, coefficients):
+    def from_coefficients(cls, coefficients, variable_name="x", name=""):
-        """ Initiate polynomial from list of coefficients """
+        """ Initiate polynomial from list of coefficients 
-        pass
 
-    @classmethod
+        :examples:
-    def random(cls):
+        >>> P = Polynomial.from_coefficients([1, 2, 3])
-        raise NotImplementedError
+        >>> P
+        <Polynomial 3x^2 + 2x + 1>
+        >>> P = Polynomial.from_coefficients([1, 2, -3])
+        >>> P
+        <Polynomial - 3x^2 + 2x + 1>
+        >>> P = Polynomial.from_coefficients([1, 2, 3], "y")
+        >>> P
+        <Polynomial 3y^2 + 2y + 1>
+        """
+        return cls(MOpolynomial(variable_name, coefficients), name)
 
     @property
     def raw(self):
@@ -135,7 +144,11 @@ class Linear(Polynomial):
     >>> P.differentiate()
     <Integer 2>
     >>> P.roots
-    [<Fraction - 2 / 1>]
+    [<Integer - 2>]
+    >>> for i in P.roots[0].explain():
+    ...    print(i)
+    - 2 / 1
+    - 2
 
     """
 
@@ -154,10 +167,6 @@ class Linear(Polynomial):
         Polynomial.__init__(self, mo, name, ancestor)
         self._mathtype = "affine"
 
-    @classmethod
-    def random(cls):
-        raise NotImplementedError
-
     @property
     @to_be_token
     def a(self):
@@ -177,9 +186,20 @@ class Linear(Polynomial):
         >>> from ...core.MO.polynomial import MOpolynomial, MOMonomial
         >>> P = Linear(MOpolynomial('x', [1, 2]))
         >>> P.roots
-        [<Fraction - 2 / 1>]
+        [<Integer - 2>]
-        >>> #P = Linear(MOpolynomial('x', [1, -2]))
+        >>> P = Linear(MOpolynomial('x', [2, 1]))
-        >>> #P.roots
+        >>> P.roots
+        [<Fraction - 1 / 2>]
+        >>> for i in P.roots[0].explain():
+        ...    print(i)
+        - 1 / 2
+        >>> P = Linear(MOpolynomial('x', [10, 6]))
+        >>> P.roots
+        [<Fraction - 3 / 5>]
+        >>> for i in P.roots[0].explain():
+        ...    print(i)
+        - 6 / 10
+        - 3 / 5
         """
 
         try:
@@ -230,10 +250,6 @@ class Quadratic(Polynomial):
         Polynomial.__init__(self, mo, name, ancestor)
         self._mathtype = "polynome du 2nd degré"
 
-    @classmethod
-    def random(cls):
-        raise NotImplementedError
-
     @property
     @to_be_token
     def a(self):

mapytex/calculus/API/tokens/token.py

@@ -10,7 +10,7 @@
 Tokens: practical envelop of math object
 
 """
-from ..renders import renders
+from ..renders import render
 from ...core.MO.atoms import moify
 
 
@@ -18,30 +18,12 @@ class Token(object):
 
     """ Token: practical envelop of an math object """
 
-    RENDER = "txt"
-
     def __init__(self, mo, name="", ancestor=None):
         self._mo = mo
         self.name = name
         self._mathtype = None
         self._ancestor = ancestor
 
-    @classmethod
-    def random(
-        cls,
-        family="integer",
-        **kwds
-    ):
-        raise NotImplemented
-
-    @classmethod
-    def set_render(cls, render):
-        """ Define default render function
-
-        :param render: render name (txt or tex)
-        """
-        cls.RENDER = render
-
     def explain(self):
         """ Yield every calculus step which have lead to self
 
@@ -64,25 +46,16 @@ class Token(object):
             yield self
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} {self.__txt__}>"
+        try:
+            return f"<{self.__class__.__name__} {render(self._mo._tree, 'txt')}>"
+        except AttributeError:
+            return f"<{self.__class__.__name__} {render(self._mo, 'txt')}>"
 
     def __str__(self):
-        if self.RENDER == "tex":
+        try:
-            return self.__tex__
+            return render(self._mo._tree)
-        elif self.RENDER == "txt":
+        except AttributeError:
-            return self.__txt__
+            return render(self._mo)
-        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,10 +234,9 @@ class Token(object):
         >>> c = a ** 2
         >>> c
         <Decimal 5.29>
-
         """
-        return self._operate(other, "^")
 
+        return self._operate(other, "^")
 
     def _roperate(self, other, operation):
         """ Make a operation between 2 Tokens """
@@ -315,6 +287,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 +315,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/__init__.py

@@ -12,8 +12,7 @@ Make calculus as a student
 
 Expression is the classe wich handle all calculus. It can randomly generate or import calculus, simplify them and explain them as a student would do.
 
->>> from mapytex.calculus import Expression
+>>> render.set_render("txt")
->>> Expression.set_render("txt")
 >>> e = Expression.from_str("2x + 6 - 3x")
 >>> print(e)
 2x + 6 - 3x
@@ -27,16 +26,23 @@ Expression is the classe wich handle all calculus. It can randomly generate or i
 (2 - 3) * x + 6
 - x + 6
 
+Create random Expression
+========================
+
+>>> e = random.expression("{a} / {b} + {c} / {d}")
+>>> print(e) # doctest: +SKIP 
+- 3 / - 10 + 3 / 5
 
 """
 
-from .API import Expression, Integer, Decimal
+from .API import render, Expression
-from .core import random_list
+#from decimal import getcontext
-from decimal import getcontext
+from . import random
+
 #getcontext().prec = 2
 
 
-__all__ = ["Expression"]
+__all__ = ["render",  "Expression", "random"]
 
 
 # -----------------------------

mapytex/calculus/core/MO/atoms.py

@@ -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

@@ -9,6 +9,8 @@
 from mapytex.calculus.core.tree import Tree
 from .mo import Molecule, MO
 from .atoms import MOnumber
+from decimal import Decimal
+from ..arithmetic import gcd
 
 __all__ = ["MOFraction"]
 
@@ -32,10 +34,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 +46,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
@@ -68,6 +72,10 @@ class MOFraction(Molecule):
     def denominator(self):
         return self._denominator
 
+    @property
+    def _value(self):
+        return Decimal(self._numerator._value) / Decimal(self._denominator._value)
+
     def inverse(self):
         """ return the inverse fraction """
         return MOFraction(self._denominator, self._numerator, self.negative)
@@ -88,6 +96,37 @@ class MOFraction(Molecule):
         else:
             raise NotImplementedError
 
+    def simplified(self):
+        """ Simplified version of self 
+
+        :examplex
+        >>> f = MOFraction(2, 3)
+        >>> f
+        <MOFraction 2 / 3>
+        >>> f.simplified()
+        <MOFraction 2 / 3>
+        >>> f = MOFraction(2, 6)
+        >>> f
+        <MOFraction 2 / 6>
+        >>> f.simplified()
+        <MOFraction 1 / 3>
+        >>> f = MOFraction(32, 24)
+        >>> f.simplified()
+        <MOFraction 4 / 3>
+        >>> f = MOFraction(32, 8)
+        >>> f.simplified()
+        <MOnumber 4>
+        """
+        frac_gcd = gcd(self.numerator._value, self.denominator._value) 
+        new_num = self.numerator._value / frac_gcd
+        new_denom = self.denominator._value / frac_gcd
+
+        if new_denom == 1:
+            return MOnumber(new_num)
+
+        return MOFraction(new_num, new_denom)
+
+
 
 # -----------------------------
 # Reglages pour 'vim'

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)
@@ -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):

mapytex/calculus/core/__init__.py

@@ -66,7 +66,6 @@ from .tree import Tree, AssocialTree
 from .compute import compute
 from .typing import typing, TypingError
 from .renders import tree2txt, tree2tex
-from .random import list_generator as random_list
 
 
 # -----------------------------

mapytex/calculus/core/compute/__init__.py

@@ -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/random/__init__.py

@@ -1,288 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8
-#
-# Copyright © 2017 lafrite <lafrite@Poivre>
-#
-# Distributed under terms of the MIT license.
-
-"""
-Tools to extract random leafs, random variables, generate random values and
-fill new trees
-
-Flow
-----
-
-Tree with RdLeaf
-|
-| Extract rdLeaf
-|
-List of leafs to generate
-|
-| extract_rv
-|
-List random variables to generate
-|
-| Generate
-|
-Dictionnary of generated random variables
-|
-| Compute leafs
-|
-Dictionnary of computed leafs
-|
-| Replace
-|
-Tree with RdLeaf replaced by generated values
-
-:example:
-
->>> from ..tree import Tree
->>> rd_t = Tree("/", RdLeaf("a"), RdLeaf("a*k"))
->>> print(rd_t)
-/
- > {a}
- > {a*k}
->>> leafs = extract_rdleaf(rd_t)
->>> leafs
-['a', 'a*k']
->>> rd_varia = extract_rv(leafs)
->>> sorted(list(rd_varia))
-['a', 'k']
->>> generated = random_generator(rd_varia, conditions=['a%2+1'])
->>> generated # doctest: +SKIP
-{'a': 7, 'k': 4}
->>> computed = compute_leafs(leafs, generated)
->>> computed # doctest: +SKIP
-{'a': 7, 'a*k': 28}
->>> replaced = replace_rdleaf(rd_t, computed)
->>> print(replaced) # doctest: +SKIP
-/
- > 7
- > 28
-
-List generator
---------------
-
-This function ignores tree structure and works with lists
-
->>> values = list_generator(["a", "a*b", "b", "c"], conditions=["b%c==1"])
->>> values # doctest: +SKIP
-{'a': -8, 'a*b': -40, 'b': 5, 'c': 4}
-"""
-
-__all__ = ["list_generator"]
-
-from random import choice
-from functools import reduce
-from .leaf import RdLeaf
-
-
-def extract_rdleaf(tree):
-    """ Extract rdLeaf in a Tree
-
-    :example:
-    >>> from ..tree import Tree
-    >>> rd_t = Tree("+", RdLeaf("a"), RdLeaf("a*k"))
-    >>> extract_rdleaf(rd_t)
-    ['a', 'a*k']
-    >>> rd_t = Tree("+", RdLeaf("a"), 2)
-    >>> extract_rdleaf(rd_t)
-    ['a']
-    """
-    rd_leafs = []
-    for leaf in tree.get_leafs():
-        try:
-            leaf.rdleaf
-        except AttributeError:
-            pass
-        else:
-            rd_leafs.append(leaf.name)
-    return rd_leafs
-
-
-def extract_rv(leafs):
-    """ Extract the set of random values from the leaf list
-
-    :param leafs: list of leafs
-    :return: set of random values
-
-    :example:
-    >>> leafs = ["a", "a*k"]
-    >>> extract_rv(leafs) == {'a', 'k'}
-    True
-    """
-    rd_values = set()
-    for leaf in leafs:
-        for c in leaf:
-            if c.isalpha():
-                rd_values.add(c)
-    return rd_values
-
-
-def compute_leafs(leafs, generated_values):
-    """ Compute leafs from generated random values
-
-    :param generated_values: Dictionnary of name:generated value
-    :param leafs: list of leafs
-    :return: Dictionnary of evaluated leafs from generated values
-
-    :example:
-    >>> leafs = ["a", "a*k"]
-    >>> generated_values = {"a":2, "k":3}
-    >>> compute_leafs(leafs, generated_values)
-    {'a': 2, 'a*k': 6}
-    """
-    return {leaf: eval(leaf, generated_values) for leaf in leafs}
-
-
-def replace_rdleaf(tree, computed_leafs):
-    """ Replace RdLeaf by the corresponding computed value
-
-    >>> from ..tree import Tree
-    >>> rd_t = Tree("+", RdLeaf("a"), RdLeaf("a*k"))
-    >>> computed_leafs = {'a': 2, 'a*k': 6}
-    >>> print(replace_rdleaf(rd_t, computed_leafs))
-    +
-     > 2
-     > 6
-    """
-
-    def replace(leaf):
-        try:
-            return leaf.replace(computed_leafs)
-        except AttributeError:
-            return leaf
-
-    return tree.map_on_leaf(replace)
-
-
-def random_generator(
-    rd_variables, conditions=[], rejected=[0], min_max=(-10, 10), variables_scope={}
-):
-    """ Generate random variables
-
-    :param rd_variables: list of random variables to generate
-    :param conditions: condition over variables
-    :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
-    :return: dictionnary of generated variables
-
-    :example:
-    >>> gene = random_generator(["a", "b"], 
-    ...                  ["a > 0"],
-    ...                  [0], (-10, 10),
-    ...                  {"a": {"rejected": [0, 1]},
-    ...                   "b": {"min_max": (-5, 0)}})
-    >>> gene["a"] > 0
-    True
-    >>> gene["a"] != 0
-    True
-    >>> gene["b"] < 0
-    True
-    >>> gene = random_generator(["a", "b"], 
-    ...                  ["a % b == 0"],
-    ...                  [0, 1], (-10, 10))
-    >>> gene["a"] not in [0, 1]
-    True
-    >>> gene["b"] in list(range(-10, 11))
-    True
-    >>> gene["a"] % gene["b"]
-    0
-    """
-    complete_scope = build_variable_scope(
-        rd_variables, rejected, min_max, variables_scope
-    )
-    choices_list = {
-        v: list(
-            set(
-                range(
-                    complete_scope[v]["min_max"][0], complete_scope[v]["min_max"][1] + 1
-                )
-            ).difference(complete_scope[v]["rejected"])
-        )
-        for v in rd_variables
-    }
-
-    # quantity_choices = reduce(lambda x,y : x*y,
-    #                           [len(choices_list[v]) for v in choices_list])
-    # TODO: améliorer la méthode de rejet avec un cache |dim. mai 12 17:04:11 CEST 2019
-
-    generate_variable = {v: choice(choices_list[v]) for v in rd_variables}
-
-    while not all([eval(c, __builtins__, generate_variable) for c in conditions]):
-        generate_variable = {v: choice(choices_list[v]) for v in rd_variables}
-
-    return generate_variable
-
-
-def build_variable_scope(rd_variables, rejected, min_max, variables_scope):
-    """ Build variables scope from incomplete one
-
-    :param rd_variables: list of random variables to generate
-    :param rejected: Rejected values for the generator 
-    :param min_max: (min, max) limits in between variables will be generated
-    :param variables_scope: rejected and min_max define for individual variables
-    :return: complete variable scope
-
-    :example:
-    >>> completed = build_variable_scope(["a", "b", "c", "d"], [0], (-10, 10),
-    ...                      {"a": {"rejected": [0, 1]},
-    ...                       "b": {"min_max": (-5, 0)},
-    ...                       "c": {"rejected": [2], "min_max": (0, 5)}})
-    >>> complete = {'a': {'rejected': [0, 1], 'min_max': (-10, 10)}, 
-    ...             'b': {'rejected': [0], 'min_max': (-5, 0)},
-    ...             'c': {'rejected': [2], 'min_max': (0, 5)},
-    ...             'd': {'rejected': [0], 'min_max': (-10, 10)}}
-    >>> completed == complete
-    True
-    """
-    complete_scope = variables_scope.copy()
-    for v in rd_variables:
-        try:
-            complete_scope[v]
-        except KeyError:
-            complete_scope[v] = {"rejected": rejected, "min_max": min_max}
-        else:
-            try:
-                complete_scope[v]["rejected"]
-            except KeyError:
-                complete_scope[v]["rejected"] = rejected
-            try:
-                complete_scope[v]["min_max"]
-            except KeyError:
-                complete_scope[v]["min_max"] = min_max
-    return complete_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")
-    :param conditions: condition over variables
-    :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:
-    >>> a, ab, b, c = list_generator(["a", "a*b", "b", "c"])
-    >>> a, ab, b, c # doctest: +SKIP
-    (5, -20, -4, -3)
-    >>> a * b == ab
-    True
-    >>> ab # 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)
-    if dictionnary:
-        return generated
-    return [generated[v] for v in var_list]

mapytex/calculus/core/renders/tree2tex.py

@@ -91,9 +91,11 @@ def mul2tex(left, right):
     '- 3x'
     >>> mul2tex(a, a)
     'x \\times x'
+    >>> mul2tex(a, MO.factory(-3))
+    'x(- 3)'
     """
     left_ = render_with_parenthesis(left, "*")
-    right_ = render_with_parenthesis(right, "*")
+    right_ = render_with_parenthesis(right, "*", is_at_right=True)
 
     display_time = True
     # if (right_[0].isalpha() and (left_.isnumeric() or left_.isdecimal())) or right_[
@@ -183,23 +185,17 @@ def pow2tex(left, right):
     return f"{left_}^{{{right_}}}"
 
 
-def render_with_parenthesis(subtree, operator):
+def render_with_parenthesis(subtree, operator, is_at_right=False):
     subtree_need_parenthesis = False
     try:
         subtree.node
     except AttributeError:
-        try:
-            if (
-                OPERATORS[subtree.MAINOP]["precedence"]
-                < OPERATORS[operator]["precedence"]
-            ):
-                subtree_need_parenthesis = True
-        except (AttributeError, KeyError):
-            pass
         try:
             subtree_ = subtree.__tex__
         except AttributeError:
             subtree_ = str(subtree)
+        if subtree_.startswith("-") and OPERATORS["-"]["precedence"] < OPERATORS[operator]["precedence"] and is_at_right:
+            subtree_need_parenthesis = True
     else:
         if OPERATORS[subtree.node]["precedence"] < OPERATORS[operator]["precedence"]:
             subtree_need_parenthesis = True
@@ -210,7 +206,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 +227,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

@@ -91,11 +91,13 @@ def mul2txt(left, right):
     '- 3x'
     >>> mul2txt(a, a)
     'x * x'
+    >>> mul2txt(a, MO.factory(-3))
+    'x(- 3)'
     """
     display_time = True
 
     left_ = render_with_parenthesis(left, "*")
-    right_ = render_with_parenthesis(right, "*")
+    right_ = render_with_parenthesis(right, "*", is_at_right=True)
 
     if right_[0].isalpha():
         # TODO: C'est bien beurk en dessous... |ven. déc. 21 12:03:07 CET 2018
@@ -187,23 +189,22 @@ def pow2txt(left, right):
     return f"{left_}^{right_}"
 
 
-def render_with_parenthesis(subtree, operator):
+def tree_with_parenthesis(subtree, operator):
+    """ Assuming the subtree is a tree, then have .node """
+    pass
+
+
+def render_with_parenthesis(subtree, operator, is_at_right=False):
     subtree_need_parenthesis = False
     try:
         subtree.node
     except AttributeError:
-        try:
-            if (
-                OPERATORS[subtree.MAINOP]["precedence"]
-                < OPERATORS[operator]["precedence"]
-            ):
-                subtree_need_parenthesis = True
-        except (AttributeError, KeyError):
-            pass
         try:
             subtree_ = subtree.__txt__
         except AttributeError:
             subtree_ = str(subtree)
+        if subtree_.startswith("-") and OPERATORS["-"]["precedence"] < OPERATORS[operator]["precedence"] and is_at_right:
+            subtree_need_parenthesis = True
     else:
         if OPERATORS[subtree.node]["precedence"] < OPERATORS[operator]["precedence"]:
             subtree_need_parenthesis = True
@@ -214,7 +215,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 +236,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

@@ -15,7 +15,6 @@ from decimal import Decimal, InvalidOperation
 from .coroutine import *
 from .operator import is_operator
 from .MO import moify_cor
-from .random.leaf import look_for_rdleaf, RdLeaf
 
 __all__ = ["str2"]
 
@@ -395,11 +394,7 @@ def missing_times(target):
                     elif not is_operator(tok) and tok != ")":
                         target_.send("*")
 
-            if (
+            if not ( is_operator(tok)  or tok =="(" ):
-                isinstance(tok, int)
-                or (isinstance(tok, str) and not is_operator(tok) and not tok == "(")
-                or (isinstance(tok, RdLeaf))
-            ):
                 previous = tok
 
             target_.send(tok)
@@ -484,7 +479,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 +798,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)
@@ -812,37 +809,7 @@ def str2(sink, convert_to_mo=True):
 
     return pipeline
 
-
-def rdstr2(sink):
-    """ Return a pipeline which parse random expression and with sink as endpoint
-
-    :example:
-    >>> rdstr2list = rdstr2(list_sink)
-    >>> rdstr2list("{a}+{a*b}-2")
-    [<RdLeaf a>, '+', <RdLeaf a*b>, '+', <MOnumber - 2>]
-    >>> rdstr2list("{a}({b}x+{c})")
-    [<RdLeaf a>, '*', [<RdLeaf b>, '*', <MOstr x>, '+', <RdLeaf c>]]
-    """
-    lfop = lookfor(is_operator)
-    operator_corout = partial(concurent_broadcast, lookfors=[lfop])
-
-    def pipeline(expression):
-        str2_corout = look_for_rdleaf(
-            lookforNumbers(operator_corout(missing_times(moify_cor(pparser(sink)))))
-        )
-
-        for i in expression.replace(" ", ""):
-            str2_corout.send(i)
-        a = str2_corout.throw(STOOOP)
-
-        return a
-
-    return pipeline
-
-
 str2nestedlist = str2(list_sink)
-
-
 # -----------------------------
 # Reglages pour 'vim'
 # vim:set autoindent expandtab tabstop=4 shiftwidth=4:

mapytex/calculus/core/tree.py

@@ -11,7 +11,7 @@ Tree class
 
 from .tree_tools import to_nested_parenthesis, postfix_concatenate, show_tree
 from .coroutine import coroutine, STOOOP
-from .str2 import str2, rdstr2
+from .str2 import str2
 from .operator import OPERATORS, is_operator
 
 __all__ = ["Tree", "MutableTree"]
@@ -51,7 +51,7 @@ class Tree:
         self.right_value = right_value
 
     @classmethod
-    def from_str(cls, expression, convert_to_mo=True, random=False):
+    def from_str(cls, expression, convert_to_mo=True):
         """ Initiate a tree from an string expression
 
         :example:
@@ -77,26 +77,8 @@ class Tree:
          > *
          | > 3
          | > n
-        >>> t = Tree.from_str("2+{n}x", random=True)
-        >>> print(t)
-        +
-         > 2
-         > *
-         | > {n}
-         | > x
-        >>> t = Tree.from_str("{a}({b}x+{c})", random=True)
-        >>> print(t)
-        *
-         > {a}
-         > +
-         | > *
-         | | > {b}
-         | | > x
-         | > {c}
-
-
         """
-        t = MutableTree.from_str(expression, convert_to_mo, random)
+        t = MutableTree.from_str(expression, convert_to_mo)
         return cls.from_any_tree(t)
 
     @classmethod
@@ -907,7 +889,7 @@ class MutableTree(Tree):
         self.right_value = right_value
 
     @classmethod
-    def from_str(cls, expression, convert_to_mo=True, random=False):
+    def from_str(cls, expression, convert_to_mo=True):
         """ Initiate the MutableTree
 
         :example:
@@ -963,27 +945,7 @@ class MutableTree(Tree):
          | | > 8
          | | > 3
          | > x
-        >>> t = MutableTree.from_str("{b}*x+{c}", random=True)
-        >>> print(t)
-        +
-         > *
-         | > {b}
-         | > x
-         > {c}
-        >>> t = MutableTree.from_str("{a}*({b}*x+{c})", random=True)
-        >>> print(t)
-        *
-         > {a}
-         > +
-         | > *
-         | | > {b}
-         | | > x
-         | > {c}
         """
-        if random:
-            str_2_mut_tree = rdstr2(cls.sink)
-            return str_2_mut_tree(expression)
-        else:
         str_2_mut_tree = str2(cls.sink, convert_to_mo)
         return str_2_mut_tree(expression)
 

mapytex/calculus/random/__init__.py

@@ -0,0 +1,19 @@
+from .list import list_generator as list
+from .expression import expression_generator as expression
+
+__all__ = ["list", "expression"]
+
+"""
+Generate random stuffs
+======================
+
+list_generator
+==============
+
+Generate random lists
+
+expression_generator
+====================
+
+Generate random Expression
+"""

mapytex/calculus/random/core/__init__.py

@@ -0,0 +1,65 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+#
+# Copyright © 2017 lafrite <lafrite@Poivre>
+#
+# Distributed under terms of the MIT license.
+
+"""
+Tools to extract random leaves, random variables, generate random values and
+fill new trees
+
+Flow
+----
+
+Tree with RdLeaf
+|
+| Extract rdLeaf
+|
+List of leaves to generate
+|
+| extract_rv
+|
+List random variables to generate
+|
+| Generate
+|
+Dictionnary of generated random variables
+|
+| Compute leaves
+|
+Dictionnary of computed leaves
+|
+| Replace
+|
+Tree with RdLeaf replaced by generated values
+
+:example:
+
+>>> from .random_tree import RandomTree
+>>> from .leaf import RdLeaf
+>>> from .generate import random_generator
+>>> from .grammar import extract_letters, eval_words
+>>> rd_t = RandomTree("/", RdLeaf("a"), RdLeaf("a*k"))
+>>> print(rd_t)
+/
+ > {a}
+ > {a*k}
+>>> leaves = rd_t.random_leaves
+>>> leaves = ['a', 'a*k']
+>>> rd_varia = extract_letters(leaves)
+>>> sorted(list(rd_varia))
+['a', 'k']
+>>> generated = random_generator(rd_varia, conditions=['a%2+1'], global_config={"min_max": (-10, 10), "rejected":[0, 1]})
+>>> generated # doctest: +SKIP
+{'a': 7, 'k': 4}
+>>> computed = eval_words(leaves, generated)
+>>> computed # doctest: +SKIP
+{'a': 7, 'a*k': 28}
+>>> replaced = rd_t.eval_random_leaves(computed)
+>>> print(replaced) # doctest: +SKIP
+/
+ > 7
+ > 28
+"""

mapytex/calculus/random/core/generate.py

@@ -0,0 +1,116 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+#
+# Copyright © 2017 lafrite <lafrite@Poivre>
+#
+# Distributed under terms of the MIT license.
+
+
+from random import choice
+import math
+
+EVAL_FUN = {**math.__dict__}
+
+
+
+def complete_variable_configs(
+    variables, global_config: dict = {}, configs: dict = {}
+) -> dict:
+    """Completes variables configurations with the global configuration
+
+    :param variables: list of random variables to generate
+    :param global_config: global parameters
+    :param configs: global parameters
+    :return: complete variable scope
+
+    :example:
+    >>> completed = complete_variable_configs(["a", "b", "c", "d"],
+    ...                      global_config={"rejected": [], "min_max": (-10, 10)},
+    ...                      configs={
+    ...                       "a": {"rejected": [0, 1]},
+    ...                       "b": {"min_max": (-5, 0)},
+    ...                       "c": {"rejected": [2], "min_max": (0, 5)}
+    ...                       })
+    >>> completed["a"] == {'rejected': [0, 1], 'min_max': (-10, 10)}
+    True
+    >>> completed["b"] == {'rejected': [], 'min_max': (-5, 0)}
+    True
+    >>> completed['c'] == {'rejected': [2], 'min_max': (0, 5)}
+    True
+    >>> completed['d'] == {'rejected': [], 'min_max': (-10, 10)}
+    True
+    """
+    complete_configs = configs.copy()
+    for variable in variables:
+        try:
+            complete_configs[variable]
+        except KeyError:
+            complete_configs[variable] = global_config
+        else:
+            complete_configs[variable] = dict(global_config, **configs[variable])
+    return complete_configs
+
+
+def random_generator(
+    variables: list[str],
+    conditions: list[str] = [],
+    global_config: dict = {},
+    configs: dict = {},
+) -> dict[str, int]:
+    """Generate random variables
+
+    :param variables: list of random variables to generate
+    :param conditions: condition over variables
+    :param global_config: global parameters
+    :param configs: global parameters
+    :return: dictionnary of generated variables
+
+    In variables and configurations, you have access to all math module functions
+
+    :example:
+    >>> gene = random_generator(["a", "b"],
+    ...                  ["a > 0"],
+    ...                  {"rejected": [0], "min_max":(-10, 10)},
+    ...                  {"a": {"rejected": [0, 1]},
+    ...                   "b": {"min_max": (-5, 0)},
+    ...                  })
+    >>> gene["a"] > 0
+    True
+    >>> gene["a"] != 0
+    True
+    >>> gene["b"] < 0
+    True
+    >>> gene = random_generator(["a", "b"],
+    ...                  ["a % b == 0"],
+    ...                  {"rejected": [0, 1], "min_max":(-10, 10)}
+    ...                  )
+    >>> gene["a"] not in [0, 1]
+    True
+    >>> gene["b"] in list(range(-10, 11))
+    True
+    >>> gene["a"] % gene["b"]
+    0
+    """
+    complete_scope = complete_variable_configs(variables, global_config, configs)
+    choices_list = {
+        v: list(
+            set(
+                range(
+                    complete_scope[v]["min_max"][0], complete_scope[v]["min_max"][1] + 1
+                )
+            ).difference(complete_scope[v]["rejected"])
+        )
+        for v in variables
+    }
+
+    # quantity_choices = reduce(lambda x,y : x*y,
+    #                           [len(choices_list[v]) for v in choices_list])
+    # TODO: améliorer la méthode de rejet avec un cache |dim. mai 12 17:04:11 CEST 2019
+
+    generate_variable = {v: choice(choices_list[v]) for v in variables}
+
+    while not all([eval(c, EVAL_FUN, generate_variable) for c in conditions]):
+        generate_variable = {v: choice(choices_list[v]) for v in variables}
+
+    return generate_variable

mapytex/calculus/random/core/grammar.py

@@ -0,0 +1,43 @@
+import math
+
+EVAL_FUN = {**math.__dict__}
+
+def extract_letters(words: list[str]) -> set[str]:
+    """Extracts unique letters from a list of words
+
+    :param words: list of leafs
+    :return: set of letters
+
+    :example:
+    >>> leafs = ["a", "a*k"]
+    >>> extract_letters(leafs) == {'a', 'k'}
+    True
+    """
+    letters = set()
+    for word in words:
+        for c in word:
+            if c.isalpha():
+                letters.add(c)
+    return letters
+
+
+def eval_words(words: list[str], values: dict[str, int]) -> dict[str, int]:
+    """Evaluate words replacing letters with values
+
+    :param words: list of words
+    :param values: Dictionary of letters:value
+    :return: Dictionary of evaluated words from generated values
+
+    In words, you have access to all math module functions
+
+    :example:
+    >>> leafs = ["a", "a*k"]
+    >>> generated_values = {"a":2, "k":3}
+    >>> eval_words(leafs, generated_values)
+    {'a': 2, 'a*k': 6}
+    >>> leafs = ["exp(a)", "gcd(a, k)"]
+    >>> generated_values = {"a":2, "k":3}
+    >>> eval_words(leafs, generated_values)
+    {'exp(a)': 7.38905609893065, 'gcd(a, k)': 1}
+    """
+    return {word: eval(word, EVAL_FUN, values) for word in words}

mapytex/calculus/random/core/int_gene.py

@@ -111,8 +111,7 @@ def filter_random(min_value=-10, max_value=10, rejected=[0, 1], accept_callbacks
 
 class FilterRandom(object):
 
-    """ Integer random generator which filter then choose candidate
+    """Integer random generator which filter then choose candidate"""
-    """
 
     # TODO: Faire un cache pour éviter de reconstruire les listes à chaque fois |ven. déc. 21 19:07:42 CET 2018
 

mapytex/calculus/random/core/leaf.py

@@ -9,7 +9,7 @@
 """
 
 """
-from ..coroutine import *
+from ...core.coroutine import coroutine, STOOOP
 
 
 @coroutine
@@ -17,7 +17,7 @@ def look_for_rdleaf(target):
     """Coroutine which look to "{...}" which are RdLeaf
 
     :example:
-    >>> from ..str2 import list_sink
+    >>> from ...core.str2 import list_sink
     >>> str2list = look_for_rdleaf(list_sink)
     >>> for i in "{a}+{a*b}-2":
     ...    str2list.send(i)
@@ -53,9 +53,7 @@ def look_for_rdleaf(target):
 
 
 class RdLeaf:
-    """ Random leaf
+    """Random leaf"""
-
-    """
 
     def __init__(self, name):
         self._name = name

mapytex/calculus/random/core/random_tree.py

@@ -0,0 +1,118 @@
+from ...core.tree import MutableTree, Tree
+from ...core.MO import moify
+from .grammar import extract_letters, eval_words
+from .generate import random_generator
+from .str2 import rdstr2
+
+
+class RandomTree(MutableTree):
+    """MutableTree that accept {a} syntax for random generation
+
+    :example:
+    >>> t = RandomTree()
+    >>> type(t)
+    <class 'mapytex.calculus.random.core.random_tree.RandomTree'>
+    """
+
+    @classmethod
+    def from_str(cls, expression):
+        """Initiate a random tree from a string that need to be parsed
+
+        :exemple:
+        >>> t = RandomTree.from_str("{b}*x+{c}")
+        >>> print(t)
+        +
+         > *
+         | > {b}
+         | > x
+         > {c}
+        >>> t = RandomTree.from_str("{a}*({b}*x+{c})")
+        >>> print(t)
+        *
+         > {a}
+         > +
+         | > *
+         | | > {b}
+         | | > x
+         | > {c}
+        """
+        str_2_mut_tree = rdstr2(cls.sink)
+        return str_2_mut_tree(expression)
+
+    @property
+    def random_leaves(self) -> list[str]:
+        """Get list of random leaves
+
+        :example:
+        >>> from .leaf import RdLeaf
+        >>> random_tree = RandomTree("+", RdLeaf("a"), RdLeaf("a*k"))
+        >>> random_tree.random_leaves
+        ['a', 'a*k']
+        >>> random_tree = RandomTree("+", RdLeaf("a"), 2)
+        >>> random_tree.random_leaves
+        ['a']
+        """
+        rd_leafs = []
+        for leaf in self.get_leafs():
+            try:
+                leaf.rdleaf
+            except AttributeError:
+                pass
+            else:
+                rd_leafs.append(leaf.name)
+        return rd_leafs
+
+    @property
+    def random_value(self) -> set[str]:
+        """Get set of random values to generate
+
+        :example:
+        >>> from .leaf import RdLeaf
+        >>> random_tree = RandomTree("+", RdLeaf("a"), RdLeaf("a*k"))
+        >>> random_tree.random_value == {'a', 'k'}
+        True
+        >>> random_tree = RandomTree("+", RdLeaf("a"), 2)
+        >>> random_tree.random_value
+        {'a'}
+        """
+        return extract_letters(self.random_leaves)
+
+    def eval_random_leaves(self, leaves_value: dict[str, int]):
+        """Given random leaves value get the tree
+
+        :example:
+        >>> from .leaf import RdLeaf
+        >>> rd_t = RandomTree("+", RdLeaf("a"), RdLeaf("a*k"))
+        >>> leaves_values = {'a': 2, 'a*k': 6}
+        >>> t = rd_t.eval_random_leaves(leaves_values)
+        >>> type(t)
+        <class 'mapytex.calculus.core.tree.Tree'>
+        >>> print(t)
+        +
+         > 2
+         > 6
+        """
+
+        def replace(leaf):
+            try:
+                return leaf.replace(leaves_value)
+            except AttributeError:
+                return leaf
+
+        return self.map_on_leaf(replace).map_on_leaf(moify)
+
+    def generate(
+        self, conditions: list[str] = [], global_config: dict = {}, configs: dict = {}
+    ) -> Tree:
+        """Generate a random version of self
+
+        :param conditions: list of conditions
+        :param config: global configuration for generated values
+        :param configs: specific configuration for each generated values
+
+        """
+        generated_values = random_generator(
+            self.random_value, conditions, global_config, configs
+        )
+        leaves = eval_words(self.random_leaves, generated_values)
+        return self.eval_random_leaves(leaves)

mapytex/calculus/random/core/str2.py

@@ -0,0 +1,40 @@
+from ...core.operator import is_operator
+from functools import partial
+from ...core.str2 import (
+    concurent_broadcast,
+    lookforNumbers,
+    pparser,
+    missing_times,
+    lookfor,
+)
+from ...core.coroutine import STOOOP
+from ...core.MO import moify_cor
+from .leaf import look_for_rdleaf
+
+
+def rdstr2(sink):
+    """Return a pipeline which parse random expression and with sink as endpoint
+
+    :example:
+    >>> from ...core.str2 import list_sink
+    >>> rdstr2list = rdstr2(list_sink)
+    >>> rdstr2list("{a}+{a*b}-2")
+    [<RdLeaf a>, '+', <RdLeaf a*b>, '+', <MOnumber -2>]
+    >>> rdstr2list("{a}({b}x+{c})")
+    [<RdLeaf a>, '*', [<RdLeaf b>, '*', <MOstr x>, '+', <RdLeaf c>]]
+    """
+    lfop = lookfor(is_operator)
+    operator_corout = partial(concurent_broadcast, lookfors=[lfop])
+
+    def pipeline(expression):
+        str2_corout = look_for_rdleaf(
+            lookforNumbers(operator_corout(missing_times(moify_cor(pparser(sink)))))
+        )
+
+        for i in expression.replace(" ", ""):
+            str2_corout.send(i)
+        a = str2_corout.throw(STOOOP)
+
+        return a
+
+    return pipeline

mapytex/calculus/random/expression.py

@@ -0,0 +1,43 @@
+from ..API.expression import Expression
+from .core.random_tree import RandomTree
+
+DEFAUTL_CONFIG = {
+    "rejected": [0, 1],
+    "min_max": (-10, 10),
+}
+
+
+def expression_generator(
+    template: str,
+    conditions: list[str] = [],
+    global_config: dict = {},
+    configs: dict = {},
+):
+    """Generate a random expression
+
+    :param template: the template of the expression
+    :param conditions: conditions on randomly generate variable
+    :param global_config: configuration for all variables
+    :param configs: configuration for each variables
+    :return: Expression or Token generated
+
+    :example:
+    >>> e = expression_generator("{a}/{a*k}")
+    >>> e # doctest: +SKIP
+    <Exp: -3 / -15>
+    >>> e = expression_generator("{a}/{a*k} - 3*{b}", configs={'a':{'min_max':(10, 30)}})
+    >>> e # doctest: +SKIP
+    <Exp: 18 / 108 - 3 * 9>
+    >>> e = expression_generator("{a}*x + {b}*x + 3", conditions=["a>b"], global_config={"rejected":[0, 1]})
+    >>> print(e) # doctest: +SKIP
+    10x - 6x + 3
+    >>> ee = e.simplify()
+    >>> print(ee) # doctest: +SKIP
+    4x + 3
+
+    """
+    rd_tree = RandomTree.from_str(template)
+    generated_tree = rd_tree.generate(
+        conditions, dict(DEFAUTL_CONFIG, **global_config), configs
+    )
+    return Expression._post_processing(generated_tree)

mapytex/calculus/random/list.py

@@ -0,0 +1,64 @@
+"""
+List generator
+--------------
+
+This function ignores tree structure and works with lists
+
+>>> values = list_generator(["a", "a*b", "b", "c"], conditions=["b%c==1"])
+>>> values # doctest: +SKIP
+{'a': -8, 'a*b': -40, 'b': 5, 'c': 4}
+"""
+
+from .core.generate import random_generator
+from .core.grammar import extract_letters, eval_words
+
+DEFAUTL_CONFIG = {
+    "rejected": [0],
+    "min_max": (-10, 10),
+}
+
+
+def list_generator(
+    template: list[str],
+    conditions: list[str] = [],
+    global_config: dict = {},
+    configs: dict = {},
+) -> list[int]:
+    """Generate random computed values from the list
+
+    :param rd_variables: list of random variables to generate (can be computed value - "a*b")
+    :param conditions: condition over variables
+    :param global_config: configuration for all variables
+    :param configs: configuration for each variables
+    :return: list of generated variables
+
+    :example:
+    >>> a, ab, b, c = list_generator(["a", "a*b", "b", "c"])
+    >>> a, ab, b, c # doctest: +SKIP
+    (5, -20, -4, -3)
+    >>> a * b == ab
+    True
+    >>> ab # doctest: +SKIP
+    -20
+    >>> a, b # doctest: +SKIP
+    5, -4
+    >>> a, ab, b, c = list_generator(["a", "a*b", "b", "c"], conditions=["a-b==0"])
+    >>> a - b == 0
+    True
+    >>> a, ab, b, c = list_generator(["a", "a*b", "b", "c"], global_config={"rejected": [2, 3, 5, 7]})
+    >>> a not in [2, 3, 5, 7]
+    True
+    >>> b not in [2, 3, 5, 7]
+    True
+    >>> c not in [2, 3, 5, 7]
+    True
+    >>> a, ab, b, c = list_generator(["a", "a*b", "b", "c"], configs={"a": {"rejected": [2, 3, 5, 7]}})
+    >>> a not in [2, 3, 5, 7]
+    True
+    """
+    rv = extract_letters(template)
+    rv_gen = random_generator(
+        rv, conditions, dict(DEFAUTL_CONFIG, **global_config), configs
+    )
+    generated = eval_words(template, rv_gen)
+    return [generated[v] for v in template]

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

test/calculus/core/test_render.py

@@ -0,0 +1,31 @@
+import mapytex
+
+def test_default_render():
+    assert mapytex.render.render_name == "txt"
+
+def test_default_rending():
+    e = mapytex.Expression("2*3")
+    assert str(e) == "2*3"
+
+def test_changing_render():
+    assert mapytex.render.render_name == "txt"
+    mapytex.render.set_render("tex")
+    assert mapytex.render.render_name == "tex"
+    mapytex.render.set_render("txt")
+    assert mapytex.render.render_name == "txt"
+
+
+def test_changing_rending():
+    e = mapytex.Expression.from_str("2*3")
+    f = mapytex.Expression.from_str("2/3")
+    assert str(e) == "2 * 3"
+    assert str(f) == "2 / 3"
+    mapytex.render.set_render("tex")
+    assert str(e) == "2 \\times 3"
+    assert str(f) == "\\dfrac{2}{3}"
+    mapytex.render.set_render("txt")
+    assert str(e) == "2 * 3"
+    assert str(f) == "2 / 3"
+
+
+

test/calculus/random/test_expression_generator.py

@@ -0,0 +1,15 @@
+import mapytex
+
+def test_generate_expression():
+    random_expression = mapytex.random.expression("{a}+{b}")
+    assert type(random_expression).__name__ == "Expression"
+    random_expression = mapytex.random.expression("{a}/{b}")
+    assert type(random_expression).__name__ == "Fraction"
+
+def test_generate_expression_calculus():
+    random_expression = mapytex.random.expression("{a}+{a*b}")
+    assert type(random_expression).__name__ == "Expression"
+    random_expression = mapytex.random.expression("{a}/{a*b}", global_config={"min_max": (2, 10)})
+    assert type(random_expression).__name__ == "Fraction"
+    assert random_expression.numerator / random_expression.denominator <= 1
+

test/calculus/random/test_list_generator.py

@@ -0,0 +1,55 @@
+import mapytex
+
+def test_generate_list():
+    random_list = mapytex.random.list(["a", "b"])
+    assert len(random_list) == 2
+    random_list = mapytex.random.list(["a", "b", "c"])
+    assert len(random_list) == 3
+    random_list = mapytex.random.list(["a", "b", "a", "b"])
+    assert random_list[0] == random_list[2]
+    assert random_list[1] == random_list[3]
+
+def test_generate_list_calculus():
+    random_list = mapytex.random.list(["a", "b", "a+b"])
+    assert random_list[0] + random_list[1] == random_list[2]
+
+    random_list = mapytex.random.list(["a", "b", "a-b"])
+    assert random_list[0] - random_list[1] == random_list[2]
+
+    random_list = mapytex.random.list(["a", "b", "a*b"])
+    assert random_list[0] * random_list[1] == random_list[2]
+
+    random_list = mapytex.random.list(["a", "b", "a/b"])
+    assert random_list[0] / random_list[1] == random_list[2]
+
+def test_generate_list_calculus_math():
+    import math
+    a, b, gcd = mapytex.random.list(["a", "b", "gcd(a, b)"])
+    assert math.gcd(a, b) == gcd
+    a, b, exp, cos = mapytex.random.list(["a", "b", "exp(a)", "cos(b)"])
+    assert math.exp(a) == exp
+    assert math.cos(b) == cos
+
+
+def test_generate_list_conditions():
+    a, b = mapytex.random.list(["a", "b"], conditions=["a + b == 10"])
+    assert a + b == 10
+    a, b = mapytex.random.list(["a", "b"], conditions=["a * b > 0", "a + b == 10"])
+    assert a + b == 10
+    assert a * b > 0
+
+def test_generate_list_conditions_math():
+    import math
+    a, b = mapytex.random.list(["a", "b"], conditions=["gcd(a, b) == 3"])
+    assert math.gcd(a, b) == 3
+
+def test_generate_list_global_config():
+    global_config = {"rejected": [0, 1, 2, 3]}
+    a, = mapytex.random.list(["a"], global_config=global_config)
+    assert a not in global_config["rejected"]
+
+    global_config = {"min_max": (20, 30)}
+    a, = mapytex.random.list(["a"], global_config=global_config)
+    assert a >= 20
+    assert a <= 30
+