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

str2tokens handle polynoms

Browse Source
This commit is contained in:
Lafrite 2014-12-22 10:57:18 +01:00
parent 895c8ed145
commit 1ae92b22f5
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pymath/str2tokens.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# encoding: utf-8 # encoding: utf-8
from .generic import Stack, isOperator, isNumber from .generic import Stack, isOperator, isNumber, isPolynom
from pymath.operator import op from pymath.operator import op
def str2tokens(exp): def str2tokens(exp):
@ -9,9 +9,10 @@ def str2tokens(exp):
>>> str2tokens('2+3*4') >>> str2tokens('2+3*4')
[2, 3, 4, '*', '+'] [2, 3, 4, '*', '+']
>>> str2tokens('2*3+4') >>> str2tokens('2*3+4')
[2, 3, '*', 4, '+'] [2, 3, '*', 4, '+']
>>> str2tokens('2x+4')
[2, < Polynom [0, 1]>, '*', 1, '+']
""" """
in_tokens = str2in_tokens(exp) in_tokens = str2in_tokens(exp)
post_tokens = in2post_fix(in_tokens) post_tokens = in2post_fix(in_tokens)
@ -57,12 +58,22 @@ def str2in_tokens(exp):
tokens.append(character) tokens.append(character)
elif character == "(": elif character == "(":
# If "3(", ")(" # If "3(", ")(", "x("
if isNumber(tokens[-1]) \ if isNumber(tokens[-1]) \
or tokens[-1] == ")" : or tokens[-1] == ")" \
or isPolynom(tokens[-1]):
tokens.append("*") tokens.append("*")
tokens.append(character) tokens.append(character)
elif character.isalpha():
# If "3x", ")x", "xy"
if isNumber(tokens[-1]) \
or tokens[-1] == ")" \
or isPolynom(tokens[-1]):
tokens.append("*")
from pymath.polynom import Polynom
tokens.append(Polynom([0,1], letter = character))
elif character == ".": elif character == ".":
raise ValueError("No float number please") raise ValueError("No float number please")
@ -155,12 +166,20 @@ if __name__ == '__main__':
# #
#print(in2post_fix(in_tokens)) #print(in2post_fix(in_tokens))
print(in2post_fix([op.par, 2, op.add, 5, op.sub, 1, ')', op.div, op.par, 3, op.mul, 4, ')'])) #print(in2post_fix([op.par, 2, op.add, 5, op.sub, 1, ')', op.div, op.par, 3, op.mul, 4, ')']))
print(in2post_fix([op.sub1, op.par, op.sub1, 2, ')'])) #print(in2post_fix([op.sub1, op.par, op.sub1, 2, ')']))
print(in2post_fix([op.sub1, op.par, op.sub1, 2, op.add, 3, op.mul, 4, ')'])) #print(in2post_fix([op.sub1, op.par, op.sub1, 2, op.add, 3, op.mul, 4, ')']))
import doctest print(str2tokens('2*3+4'))
doctest.testmod() print("\n------")
print(str2tokens('2x+4'))
print("\n------")
print(str2tokens('xx+4'))
print("\n------")
print(str2tokens('x(2+1)+4'))
print("\n------")
#import doctest
#doctest.testmod()
# ----------------------------- # -----------------------------