Changeset 7276 for anuga_core/source/anuga/utilities/where_close.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/utilities/where_close.py (modified) (7 diffs)

anuga_core/source/anuga/utilities/where_close.py

@@ -62 +62 @@
     y are "equal", and 0 otherwise.  If x or y are floating point, 
     "equal" means where abs(x-y) <= atol + rtol * abs(y).  This is 
-    essentially the same algorithm used in the Numeric function 
+    essentially the same algorithm used in the numeric function 
     allclose.  If x and y are integer, "equal" means strict equality.  
     Shape and size of output is the same as x and y; if one is an 
     array and the other is scalar, shape and size of the output is the 
-    same as the array.  Output is a Numeric array, unless both inputs 
+    same as the array.  Output is a numeric array, unless both inputs 
     are scalar in which the output is a Python integer scalar.
 
     Positional Input Arguments:
-    * x:  Scalar or Numeric array, Python list/tuple of any size and 
+    * x:  Scalar or numeric array, Python list/tuple of any size and 
       shape.  Floating or integer type.
-    * y:  Scalar or Numeric array, Python list/tuple of any size and 
+    * y:  Scalar or numeric array, Python list/tuple of any size and 
       shape.  Floating or integer type.
 
@@ -84 +84 @@
 
     Examples:
-    >>> import Numeric as N
+    >>> import numpy as N
     >>> from where_close import where_close
     >>> x = [20.,  -32., -1., 2.            , 5., 29.]
@@ -98 +98 @@
     ['1', '0', '0', '1', '0']
     """
-    import Numeric as N
+    import numpy as N
     abs = N.absolute
 
 
-    #- Make sure input is Numeric type:
+    #- Make sure input is numeric type:
 
     xN = N.array(x)
@@ -111 +111 @@
     #  type returns an error:
 
-    if (xN.typecode() in N.typecodes['Float']) or \
-       (yN.typecode() in N.typecodes['Float']):
+    if (xN.dtype.char in N.typecodes['Float']) or \
+       (yN.dtype.char in N.typecodes['Float']):
         return N.less_equal(abs(xN-yN), atol+rtol*abs(yN))
 
-    elif (xN.typecode() in N.typecodes['Integer']) and \
-         (yN.typecode() in N.typecodes['Integer']):
+    elif (xN.dtype.char in N.typecodes['Integer']) and \
+         (yN.dtype.char in N.typecodes['Integer']):
         return N.equal(xN, yN)
 
@@ -132 +132 @@
     """
     >>> from where_close import where_close
-    >>> import Numeric as N
+    >>> import numpy as N
     >>> x = [20.,  -32., -1., 2.            , 5., 29.]
     >>> y = [20.1, -31., -1., 2.000000000001, 3., 28.99]
@@ -144 +144 @@
     >>> ind.shape
     (2, 3)
-    >>> ind.typecode()
-    'l'
+    >>> ind.dtype.char
+    '?'
     >>> type(ind)
-    <type 'array'>
+    <type 'numpy.ndarray'>
 
     >>> x = [20.,  -32., -1., 2.            , 5., 29.]
@@ -179 +179 @@
     0
     >>> type(ind)
-    <type 'int'>
+    <type 'numpy.bool_'>
     >>> x = -33
     >>> y = -33.