Changeset 3850 for anuga_core/source/anuga/utilities

Timestamp:

Oct 24, 2006, 4:56:49 PM (18 years ago)

Author:

ole

Message:

Introduced a covariance measure to verify Okushiri timeseries plus
some incidental work

File:

• anuga_core/source/anuga/utilities/numerical_tools.py (modified) (4 diffs)

anuga_core/source/anuga/utilities/numerical_tools.py

@@ -10 +10 @@
 #(this should move to somewhere central)
 #try:
-#    from scipy import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate, Float, arange    
+#    from scipy import ArrayType, array, sum, innerproduct, ravel, sqrt,
+# searchsorted, sort, concatenate, Float, arange    
 #except:
 #    #print 'Could not find scipy - using Numeric'
-#    from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate, Float, arange
-from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate, Float, arange    
+#    from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt,
+#searchsorted, sort, concatenate, Float, arange
+
+from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt,\
+     searchsorted, sort, concatenate, Float, arange    
 
 # Getting an infinite number to use when using Numeric
@@ -31 +35 @@
     """
 
-    error_msg = 'Input to acos is outside allowed domain [-1.0, 1.0]. I got %.12f' %x
+    error_msg = 'Input to acos is outside allowed domain [-1.0, 1.0].'+\
+                'I got %.12f' %x
     warning_msg = 'Changing argument to acos from %.18f to %.1f' %(x, sign(x))
 
-    # FIXME(Ole): Need function to compute machine precision as this is also
-    # used in fit_interpolate/search_functions.py
-    
-    
-    eps = 1.0e-15  # Machine precision 
+    eps = get_machine_precision() # Machine precision 
     if x < -1.0:
         if x < -1.0 - eps:
@@ -50 +51 @@
             raise ValueError, errmsg
         else:
-            print 'NOTE: changing argument to acos from %.18f to 1.0' %x            
+            print 'NOTE: changing argument to acos from %.18f to 1.0' %x
             x = 1.0
 
@@ -148 +149 @@
         y = x 
 
+    x = ensure_numeric(x)
+    y = ensure_numeric(y)       
     assert(len(x)==len(y))
-    N = len(x)
- 
+
+    N = len(x) 
     cx = x - mean(x)  
     cy = y - mean(y)