diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2012-01-31 20:43:46 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2012-04-29 23:17:13 -0600 |
commit | a70a5994cb2f30bae3f16fc50f4cd98205d9fb68 (patch) | |
tree | 5723e64e7221ac25c1b800d81388828359195183 | |
parent | 628c7865726ed6fbbb17946922d5775f5f9cbdb0 (diff) | |
download | numpy-a70a5994cb2f30bae3f16fc50f4cd98205d9fb68.tar.gz |
STY: Code cleanup in polynomial [*]fromroots functions.
Use divmod instead of // and % separately.
-rw-r--r-- | numpy/polynomial/chebyshev.py | 6 | ||||
-rw-r--r-- | numpy/polynomial/hermite.py | 6 | ||||
-rw-r--r-- | numpy/polynomial/hermite_e.py | 6 | ||||
-rw-r--r-- | numpy/polynomial/laguerre.py | 6 | ||||
-rw-r--r-- | numpy/polynomial/legendre.py | 6 | ||||
-rw-r--r-- | numpy/polynomial/polynomial.py | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/numpy/polynomial/chebyshev.py b/numpy/polynomial/chebyshev.py index 9645ae770..e32cb229a 100644 --- a/numpy/polynomial/chebyshev.py +++ b/numpy/polynomial/chebyshev.py @@ -526,12 +526,12 @@ def chebfromroots(roots) : else : [roots] = pu.as_series([roots], trim=False) roots.sort() - n = len(roots) p = [chebline(-r, 1) for r in roots] + n = len(p) while n > 1: - m = n//2 + m, r = divmod(n, 2) tmp = [chebmul(p[i], p[i+m]) for i in range(m)] - if n%2: + if r: tmp[0] = chebmul(tmp[0], p[-1]) p = tmp n = m diff --git a/numpy/polynomial/hermite.py b/numpy/polynomial/hermite.py index c096f3a8e..199b47e15 100644 --- a/numpy/polynomial/hermite.py +++ b/numpy/polynomial/hermite.py @@ -278,12 +278,12 @@ def hermfromroots(roots) : else : [roots] = pu.as_series([roots], trim=False) roots.sort() - n = len(roots) p = [hermline(-r, 1) for r in roots] + n = len(p) while n > 1: - m = n//2 + m, r = divmod(n, 2) tmp = [hermmul(p[i], p[i+m]) for i in range(m)] - if n%2: + if r: tmp[0] = hermmul(tmp[0], p[-1]) p = tmp n = m diff --git a/numpy/polynomial/hermite_e.py b/numpy/polynomial/hermite_e.py index 8cf9dd09d..d0efe7209 100644 --- a/numpy/polynomial/hermite_e.py +++ b/numpy/polynomial/hermite_e.py @@ -278,12 +278,12 @@ def hermefromroots(roots) : else : [roots] = pu.as_series([roots], trim=False) roots.sort() - n = len(roots) p = [hermeline(-r, 1) for r in roots] + n = len(p) while n > 1: - m = n//2 + m, r = divmod(n, 2) tmp = [hermemul(p[i], p[i+m]) for i in range(m)] - if n%2: + if r: tmp[0] = hermemul(tmp[0], p[-1]) p = tmp n = m diff --git a/numpy/polynomial/laguerre.py b/numpy/polynomial/laguerre.py index b5c1df9c2..7b518404f 100644 --- a/numpy/polynomial/laguerre.py +++ b/numpy/polynomial/laguerre.py @@ -275,12 +275,12 @@ def lagfromroots(roots) : else : [roots] = pu.as_series([roots], trim=False) roots.sort() - n = len(roots) p = [lagline(-r, 1) for r in roots] + n = len(p) while n > 1: - m = n//2 + m, r = divmod(n, 2) tmp = [lagmul(p[i], p[i+m]) for i in range(m)] - if n%2: + if r: tmp[0] = lagmul(tmp[0], p[-1]) p = tmp n = m diff --git a/numpy/polynomial/legendre.py b/numpy/polynomial/legendre.py index f36fa4d0e..94098632c 100644 --- a/numpy/polynomial/legendre.py +++ b/numpy/polynomial/legendre.py @@ -307,12 +307,12 @@ def legfromroots(roots) : else : [roots] = pu.as_series([roots], trim=False) roots.sort() - n = len(roots) p = [legline(-r, 1) for r in roots] + n = len(p) while n > 1: - m = n//2 + m, r = divmod(n, 2) tmp = [legmul(p[i], p[i+m]) for i in range(m)] - if n%2: + if r: tmp[0] = legmul(tmp[0], p[-1]) p = tmp n = m diff --git a/numpy/polynomial/polynomial.py b/numpy/polynomial/polynomial.py index dd0e1591b..6f67814ad 100644 --- a/numpy/polynomial/polynomial.py +++ b/numpy/polynomial/polynomial.py @@ -170,12 +170,12 @@ def polyfromroots(roots) : else : [roots] = pu.as_series([roots], trim=False) roots.sort() - n = len(roots) p = [polyline(-r, 1) for r in roots] + n = len(p) while n > 1: - m = n//2 + m, r = divmod(n, 2) tmp = [polymul(p[i], p[i+m]) for i in range(m)] - if n%2: + if r: tmp[0] = polymul(tmp[0], p[-1]) p = tmp n = m |