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

redefine priorities

Browse Source
This commit is contained in:
Lafrite 2013-12-10 11:46:13 +01:00
parent 9a62f0f6f5
commit 81725a6104
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
expression.py
View File

@ -7,7 +7,7 @@ from fraction import Fraction
class Expression(object):
"""A calculus expression. Today it can andle only expression with numbers later it will be able to manipulate unknown"""
PRIORITY = {"*" : 3, "/": 3, "+": 2, "-":2, "(": 1}
PRIORITY = {"*" : 3, "/": 4, "+": 2, "-":2, "(": 1}
def __init__(self, exp):
""" Initiate the expression
@ -408,16 +408,19 @@ if __name__ == '__main__':
#exp = "( 2 + 5 ) * ( 3 * 4 )"
#test(exp)
exp = "( 2 + 5 - 1 ) / ( 3 * 4 )"
test(exp)
#exp = "( 2 + 5 - 1 ) / ( 3 * 4 )"
#test(exp)
exp = "( 2 + 5 ) / ( 3 * 4 ) + 1 / 12"
test(exp)
#exp = "( 2 + 5 ) / ( 3 * 4 ) + 1 / 12"
#test(exp)
exp = "( 2 + 5 ) / ( 3 * 4 ) + 1 / 2"
test(exp)
#exp = "( 2 + 5 ) / ( 3 * 4 ) + 1 / 2"
#test(exp)
exp = "( 2 + 5 ) / ( 3 * 4 ) + 1 / 12 + 5 * 5"
#exp = "( 2 + 5 ) / ( 3 * 4 ) + 1 / 12 + 5 * 5"
#test(exp)
exp = "3 / 7 - 2 / 7 * 4 / 3"
test(exp)
import doctest