From c30fd892822f47baeef0cf5328508ff35a55d427 Mon Sep 17 00:00:00 2001
From: lafrite <lafrite@poneyworld.net>
Date: Fri, 14 Nov 2014 16:48:38 +0100
Subject: [PATCH] add operation for expression

---
 pymath/expression.py    | 50 ++++++++++++++++++++++++++++++++++++++++-
 test/test_expression.py | 21 +++++++++++++++--
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/pymath/expression.py b/pymath/expression.py
index 6e8840e..6005307 100644
--- a/pymath/expression.py
+++ b/pymath/expression.py
@@ -4,6 +4,7 @@
 from .generic import Stack, flatten_list, expand_list, isNumber, isOperator
 from .render import txt, tex
 from .str2tokens import str2tokens
+from .operator import op
 
 __all__ = ['Expression']
 
@@ -134,7 +135,52 @@ class Expression(object):
     # -----------
     # Some math manipulations
 
+    def operate(self, other, operator):
+        if type(other) == Expression:
+            return Expression(self.postfix_tokens + other.postfix_tokens + [operator])
+        elif type(other) == list:
+            return Expression(self.postfix_tokens + other + [operator])
+        else:
+            return Expression(self.postfix_tokens + [other] + [operator])
+    
+    def roperate(self, other, operator):
+        if type(other) == Expression:
+            return Expression(other.postfix_tokens + self.postfix_tokens + [operator])
+        elif type(other) == list:
+            return Expression(other + self.postfix_tokens + [operator])
+        else:
+            return Expression([other] + self.postfix_tokens + [operator])
 
+    def __add__(self, other):
+        return self.operate(other, op.add)
+
+    def __radd__(self, other):
+        return self.roperate(other, op.add)
+
+    def __sub__(self, other):
+        return self.operate(other, op.sub)
+
+    def __rsub__(self, other):
+        return self.roperate(other, op.sub)
+
+    def __mul__(self, other):
+        return self.operate(other, op.mul)
+
+    def __rmul__(self, other):
+        return self.roperate(other, op.mul)
+
+    def __div__(self, other):
+        return self.operate(other, op.div)
+
+    def __rdiv__(self, other):
+        return self.roperate(other, op.div)
+
+    def __pow__(self, other):
+        return self.operate(other, op.pow)
+
+    def __neg__(self):
+        return Expression(self.postfix_tokens + [op.sub1])
+    
 
 def test(exp):
     a = Expression(exp)
@@ -156,7 +202,9 @@ if __name__ == '__main__':
     test([Expression(exp1), Expression(exp), op.add])
 
     exp = "1 + 3 * 5"
-    test(exp)
+    e = Expression(exp)
+    f = -e
+    print(f)
 
     #exp = "2 * 3 * 3 * 5"
     #test(exp)
diff --git a/test/test_expression.py b/test/test_expression.py
index 57688a6..1f324ac 100644
--- a/test/test_expression.py
+++ b/test/test_expression.py
@@ -26,17 +26,34 @@ class TestExpression(unittest.TestCase):
         self.assertEqual(exp.postfix_tokens, [2, 3, "+"])
 
     def test_simplify_frac(self):
+        render = lambda x : str(x)
         exp = Expression("1/2 - 4")
-        Expression.STR_RENDER = lambda _,x : str(x)
         steps = ["[1, 2, '/', 4, '-']", \
                 "[< Fraction 1 / 2>, 4, '-']", \
                 "[1, 1, '*', 2, 1, '*', '/', 4, 2, '*', 1, 2, '*', '/', '-']", \
                 "[1, 8, '-', 2, '/']", \
                 '[< Fraction -7 / 2>]']
-        self.assertEqual(steps, list(exp.simplify()))
+        self.assertEqual(steps, list(exp.simplify(render = render)))
 
         Expression.STR_RENDER = tex
 
+    def test_add_exp(self):
+        e = Expression("12- 4")
+        f = Expression("4 + 1")
+        g = e + f
+        self.assertEqual(g.postfix_tokens, [12, 4, '-', 4, 1, "+", "+"])
+
+    def test_mul_exp(self):
+        e = Expression("12- 4")
+        f = Expression("4 + 1")
+        g = e * f
+        self.assertEqual(g.postfix_tokens, [12, 4, '-', 4, 1, "+", "*"])
+
+    def test_neg_exp(self):
+        e = Expression("12- 4")
+        g = -e 
+        self.assertEqual(g.postfix_tokens, [12, 4, '-', '-'])
+
 
 if __name__ == '__main__':
     unittest.main()