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

Change ** to ^ and mod test in render

This commit is contained in:
lafrite 2014-01-18 19:07:44 +01:00 committed by Lafrite
parent 9b104f020f
commit d74e18b663
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pymath/formal.py
View File

@ -35,7 +35,7 @@ class FormalExp(object):
:returns: a_n :returns: a_n
""" """
pattern = "\w\*\*(\d*)" pattern = "\w\^(\d*)"
finder = re.compile(pattern) finder = re.compile(pattern)
power = {} power = {}
for (k,v) in self._coef.items(): for (k,v) in self._coef.items():
@ -135,12 +135,12 @@ class FormalExp(object):
def __str__(self): def __str__(self):
return " + ".join([str(v) + str(k) for k,v in self._coef.items()]) return " + ".join([str(v) + str(k) for k,v in self._coef.items()])
if __name__ == '__main__': if __name__ == '__main__':
fe1 = FormalExp({"x": 1, "":2}) fe1 = FormalExp({"x": 1, "":2})
print(fe1) print(fe1.get_postfix())
fe2 = FormalExp({"x**12": 5, "":2}) fe2 = FormalExp({"x^12": 5, "":2})
print(fe2) print(fe2.get_postfix())
fe3 = fe1 * fe2 fe3 = fe1 * fe2
for s in fe3: for s in fe3:
print(s) print(s)