lafrite/Mapytex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Feat(Core/API): Random generation methods for numbers

Browse Source
This commit is contained in:
Bertrand Benjamin
2018-12-22 08:42:31 +01:00
parent fd49a6c987
commit f04e221f70
2 changed files with 141 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mapytex/calculus/API/tokens/number.py
View File

@@ -14,6 +14,7 @@ from decimal import Decimal as _Decimal
from random import random, randint
from .token import Token
from ...core.arithmetic import gcd
from ...core.random import filter_random
from ...core.MO import MO, MOnumber
from ...core.MO.fraction import MOFraction
@@ -58,7 +59,7 @@ class Integer(Token):
min_value = -10,
max_value = 10,
rejected = [0, 1],
reject_callbacks=[],
accept_callbacks=[],
):
""" Generate a random Integer
@@ -66,14 +67,11 @@ class Integer(Token):
:param min_value: minimum value
:param max_value: maximum value
:param rejected: rejected values
:param reject_callbacks: list of function for value rejection
:param accept_callbacks: list of function for value acceptation
"""
conditions = [lambda x: x in rejected] + reject_callbacks
candidate = randint(min_value, max_value)
while any(c(candidate) for c in conditions):
candidate = randint(min_value, max_value)
candidate = filter_random(min_value, max_value,
rejected, accept_callbacks)
return Integer(candidate, name)
@@ -181,10 +179,10 @@ class Fraction(Token):
name="",
fix_num="",
min_num=-10, max_num=10, rejected_num=[0],
reject_num_callbacks=[],
accept_num_callbacks=[],
fix_denom="",
min_denom=-10, max_denom=10, rejected_denom=[0, 1, -1],
reject_denom_callbacks=[],
accept_denom_callbacks=[],
irreductible=False,
not_integer=True
):
@@ -195,39 +193,37 @@ class Fraction(Token):
: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 reject_num_callbacks: list of function for numerator rejection
: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 reject_denom_callbacks: list of function for denomerator rejection
: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 == "":
conditions = [lambda x: x in rejected_denom] + reject_num_callbacks
num = randint(min_num, max_num)
while any(c(num) for c in conditions):
num = randint(min_num, max_num)
num = filter_random(min_num, max_num,
rejected_num,
accept_num_callbacks)
else:
num = fix_num
if fix_denom == "":
conditions = [lambda x: x in rejected_denom] + reject_denom_callbacks
accept_callbacks = accept_denom_callbacks
if irreductible:
def not_prime_with_num(denom):
return gcd(num, denom) != 1
conditions.append(not_prime_with_num)
def prime_with_num(denom):
return gcd(num, denom) == 1
accept_callbacks.append(prime_with_num)
if not_integer:
def divise_num(denom):
return num % denom == 0
conditions.append(divise_num)
def not_divise_num(denom):
return num % denom != 0
accept_callbacks.append(not_divise_num)
denom = randint(min_denom, max_denom)
while any(c(denom) for c in conditions) :
denom = randint(min_denom, max_denom)
denom = filter_random(min_denom, max_denom,
rejected_denom,
accept_callbacks)
else:
denom = fix_denom