Changeset 2531 for inundation/utilities/numerical_tools.py

Timestamp:

Mar 13, 2006, 11:57:44 AM (19 years ago)

Author:

ole

Message:

Investigating feasibility of scipy as an alternative to Numeric

File:

• inundation/utilities/numerical_tools.py (modified) (6 diffs)

inundation/utilities/numerical_tools.py

@@ -4 +4 @@
 """
 
-import Numeric
-
-
+
+#Establish which Numeric package to use
+#(this should move to somewhere central)
+try:
+    from scipy import ArrayType, array, sum, innerproduct, ravel, sqrt    
+except:
+    print 'Could not find scipy - using Numeric'
+    from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt
+    
 
 def angle(v):
@@ -14 +20 @@
 
     from math import acos, pi, sqrt
-    from Numeric import sum, array
 
     l = sqrt( sum (array(v)**2))
@@ -72 +77 @@
     """Mean value of a vector
     """
-    return(float(Numeric.sum(x))/len(x))
+    return(float(sum(x))/len(x))
 
 
@@ -90 +95 @@
     cy = y - mean(y)  
 
-    p = Numeric.innerproduct(cx,cy)/N
+    p = innerproduct(cx,cy)/N
     return(p)
 
@@ -130 +135 @@
     """
   
-    y = Numeric.ravel(x)
-    p = Numeric.sqrt(Numeric.innerproduct(y,y))
+    y = ravel(x)
+    p = sqrt(innerproduct(y,y))
     return p
     
@@ -168 +173 @@
     This function is necessary as array(A) can cause memory overflow.
     """
-
-    from Numeric import ArrayType, array
 
     if typecode is None: