Changeset 6818 for branches/numpy_misc/tools/pytools/stats.py

Timestamp:

Apr 16, 2009, 9:15:06 AM (16 years ago)

Author:

rwilson

Message:

Numeric to numpy conversion.

File:

• branches/numpy_misc/tools/pytools/stats.py (modified) (4 diffs)

branches/numpy_misc/tools/pytools/stats.py

@@ -10 +10 @@
 
 def mean(x):
-  import Numeric
+  import numpy as num
 
-  sum = Numeric.sum(x)  
+  sum = num.sum(x)  
   avg = float(sum)/len(x)
 
@@ -19 +19 @@
 
 def cov(x,y=None):
-  import Numeric
+  import numpy as num
   if y is None:
     y = x 
@@ -29 +29 @@
   cy = y - mean(y)  
 
-  p = Numeric.innerproduct(cx,cy) / N
+  p = num.inner(cx,cy) / N
 
 
@@ -65 +65 @@
   """
   
-  import Numeric  
-  y = Numeric.ravel(x)
-  p = Numeric.sqrt(Numeric.innerproduct(y,y))
+  import numpy as num  
+  y = num.ravel(x)
+  p = num.sqrt(num.inner(y,y))
   return p