From 80261d97d3c67d501ae7db17616b27c6ad540413 Mon Sep 17 00:00:00 2001 From: lafrite Date: Tue, 11 Nov 2014 09:58:47 +0100 Subject: [PATCH] expression and test --- pymath/expression.py | 12 ------------ test/test_expression.py | 15 +++------------ 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/pymath/expression.py b/pymath/expression.py index 9264ffb..cc76119 100644 --- a/pymath/expression.py +++ b/pymath/expression.py @@ -19,27 +19,15 @@ class Expression(object): """ if type(exp) == str: #self._exp = exp - print("\t type(exp) :" + str(type(exp))) - self.postfix_tokens = str2tokens(exp) # les tokens seront alors stockés dans self.tokens temporairement elif type(exp) == list: - print("\t type(exp) :" + str(type(exp))) self.postfix_tokens = exp - print("\t self.postfix_tokens :" + str(self.postfix_tokens)) - - def __str__(self): """ Overload str If you want to changer render set Expression.RENDER """ - print("\t self.STR_RENDER :" + str(self.STR_RENDER)) - print("\t self.postfix_tokens :" + str(self.postfix_tokens)) - print("\t self.STR_RENDER(self.postfix_tokens) :" + str(self.STR_RENDER(self.postfix_tokens))) - - - return self.STR_RENDER(self.postfix_tokens) def render(self, render = lambda x:str(x)): diff --git a/test/test_expression.py b/test/test_expression.py index 8f975ea..57688a6 100644 --- a/test/test_expression.py +++ b/test/test_expression.py @@ -21,18 +21,9 @@ class TestExpression(unittest.TestCase): def test_init_from_exp(self): pass - def test_infix_tokens(self): - pass - - def test_postfix_tokens(self): - pass - - - def test_isNumber(self): - pass - - def test_isOperator(self): - pass + def test_list(self): + exp = Expression([2, 3, "+"]) + self.assertEqual(exp.postfix_tokens, [2, 3, "+"]) def test_simplify_frac(self): exp = Expression("1/2 - 4")