summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/tests/test_numeric.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/matrixlib/tests/test_numeric.py')
-rw-r--r--numpy/matrixlib/tests/test_numeric.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/numpy/matrixlib/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py
index 91dc92d2e..28329da39 100644
--- a/numpy/matrixlib/tests/test_numeric.py
+++ b/numpy/matrixlib/tests/test_numeric.py
@@ -1,22 +1,22 @@
from __future__ import division, absolute_import, print_function
+import numpy as np
from numpy.testing import assert_equal, TestCase, run_module_suite
-from numpy.core import ones
-from numpy import matrix, diagonal, diag
class TestDot(TestCase):
def test_matscalar(self):
- b1 = matrix(ones((3, 3), dtype=complex))
+ b1 = np.matrix(np.ones((3, 3), dtype=complex))
assert_equal(b1*1.0, b1)
def test_diagonal():
- b1 = matrix([[1,2],[3,4]])
- diag_b1 = matrix([[1, 4]])
+ b1 = np.matrix([[1,2],[3,4]])
+ diag_b1 = np.matrix([[1, 4]])
+ array_b1 = np.array([1, 4])
assert_equal(b1.diagonal(), diag_b1)
- assert_equal(diagonal(b1), diag_b1)
- assert_equal(diag(b1), diag_b1)
+ assert_equal(np.diagonal(b1), array_b1)
+ assert_equal(np.diag(b1), array_b1)
if __name__ == "__main__":