Changeset 6158 for anuga_core/source/anuga/utilities/test_sparse.py

Timestamp:

Jan 14, 2009, 9:48:37 AM (16 years ago)

Author:

rwilson

Message:

Change Numeric imports to general form - ready to change to NumPy?.

File:

• anuga_core/source/anuga/utilities/test_sparse.py (modified) (11 diffs)

anuga_core/source/anuga/utilities/test_sparse.py

@@ -5 +5 @@
 
 from sparse import *
-from Numeric import allclose, array, transpose, Float
+import Numeric as num
+
 
 class Test_Sparse(unittest.TestCase):
@@ -43 +44 @@
         C = Sparse(B)
 
-        assert allclose(C.todense(), B)
+        assert num.allclose(C.todense(), B)
 
 
@@ -50 +51 @@
         A[1,1] = 4
 
-        assert allclose(A.todense(), [[0,0,0], [0,4,0], [0,0,0], [0,0,0]])
+        assert num.allclose(A.todense(), [[0,0,0], [0,4,0], [0,0,0], [0,0,0]])
 
 
@@ -63 +64 @@
 
         assert len(A) == 0
-        assert allclose(A.todense(), [[0,0,0], [0,0,0], [0,0,0]])
+        assert num.allclose(A.todense(), [[0,0,0], [0,0,0], [0,0,0]])
 
         #Set an existing zero element to zero
         A[1,2] = 0
         assert len(A) == 0
-        assert allclose(A.todense(), [[0,0,0], [0,0,0], [0,0,0]])
+        assert num.allclose(A.todense(), [[0,0,0], [0,0,0], [0,0,0]])
 
     def test_sparse_multiplication_vector(self):
@@ -82 +83 @@
 
         u = A*v
-        assert allclose(u, [6,14,4])
+        assert num.allclose(u, [6,14,4])
 
         #Right hand side column
-        v = array([[2,4],[3,4],[4,4]])
+        v = num.array([[2,4],[3,4],[4,4]])
 
         u = A*v[:,0]
-        assert allclose(u, [6,14,4])
+        assert num.allclose(u, [6,14,4])
 
         u = A*v[:,1]
-        assert allclose(u, [12,16,4])
+        assert num.allclose(u, [12,16,4])
 
 
@@ -103 +104 @@
 
         #Right hand side matrix
-        v = array([[2,4],[3,4],[4,4]])
+        v = num.array([[2,4],[3,4],[4,4]])
 
         u = A*v
-        assert allclose(u, [[6,12], [14,16], [4,4]])
+        assert num.allclose(u, [[6,12], [14,16], [4,4]])
 
 
@@ -122 +123 @@
 
         u = A.trans_mult(v)
-        assert allclose(u, [6,6,10])
+        assert num.allclose(u, [6,6,10])
 
 
@@ -137 +138 @@
 
         B = 3*A
-        assert allclose(B.todense(), 3*A.todense())
+        assert num.allclose(B.todense(), 3*A.todense())
 
         B = A*3
-        assert allclose(B.todense(), 3*A.todense())
+        assert num.allclose(B.todense(), 3*A.todense())
 
         try:
@@ -166 +167 @@
         C = A+B
 
-        assert allclose(C.todense(), [[12,0,0], [2,8,8], [0,0,4]])
+        assert num.allclose(C.todense(), [[12,0,0], [2,8,8], [0,0,4]])
 
     def test_sparse_tocsr(self):
@@ -190 +191 @@
         C = [1, 2, 3]
 
-        assert allclose(B*C, [15.0, 10.0 ,8.0, 0.0])
+        assert num.allclose(B*C, [15.0, 10.0 ,8.0, 0.0])
 
         C2 = [[1,2],[2,4],[3,6]]
@@ -196 +197 @@
         #print B*C2
 
-        assert allclose(B*C2, [[15.0, 30.0],[10.0, 20.0],[8.0, 16.0],[0.0, 0.0]])
+        assert num.allclose(B*C2, [[15.0, 30.0],[10.0, 20.0],[8.0, 16.0],[0.0, 0.0]])