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

think it's important but can't remember...

This commit is contained in:
Lafrite 2014-12-22 15:31:00 +01:00
parent 457896c847
commit f64ad83faf
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pymath/expression.py
View File

@ -121,15 +121,21 @@ class Expression(object):
old_s = new_s old_s = new_s
yield new_s yield new_s
try: if Expression.isExpression(self.child):
for s in self.child.simplify(): for s in self.child.simplify():
if old_s != s: if old_s != s:
old_s = s
yield s yield s
if not Expression.isExpression(self.child): else:
for s in self.child.simplify():
new_s = self.STR_RENDER([s])
# Astuce pour éviter d'avoir deux fois la même étape (par exemple pour la transfo d'une division en fraction)
if new_s != old_s:
old_s = new_s
yield new_s
if old_s != str(self.child):
yield self.STR_RENDER([self.child]) yield self.STR_RENDER([self.child])
except AttributeError:
yield self.STR_RENDER([self.child])
def simplified(self): def simplified(self):
""" Get the simplified version of the expression """ """ Get the simplified version of the expression """
@ -283,7 +289,7 @@ class Expression(object):
def test(exp): def test(exp):
a = Expression(exp) a = Expression(exp)
#print(a) print(a)
for i in a.simplify(): for i in a.simplify():
print(type(i)) print(type(i))
print(i) print(i)
@ -293,12 +299,17 @@ def test(exp):
print("\n") print("\n")
if __name__ == '__main__': if __name__ == '__main__':
Expression.set_render(txt) render = lambda _,x : str(x)
Expression.set_render(render)
exp = Expression("1/2 - 4")
print(list(exp.simplify()))
#Expression.set_render(txt)
#exp = "2 ^ 3 * 5" #exp = "2 ^ 3 * 5"
#test(exp) #test(exp)
exp = "2x + 5" #exp = "2x + 5"
test(exp) #test(exp)
#Expression.set_render(tex) #Expression.set_render(tex)
@ -370,10 +381,10 @@ if __name__ == '__main__':
#exp="-(-2)" #exp="-(-2)"
#test(exp) #test(exp)
print("\n") #print("\n")
exp = Expression.random("({a} + 3)({b} - 1)", ["{a} > 4"]) #exp = Expression.random("({a} + 3)({b} - 1)", ["{a} > 4"])
for i in exp.simplify(): #for i in exp.simplify():
print(i) # print(i)
#import doctest #import doctest
#doctest.testmod() #doctest.testmod()