Changeset 6158 for anuga_core/source/anuga/utilities/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/sparse.py (modified) (15 diffs)

anuga_core/source/anuga/utilities/sparse.py

@@ -1 +1 @@
 """Proof of concept sparse matrix code
 """
+
+import Numeric as num
 
 
@@ -17 +19 @@
             
         if len(args) == 1:
-            from Numeric import array
             try:
-                A = array(args[0])
+                A = num.array(args[0])
             except:
                 raise 'Input must be convertable to a Numeric array'
@@ -92 +93 @@
 
     def todense(self):
-        from Numeric import zeros, Float
-
-        D = zeros( (self.M, self.N), Float)
+        D = num.zeros( (self.M, self.N), num.Float)
         
         for i in range(self.M):
@@ -109 +108 @@
         """
 
-        from Numeric import array, zeros, Float
-        
         try:
-            B = array(other)
+            B = num.array(other)
         except:
             msg = 'FIXME: Only Numeric types implemented so far'
@@ -130 +127 @@
             assert B.shape[0] == self.N, msg
 
-            R = zeros(self.M, Float) #Result
+            R = num.zeros(self.M, num.Float) #Result
             
             # Multiply nonzero elements
@@ -140 +137 @@
         
             
-            R = zeros((self.M, B.shape[1]), Float) #Result matrix
+            R = num.zeros((self.M, B.shape[1]), num.Float) #Result matrix
 
             # Multiply nonzero elements
@@ -162 +159 @@
         """
 
-        from Numeric import array, zeros, Float
-        
         new = other.copy()
         for key in self.Data.keys():
@@ -177 +172 @@
         """
 
-        from Numeric import array, zeros, Float
-        
         try:
             other = float(other)
@@ -200 +193 @@
         """
 
-        from Numeric import array, zeros, Float
-        
         try:
-            B = array(other)
+            B = num.array(other)
         except:
             print 'FIXME: Only Numeric types implemented so far'
@@ -214 +205 @@
             assert B.shape[0] == self.M, 'Mismatching dimensions'
 
-            R = zeros((self.N,), Float) #Result
+            R = num.zeros((self.N,), num.Float) #Result
 
             #Multiply nonzero elements
@@ -251 +242 @@
         """
 
-        from Numeric import array, Float, Int
-
         if isinstance(A,Sparse):
 
-            from Numeric import zeros
             keys = A.Data.keys()
             keys.sort()
             nnz = len(keys)
-            data    = zeros ( (nnz,), Float)
-            colind  = zeros ( (nnz,), Int)
-            row_ptr = zeros ( (A.M+1,), Int)
+            data    = num.zeros ( (nnz,), num.Float)
+            colind  = num.zeros ( (nnz,), num.Int)
+            row_ptr = num.zeros ( (A.M+1,), num.Int)
             current_row = -1
             k = 0
@@ -299 +287 @@
 
     def todense(self):
-        from Numeric import zeros, Float
-
-        D = zeros( (self.M, self.N), Float)
+        D = num.zeros( (self.M, self.N), num.Float)
         
         for i in range(self.M):
@@ -314 +300 @@
         """
 
-        from Numeric import array, zeros, Float
-        
         try:
-            B = array(other)
+            B = num.array(other)
         except:
             print 'FIXME: Only Numeric types implemented so far'
@@ -334 +318 @@
     # A little selftest
     
-    from Numeric import allclose, array, Float 
-    
     A = Sparse(3,3)
 
@@ -366 +348 @@
     u = A*v
     print u
-    assert allclose(u, [6,14,4])
+    assert num.allclose(u, [6,14,4])
 
     u = A.trans_mult(v)
     print u
-    assert allclose(u, [6,6,10])
+    assert num.allclose(u, [6,6,10])
 
     #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]