Changeset 5893

Timestamp:

Nov 5, 2008, 5:26:26 PM (16 years ago)

Author:

rwilson

Message:

Initial numpy conversion.

Location:

anuga_core/source/anuga/caching

Files:

• caching.py (modified) (6 diffs)
• test_caching.py (modified) (7 diffs)

anuga_core/source/anuga/caching/caching.py

@@ -50 +50 @@
 else:
   unix = 1
+
+import numpy
+
 
 cache_dir = '.python_cache'
@@ -1339 +1342 @@
 
   from types import TupleType, ListType, DictType, InstanceType  
-  from Numeric import ArrayType, average
+##  from numpy.oldnumeric import ArrayType, average
 
     
@@ -1378 +1381 @@
       I.sort()    
       val = myhash(I, ids)
-  elif type(T) == ArrayType:
+  elif isinstance(T, numpy.ndarray):
       # Use mean value for efficiency  
-      val = hash(average(T.flat))
+      val = hash(numpy.average(T.ravel()))
   elif type(T) == InstanceType:
       val = myhash(T.__dict__, ids)
@@ -1404 +1407 @@
 
     from types import TupleType, ListType, DictType, InstanceType
-    from Numeric import ArrayType, alltrue    
+##    from numpy.oldnumeric import ArrayType, alltrue    
     
     # Keep track of unique id's to protect against infinite recursion
@@ -1447 +1450 @@
             identical = compare(a, b, ids)
             
-    elif type(A) == ArrayType:
+    elif isinstance(A, numpy.ndarray):
         # Use element by element comparison
-        identical = alltrue(A==B)
+        identical = numpy.alltrue(A==B)
 
     elif type(A) == InstanceType:
@@ -2396 +2399 @@
       argstr = argstr + "'"+str(args)+"'"
     else:
-      # Truncate large Numeric arrays before using str()
-      import Numeric
-      if type(args) == Numeric.ArrayType:
-#        if len(args.flat) > textwidth:  
-#        Changed by Duncan and Nick 21/2/07 .flat has problems with 
-#        non-contigous arrays and ravel is equal to .flat except it 
+      # Truncate large arrays before using str()
+      if isinstance(args, numpy.ndarray):
+#        if len(args.ravel()) > textwidth:  
+#        Changed by Duncan and Nick 21/2/07 .ravel() has problems with 
+#        non-contigous arrays and ravel is equal to .ravel() except it 
 #        can work with non-contiguous  arrays
-        if len(Numeric.ravel(args)) > textwidth:
+        if len(numpy.ravel(args)) > textwidth:
           args = 'Array: ' + str(args.shape)
 

anuga_core/source/anuga/caching/test_caching.py

@@ -1 @@
-
 import unittest
-from Numeric import arange, array
+import numpy
 
 from copy import deepcopy
@@ -128 +127 @@
         
         # Make some test input arguments
-        A0 = arange(5)
-        B0 = array([1.1, 2.2, 0.0, -5, -5])
+        A0 = numpy.arange(5)
+        B0 = numpy.array([1.1, 2.2, 0.0, -5, -5])
         
         A1 = A0.copy()
@@ -159 +158 @@
 
 
-            assert T1 == T2, 'Cached result does not match computed result'
-            assert T2 == T3, 'Cached result does not match computed result'
+            assert numpy.alltrue(T1 == T2), 'Cached result does not match computed result'
+            assert numpy.alltrue(T2 == T3), 'Cached result does not match computed result'
             
 
@@ -172 +171 @@
         
         # Make test input arguments
-        A0 = arange(5)*1.0
+        A0 = numpy.arange(5)*1.0
         B = ('x', 15)
         
         # Create different A that hashes to the same address (having the same average)
-        A1 = array([2.0, 2.0, 2.0, 2.0, 2.0])        
+        A1 = numpy.array([2.0, 2.0, 2.0, 2.0, 2.0])        
         
         assert myhash(A0) == myhash(A1)
@@ -203 +202 @@
             
 
-            #print T1
-            #print T2
-            assert T2 != T1
+            print 'T1=%s' % str(T1)
+            print 'T2=%s' % str(T2)
+            assert numpy.alltrue(T2 != T1)
 
             
@@ -389 +388 @@
         A = Dummy(5, 7)
         B = {'x': 10, 'A': A}
-        C = [B, array([1.2, 3, 5, 0.1])]
+        C = [B, numpy.array([1.2, 3, 5, 0.1])]
         A.value = C # Make it circular
 
@@ -395 +394 @@
         AA = Dummy(None, None)
         BB = {'A': AA, 'x': 10}
-        CC = [BB, array([1.200, 3.000, 5.00, 1.0/10])]
+        CC = [BB, numpy.array([1.200, 3.000, 5.00, 1.0/10])]
         AA.value = CC # Make it circular
         AA.another = 3+4