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

add Docstring for postfix in Polynom and solve bug with - and list

Browse Source
This commit is contained in:
Lafrite 2014-12-23 10:55:18 +01:00
parent f301b7f0ae
commit 74b463d2af
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pymath/polynom.py
View File

@ -174,6 +174,31 @@ class Polynom(object):
:returns: the postfix list of polynom's tokens :returns: the postfix list of polynom's tokens
>>> p = Polynom([1, 2])
>>> p.postfix
[2, 'x', '*', 1, '+']
>>> p = Polynom([1, -2])
>>> p.postfix
[2, 'x', '*', '-', 1, '+']
>>> p = Polynom([1,2,3])
>>> p.postfix
[3, 'x', 2, '^', '*', 2, 'x', '*', '+', 1, '+']
>>> p = Polynom([1,[2,3]])
>>> p.postfix
[2, 'x', '*', 3, 'x', '*', '+', 1, '+']
>>> p = Polynom([1,[2,-3]])
>>> p.postfix
[2, 'x', '*', 3, 'x', '*', '-', 1, '+']
>>> p = Polynom([1,[-2,-3]])
>>> p.postfix
[2, 'x', '*', '-', 3, 'x', '*', '-', 1, '+']
>>> from pymath.expression import Expression
>>> from pymath.operator import op
>>> e = Expression([2,3,op.add])
>>> p = Polynom([1,e])
>>> p.postfix
[2, 3, '+', 'x', '*', 1, '+']
""" """
# TODO: Faudrait factoriser un peu tout ça..! |dim. déc. 21 16:02:34 CET 2014 # TODO: Faudrait factoriser un peu tout ça..! |dim. déc. 21 16:02:34 CET 2014
postfix = [] postfix = []
@ -191,6 +216,8 @@ class Polynom(object):
elif type(a) == list: elif type(a) == list:
# case need to repeat the x^i # case need to repeat the x^i
for b in a: for b in a:
operator = [op.add]
operator_sub1 = []
if len(postfix) == 0 and isNumber(b) and b < 0: if len(postfix) == 0 and isNumber(b) and b < 0:
try: try:
b = [(-b)[-1]] b = [(-b)[-1]]
@ -501,6 +528,8 @@ if __name__ == '__main__':
p = Polynom([10, -5]) p = Polynom([10, -5])
q = Polynom([3, -9]) q = Polynom([3, -9])
print(p-q) print(p-q)
for i in p-q:
print(i)
import doctest import doctest