From d74e18b663b6fa8049bafa4f4b5415171e4c3ecc Mon Sep 17 00:00:00 2001 From: lafrite Date: Sat, 18 Jan 2014 19:07:44 +0100 Subject: [PATCH] Change ** to ^ and mod test in render --- pymath/formal.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pymath/formal.py b/pymath/formal.py index 4792275..7fe01bb 100644 --- a/pymath/formal.py +++ b/pymath/formal.py @@ -35,7 +35,7 @@ class FormalExp(object): :returns: a_n """ - pattern = "\w\*\*(\d*)" + pattern = "\w\^(\d*)" finder = re.compile(pattern) power = {} for (k,v) in self._coef.items(): @@ -135,12 +135,12 @@ class FormalExp(object): def __str__(self): return " + ".join([str(v) + str(k) for k,v in self._coef.items()]) - + if __name__ == '__main__': fe1 = FormalExp({"x": 1, "":2}) - print(fe1) - fe2 = FormalExp({"x**12": 5, "":2}) - print(fe2) + print(fe1.get_postfix()) + fe2 = FormalExp({"x^12": 5, "":2}) + print(fe2.get_postfix()) fe3 = fe1 * fe2 for s in fe3: print(s)