Changeset 6818 for branches/numpy_misc/tools/pytools/numtools.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/numtools.py (modified) (7 diffs)

branches/numpy_misc/tools/pytools/numtools.py

@@ -13 +13 @@
   """
 
-  import types, Numeric
+  import types
+  import numpy as num
   
-  if type(x) == Numeric.ArrayType:
-    return Numeric.sum(x)
-  elif type(x) in [types.ListType, types.TupleType]:
+  if isinstance(x, num.ndarray):
+    return num.sum(x)
+  elif isinstance(x, (list, tuple)):
     s = x[0]
     for e in x[1:]:
@@ -27 +28 @@
   """
 
-  from Numeric import dot, reshape
+  import numpy as num
 
-  x = reshape(x, (A.shape[1], 1)) #Make x a column vector             
+  x = num.reshape(x, (A.shape[1], 1)) #Make x a column vector             
 
-  return dot(A, x)
+  return num.dot(A, x)
 
 
@@ -49 +50 @@
   """
   
-  from Numeric import ones, arange, Float, multiply
+  import numpy as num
 
   d = len(N)
@@ -55 +56 @@
   X = [] 
   for s in range(d):
-    local_shape = ones(d)
+    local_shape = num.ones(d)
     local_shape[s] = N[s]
-    a = arange(N[s])
+    a = num.arange(N[s])
     if N[s] > 1:
-      a = a.astype(Float)/(N[s]-1)
+      a = a.astype(num.float)/(N[s]-1)
     else:
-      a = a.astype(Float)
+      a = a.astype(num.float)
     
     # Put ones in all other dimensions
@@ -70 +71 @@
         e.append(a)
       else:
-        e.append(ones(N[t]))
+        e.append(num.ones(N[t]))
     
     # Take kronecker product of all dimensions
@@ -76 +77 @@
     x = 1  
     for t in range(d):
-      x=multiply.outer(x,e[t])
+      x=num.multiply.outer(x,e[t])
 
     #print x, x.shape
@@ -89 +90 @@
      Number of ones in mask must equal len(x)."""
 
-  from Numeric import sum, ArrayType, zeros
+  import numpy as num
 
-  assert type(x) == ArrayType
-  assert type(mask) == ArrayType
+  assert isinstance(x, num.ndarray)
+  assert isinstance(mask, num.ndarray)
   #FIXME: Assert that mask contains only ones and zeros
-  assert len(x) == sum(mask), 'Number of ones in mask must equal length of x'
+  assert len(x) == num.sum(mask), 'Number of ones in mask must equal length of x'
 
   d = len(mask)
-  y = zeros(d, x.typecode())
+  y = num.zeros(d, x.dtype)
 
   i = 0