summaryrefslogtreecommitdiff
path: root/numpy/lib/tests
diff options
context:
space:
mode:
authorFabian Pedregosa <fabian.pedregosa@inria.fr>2011-08-31 18:16:26 +0200
committerRalf Gommers <ralf.gommers@googlemail.com>2011-08-31 18:37:37 +0200
commit1af2f37eae78986b370e2d44df6c5156945d69d8 (patch)
treecafc7b5261da2873beae793182e72d96a7d14208 /numpy/lib/tests
parentf3e70d9c0ea5db74033be9f437bb8e275839c9dc (diff)
downloadnumpy-1af2f37eae78986b370e2d44df6c5156945d69d8.tar.gz
FIX: Make tril/triu return the same dtype as the original array.
This should fix: * http://projects.scipy.org/numpy/ticket/1848 * http://projects.scipy.org/scipy/ticket/1449
Diffstat (limited to 'numpy/lib/tests')
-rw-r--r--numpy/lib/tests/test_twodim_base.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py
index 37165f672..7e7900090 100644
--- a/numpy/lib/tests/test_twodim_base.py
+++ b/numpy/lib/tests/test_twodim_base.py
@@ -239,6 +239,18 @@ class TestTri(TestCase):
assert_array_equal(tri(3,dtype=bool),out.astype(bool))
+def test_tril_triu():
+ for dtype in np.typecodes['AllFloat'] + np.typecodes['AllInteger']:
+ a = np.ones((2, 2), dtype=dtype)
+ b = np.tril(a)
+ c = np.triu(a)
+ assert_array_equal(b, [[1, 0], [1, 1]])
+ assert_array_equal(c, b.T)
+ # should return the same dtype as the original array
+ assert_equal(b.dtype, a.dtype)
+ assert_equal(c.dtype, a.dtype)
+
+
def test_mask_indices():
# simple test without offset
iu = mask_indices(3, np.triu)