Compare commits
43 Commits
V2.3
...
7e4bfc9ba0
Author | SHA1 | Date | |
---|---|---|---|
7e4bfc9ba0 | |||
cdfd3e47b5 | |||
364f16b872 | |||
cc94f1f50c | |||
ad6923f8cd | |||
fadd93b9a6 | |||
cb8010c7ac | |||
f12ec38746 | |||
f8b24472d1 | |||
240857a7ad | |||
70ec6933ac | |||
91779bd945 | |||
69e1e43966 | |||
16a6c4953d | |||
84c71f6b5d | |||
2a74722b19 | |||
43fd46379c | |||
2d296cf1d2 | |||
12109156d1 | |||
2fad004d6d | |||
207dead5d0 | |||
e24bff23db | |||
69c2b3718d | |||
9c25142a4b | |||
931e55c35e | |||
aba43c9f19 | |||
b93f34bc38 | |||
204fdf755b | |||
d75fd4c4cf | |||
a32b684b6b | |||
a5f062a151 | |||
f8e1c7f962 | |||
1685c73051 | |||
04ac74d17a | |||
23ab39f7d4 | |||
41385ec561 | |||
8389a319f0 | |||
6e24756746 | |||
d45ab560c9 | |||
fa8beb6bb2 | |||
b81281d78a | |||
071b8caf1d | |||
1ed0b9715a |
@@ -7,12 +7,3 @@ steps:
|
||||
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
|
||||
|
@@ -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')
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
||||
# -----------------------------
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user