summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_index_tricks.py
diff options
context:
space:
mode:
authorFrederic <nouiz@nouiz.org>2012-06-11 16:23:17 -0400
committerFrederic <nouiz@nouiz.org>2012-06-11 16:23:17 -0400
commit69c33bf74bcdc1d9781bd5db27f942f6d676c032 (patch)
tree27cfdd7953dbe36b3ab9657d0078a06a97223475 /numpy/lib/tests/test_index_tricks.py
parentd0f520a30990c018114672f24197866452a2d088 (diff)
downloadnumpy-69c33bf74bcdc1d9781bd5db27f942f6d676c032.tar.gz
fix the wrapping problem of fill_diagonal with tall matrix.
Diffstat (limited to 'numpy/lib/tests/test_index_tricks.py')
-rw-r--r--numpy/lib/tests/test_index_tricks.py22
1 files changed, 22 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index 2c6500a57..aaedd83ea 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -158,6 +158,28 @@ def test_fill_diagonal():
array([[5, 0, 0],
[0, 5, 0],
[0, 0, 5]]))
+ #Test tall matrix
+ a = zeros((10, 3),int)
+ fill_diagonal(a, 5)
+ yield (assert_array_equal, a,
+ array([[5, 0, 0],
+ [0, 5, 0],
+ [0, 0, 5],
+ [0, 0, 0],
+ [0, 0, 0],
+ [0, 0, 0],
+ [0, 0, 0],
+ [0, 0, 0],
+ [0, 0, 0],
+ [0, 0, 0]]))
+
+ #Test wide matrix
+ a = zeros((3, 10),int)
+ fill_diagonal(a, 5)
+ yield (assert_array_equal, a,
+ array([[5, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ [0, 5, 0, 0, 0, 0, 0, 0, 0, 0],
+ [0, 0, 5, 0, 0, 0, 0, 0, 0, 0]]))
# The same function can operate on a 4-d array:
a = zeros((3, 3, 3, 3), int)