diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2010-06-07 03:43:19 +0000 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2010-06-07 03:43:19 +0000 |
commit | 0db76715c5f019222db48cc28a6a49d086a8a939 (patch) | |
tree | feab8bcb1f79bbc31a3fd43c38466cf6874bffd5 | |
parent | 66e3231baaf2181abeafc4d37b8ad5272728ff64 (diff) | |
download | numpy-0db76715c5f019222db48cc28a6a49d086a8a939.tar.gz |
CHG: Rename reduce method in polytemplate to cutdeg. Reduce is just too
much like a ufunc and a bit vague.
-rw-r--r-- | doc/release/2.0.0-notes.rst | 4 | ||||
-rw-r--r-- | numpy/polynomial/polytemplate.py | 4 | ||||
-rw-r--r-- | numpy/polynomial/tests/test_chebyshev.py | 14 | ||||
-rw-r--r-- | numpy/polynomial/tests/test_polynomial.py | 14 |
4 files changed, 18 insertions, 18 deletions
diff --git a/doc/release/2.0.0-notes.rst b/doc/release/2.0.0-notes.rst index fb7bbc43e..68314c488 100644 --- a/doc/release/2.0.0-notes.rst +++ b/doc/release/2.0.0-notes.rst @@ -77,7 +77,7 @@ polynomial.polynomial derivations is a non-negative integer. The number 0 is a valid value for both functions. * A degree method has been added to the Polynomial class. -* A reduce method has been added to the Polynomial class. It operates like +* A cutdeg method has been added to the Polynomial class. It operates like truncate except that the argument is the desired degree of the result, not the number of coefficients. * The fit class function of the Polynomial class now uses None as the default @@ -91,7 +91,7 @@ polynomial.chebyshev derivations is a non-negative integer. The number 0 is a valid value for both functions. * A degree method has been added to the Chebyshev class. -* A reduce method has been added to the Chebyshev class. It operates like +* A cutdeg method has been added to the Chebyshev class. It operates like truncate except that the argument is the desired degree of the result, not the number of coefficients. * The fit class function of the Chebyshev class now uses None as the default diff --git a/numpy/polynomial/polytemplate.py b/numpy/polynomial/polytemplate.py index 2a57a517f..1f17593dd 100644 --- a/numpy/polynomial/polytemplate.py +++ b/numpy/polynomial/polytemplate.py @@ -313,8 +313,8 @@ class $name(pu.PolyBase) : """ return len(self) - 1 - def reduce(self, deg) : - """Reduce the degree of the series. + def cutdeg(self, deg) : + """Truncate series to the given degree. Reduce the degree of the $name series to `deg` by discarding the high order terms. If `deg` is greater than the current degree a diff --git a/numpy/polynomial/tests/test_chebyshev.py b/numpy/polynomial/tests/test_chebyshev.py index 17970ccc1..a893921ce 100644 --- a/numpy/polynomial/tests/test_chebyshev.py +++ b/numpy/polynomial/tests/test_chebyshev.py @@ -402,13 +402,13 @@ class TestChebyshevClass(TestCase) : def test_degree(self) : assert_equal(self.p1.degree(), 2) - def test_reduce(self) : - assert_raises(ValueError, self.p1.reduce, .5) - assert_raises(ValueError, self.p1.reduce, -1) - assert_equal(len(self.p1.reduce(3)), 3) - assert_equal(len(self.p1.reduce(2)), 3) - assert_equal(len(self.p1.reduce(1)), 2) - assert_equal(len(self.p1.reduce(0)), 1) + def test_cutdeg(self) : + assert_raises(ValueError, self.p1.cutdeg, .5) + assert_raises(ValueError, self.p1.cutdeg, -1) + assert_equal(len(self.p1.cutdeg(3)), 3) + assert_equal(len(self.p1.cutdeg(2)), 3) + assert_equal(len(self.p1.cutdeg(1)), 2) + assert_equal(len(self.p1.cutdeg(0)), 1) def test_convert(self) : x = np.linspace(-1,1) diff --git a/numpy/polynomial/tests/test_polynomial.py b/numpy/polynomial/tests/test_polynomial.py index c8edcd308..1b8c0f8a5 100644 --- a/numpy/polynomial/tests/test_polynomial.py +++ b/numpy/polynomial/tests/test_polynomial.py @@ -373,13 +373,13 @@ class TestPolynomialClass(TestCase) : def test_degree(self) : assert_equal(self.p1.degree(), 2) - def test_reduce(self) : - assert_raises(ValueError, self.p1.reduce, .5) - assert_raises(ValueError, self.p1.reduce, -1) - assert_equal(len(self.p1.reduce(3)), 3) - assert_equal(len(self.p1.reduce(2)), 3) - assert_equal(len(self.p1.reduce(1)), 2) - assert_equal(len(self.p1.reduce(0)), 1) + def test_cutdeg(self) : + assert_raises(ValueError, self.p1.cutdeg, .5) + assert_raises(ValueError, self.p1.cutdeg, -1) + assert_equal(len(self.p1.cutdeg(3)), 3) + assert_equal(len(self.p1.cutdeg(2)), 3) + assert_equal(len(self.p1.cutdeg(1)), 2) + assert_equal(len(self.p1.cutdeg(0)), 1) def test_convert(self) : x = np.linspace(-1,1) |