Feat: change frac to dfrac for fractions

possible

.drone.yml

@@ -1,18 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-  - name: testing
-    image: python
-    commands:
-      - pip install -r requirements.txt
-      - pytest --doctest-modules ./mapytex/
-  - name: Publish
-    image: plugins/pypi
-    settings:
-      username:
-        from_secret: pypi_username
-      password:
-        from_secret: pypi_password
-    when:
-      event: tag

README.md

@@ -1,5 +1,4 @@
 # Mapytex
-[![Build Status](https://drone.opytex.org/api/badges/lafrite/Mapytex/status.svg)](https://drone.opytex.org/lafrite/Mapytex)
 
 Formal calculus with explanation python module and exercises creation tools.
 

mapytex/__init__.py

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

mapytex/calculus/__init__.py

@@ -31,7 +31,6 @@ Expression is the classe wich handle all calculus. It can randomly generate or i
 """
 
 from .API import Expression, Integer, Decimal
-from .core import list_generator
 from decimal import getcontext
 #getcontext().prec = 2
 

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

mapytex/calculus/core/random/__init__.py

@@ -47,8 +47,8 @@ Tree with RdLeaf replaced by generated values
 >>> leafs
 ['a', 'a*k']
 >>> rd_varia = extract_rv(leafs)
->>> sorted(list(rd_varia))
-['a', 'k']
+>>> rd_varia # doctest: +SKIP
+{'a', 'k'}
 >>> generated = random_generator(rd_varia, conditions=['a%2+1'])
 >>> generated # doctest: +SKIP
 {'a': 7, 'k': 4}
@@ -61,18 +61,8 @@ Tree with RdLeaf replaced by generated values
  > 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__ = ["generator"]
-
 from random import choice
 from functools import reduce
 from .leaf import RdLeaf
@@ -254,27 +244,3 @@ def build_variable_scope(rd_variables, rejected, min_max, variables_scope):
             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={}):
-    """ 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
-    :return: dictionnary of generated variables
-
-    :example:
-    >>> values = list_generator(["a", "a*b", "b", "c"])
-    >>> values  # doctest: +SKIP
-    >>> values["a"] * values["b"] == values["a*b"]
-    True
-    >>> values["a*b"] # doctest: +SKIP
-    >>> values["a"] * values["b"] # doctest: +SKIP
-    """
-    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

mapytex/stat/random_generator.py

@@ -23,18 +23,12 @@ def random_generator(
     :param v_max: maximum accepted value
     :param exact_mean: if set, the last generated number will be create in order that the computed mean is exacly equal to "exact_mean"
 
-    >>> random_generator(10) # doctest: +SKIP
-    [-0.76, 0.46, 0.19, 0.08, -1.13, -0.5, 0.47, -2.11, 0.16, -1.05]
-    >>> random_generator(10, distrib = uniform, rd_args = (5, 10)) # doctest: +SKIP
-    [9.01, 5.32, 5.59, 8.8, 7.36, 6.9, 6.05, 7.44, 9.47, 6.95]
-    >>> random_generator(10, distrib = "uniform", rd_args = (5, 10)) # doctest: +SKIP
-    [7.85, 9.01, 5.32, 5.59, 8.8, 7.36, 6.9, 6.05, 7.44, 9.47]
-    >>> random_generator(10, v_min = 0) # doctest: +SKIP
-    [0.46, 0.19, 0.08, 0.47, 0.16, 0.87, 0.17, 1.79, 0.19, 1.12]
-    >>> random_generator(10, exact_mean = 0) # doctest: +SKIP
-    [-0.76, 0.46, 0.19, 0.08, -1.13, -0.5, 0.47, -2.11, 0.16, 3.14]
-    >>> random_generator(10, distrib = gauss, rd_args = (50,20), nbr_format = int) # doctest: +SKIP
-    [34, 59, 53, 51, 27, 40, 59, 7, 53, 28]
+    >>> random_generator(10)
+    >>> random_generator(10, distrib = uniform, rd_args = (5, 10))
+    >>> random_generator(10, distrib = "uniform", rd_args = (5, 10))
+    >>> random_generator(10, v_min = 0)
+    >>> random_generator(10, exact_mean = 0)
+    >>> random_generator(10, distrib = gauss, rd_args = (50,20), nbr_format = int)
 
     """
     # if exact_mean is set, we create automaticaly only length-1 value

setup.py

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