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

reduce give list (not generator any more) big issue with render!!

Browse Source
This commit is contained in:
lafrite 2014-11-11 21:51:03 +01:00
parent c82e6c9a44
commit e93e14133d
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pymath/polynom.py
View File

@ -176,8 +176,10 @@ class Polynom(object):
coefs_steps.append(coef_steps) coefs_steps.append(coef_steps)
# On retourne la matrice # On retourne la matrice
ans = []
for coefs in transpose_fill(coefs_steps): for coefs in transpose_fill(coefs_steps):
yield Polynom(coefs, self._letter) ans.append(Polynom(coefs, self._letter))
return ans
@staticmethod @staticmethod
def postfix_add(numbers): def postfix_add(numbers):

36
test/test_polynom.py
View File

@ -17,11 +17,11 @@ class TestPolynom(unittest.TestCase):
def test_init_multi(self): def test_init_multi(self):
p = Polynom([1, [2, 3], 4], "x") p = Polynom([1, [2, 3], 4], "x")
def test_init_arith(self): #def test_init_arith(self):
p = Polynom([1, [2, 3, "+"], 4], "x") # p = Polynom([1, [2, 3, "+"], 4], "x")
def test_init_arith_2(self): #def test_init_arith_2(self):
p = Polynom([1, [[2, 3, "*"],3], 4], "x") # p = Polynom([1, [[2, 3, "*"],3], 4], "x")
def test_deg(self): def test_deg(self):
pass pass
@ -49,47 +49,47 @@ class TestPolynom(unittest.TestCase):
# ans = "1 + 2 x - 2 x + 3 x^2" # ans = "1 + 2 x - 2 x + 3 x^2"
# self.assertEqual(ans, str(p)) # self.assertEqual(ans, str(p))
def test_get_postfix(self): def test_postfix(self):
p = Polynom([1,2,3]) p = Polynom([1,2,3])
#ans = [1, 2, "x", "*", "+", 3, "x", 2, "^", "*", "+"] #ans = [1, 2, "x", "*", "+", 3, "x", 2, "^", "*", "+"]
ans = [3, 'x', 2, '^', '*', 2, 'x', '*', '+', 1, '+'] ans = [3, 'x', 2, '^', '*', 2, 'x', '*', '+', 1, '+']
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_get_postfix_monom(self): def test_postfix_monom(self):
p = Polynom([0,2]) p = Polynom([0,2])
ans = [2, "x", "*"] ans = [2, "x", "*"]
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_get_postfix_0_coef(self): def test_postfix_0_coef(self):
p = Polynom([0,2,0,4]) p = Polynom([0,2,0,4])
#ans = [2, "x", "*", 4, "x", 3, "^", "*", "+"] #ans = [2, "x", "*", 4, "x", 3, "^", "*", "+"]
ans = [4, 'x', 3, '^', '*', 2, 'x', '*', '+'] ans = [4, 'x', 3, '^', '*', 2, 'x', '*', '+']
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_get_postfix_1_coef(self): def test_postfix_1_coef(self):
p = Polynom([0,1,1]) p = Polynom([0,1,1])
#ans = ["x", "x", 2, "^", "+"] #ans = ["x", "x", 2, "^", "+"]
ans = ["x", 2, "^", "x", "+"] ans = ["x", 2, "^", "x", "+"]
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_get_postfix_neg_coef(self): def test_postfix_neg_coef(self):
# TODO: Choix arbitraire (vis à vis des + et des -) il faudra faire en fonction de render |sam. juin 14 09:45:55 CEST 2014 # TODO: Choix arbitraire (vis à vis des + et des -) il faudra faire en fonction de render |sam. juin 14 09:45:55 CEST 2014
p = Polynom([-1,-2,-3]) p = Polynom([-1,-2,-3])
#ans = [-1, -2, "x", "*", "+", -3, "x", 2, "^", "*", "+"] #ans = [-1, -2, "x", "*", "+", -3, "x", 2, "^", "*", "+"]
ans = [-3, 'x', 2, '^', '*', -2, 'x', '*', '+', -1, '+'] ans = [-3, 'x', 2, '^', '*', -2, 'x', '*', '+', -1, '+']
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_get_postfix_multi_coef(self): def test_postfix_multi_coef(self):
p = Polynom([1,[2, 3],4]) p = Polynom([1,[2, 3],4])
#ans = [1, 2, "x", "*", "+", 3, "x", "*", "+", 4, "x", 2, "^", "*", "+"] #ans = [1, 2, "x", "*", "+", 3, "x", "*", "+", 4, "x", 2, "^", "*", "+"]
ans = [4, 'x', 2, '^', '*', 2, 'x', '*', '+', 3, 'x', '*', '+', 1, '+'] ans = [4, 'x', 2, '^', '*', 2, 'x', '*', '+', 3, 'x', '*', '+', 1, '+']
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_get_postfix_arithm_coef(self): def test_postfix_arithm_coef(self):
p = Polynom([1,[2, 3, "+"],4]) p = Polynom([1,[2, 3, "+"],4])
#ans = [1, 2, 3, "+", "x", "*", "+", 4, "x", 2, "^", "*", "+"] #ans = [1, 2, 3, "+", "x", "*", "+", 4, "x", 2, "^", "*", "+"]
ans = [4, 'x', 2, '^', '*', 2, 3, '+', 'x', '*', '+', 1, '+'] ans = [4, 'x', 2, '^', '*', 2, 3, '+', 'x', '*', '+', 1, '+']
self.assertEqual(ans, p.get_postfix()) self.assertEqual(ans, p.postfix)
def test_reduce_nilpo(self): def test_reduce_nilpo(self):
p = Polynom([1, 2, 3]) p = Polynom([1, 2, 3])