diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-08-18 12:40:49 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-27 07:26:56 -0600 |
| commit | 73be11db794d115a7d9bd2e822c0d8008bc14a28 (patch) | |
| tree | 4029a8a8160d6e4692ed69eed244aafab8deaa46 /numpy/lib | |
| parent | c8732958c8e07f2306029dfde2178faf9c01d049 (diff) | |
| download | numpy-73be11db794d115a7d9bd2e822c0d8008bc14a28.tar.gz | |
BUG: Some bugs in squeeze and concatenate found by testing SciPy
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/tests/test_index_tricks.py | 4 | ||||
| -rw-r--r-- | numpy/lib/tests/test_shape_base.py | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py index e4c0bde93..2c6500a57 100644 --- a/numpy/lib/tests/test_index_tricks.py +++ b/numpy/lib/tests/test_index_tricks.py @@ -147,6 +147,10 @@ class TestIndexExpression(TestCase): assert_equal(a[:,:3,[1,2]], a[index_exp[:,:3,[1,2]]]) assert_equal(a[:,:3,[1,2]], a[s_[:,:3,[1,2]]]) +def test_c_(): + a = np.c_[np.array([[1,2,3]]), 0, 0, np.array([[4,5,6]])] + assert_equal(a, [[1, 2, 3, 0, 0, 4, 5, 6]]) + def test_fill_diagonal(): a = zeros((3, 3),int) fill_diagonal(a, 5) diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py index 9d6cd0551..56178e8af 100644 --- a/numpy/lib/tests/test_shape_base.py +++ b/numpy/lib/tests/test_shape_base.py @@ -258,6 +258,13 @@ class TestSqueeze(TestCase): assert_array_equal(squeeze(b),reshape(b,(20,10,20))) assert_array_equal(squeeze(c),reshape(c,(20,10))) + # Squeezing to 0-dim should still give an ndarray + a = [[[1.5]]] + res = squeeze(a) + assert_equal(res, 1.5) + assert_equal(res.ndim, 0) + assert_equal(type(res), ndarray) + class TestKron(TestCase): def test_return_type(self): |