Changeset 5909 for anuga_core/source_numpy_conversion/anuga/caching/caching.py

Timestamp:

Nov 6, 2008, 4:22:22 PM (15 years ago)

Author:

rwilson

Message:

NumPy? conversion.

File:

• anuga_core/source_numpy_conversion/anuga/caching/caching.py (modified) (6 diffs)

anuga_core/source_numpy_conversion/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
 
     
@@ -1378 +1380 @@
       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 +1406 @@
 
     from types import TupleType, ListType, DictType, InstanceType
-    from Numeric import ArrayType, alltrue    
     
     # Keep track of unique id's to protect against infinite recursion
@@ -1447 +1448 @@
             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 +2397 @@
       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)