Changeset 6456

Timestamp:

Mar 5, 2009, 8:29:28 AM (16 years ago)

Author:

rwilson

Message:

More testing for ensure_numeric()

Location:

branches/numpy/anuga/utilities

Files:

• numerical_tools.py (modified) (3 diffs)
• test_numerical_tools.py (modified) (5 diffs)

branches/numpy/anuga/utilities/numerical_tools.py

@@ -249 +249 @@
         typecode:    numeric type. If specified, use this in the conversion.
                      If not, let numeric package decide.
-                     numpy assumes float64 if no type in A.
                      typecode will always be one of num.float, num.int, etc.
 
@@ -258 +257 @@
     """
 
-    if isinstance(A, basestring):
-        msg = 'Sorry, cannot handle string in ensure_numeric()'
+    #if isinstance(A, basestring):
+    if isinstance(A, str):
+        msg = 'ASorry, cannot handle strings in ensure_numeric()'
         raise Exception, msg
+
+    try:
+        elt = A[0]
+    except TypeError:
+        pass
+    else:
+        if isinstance(A, basestring):
+            msg = 'BSorry, cannot handle strings in ensure_numeric()'
+            raise Exception, msg
+
 
     if typecode is None:
@@ -271 +281 @@
 
 
-
-
 def histogram(a, bins, relative=False):
     """Standard histogram straight from the numeric manual

branches/numpy/anuga/utilities/test_numerical_tools.py

@@ -97 +97 @@
         assert A is B   #Same object
 
-# THIS FAILS!  ASSUMED TYPE IS num.int!?
-#        # check default num.array type, which is supposed to be num.float
-#        A = num.array((1,2,3,4))
-#        assert isinstance(A, num.ndarray)
-#        assert A.dtype.char == 'd', \
-#                "Expected dtype='d', got '%s'" % A.dtype.char
+        # check default num.array type, which is supposed to be num.int32
+        A = num.array((1,2,3,4))
+        assert isinstance(A, num.ndarray)
+        msg = "Expected dtype.char='l', got '%s'" % A.dtype.char
+        assert A.dtype.char == 'l', msg
 
         A = num.array([1,2,3,4])
@@ -116 +115 @@
         B = ensure_numeric(A, num.float)
         assert num.alltrue(A == B)
-#        print 'A=%s' % str(A)
-#        print 'B=%s, B.shape=%s' % (str(B), str(B.shape))
 
         B = ensure_numeric(A, num.int)        
         assert num.alltrue(A == B)
 
-        # try to simulate getting (x,0) shape
-        data_points = [[ 413634. ],]
-        array_data_points = ensure_numeric(data_points)
-        #if not (0,) == array_data_points.shape:
-        #    assert len(array_data_points.shape) == 2
-        #    assert array_data_points.shape[1] == 2
-
+#        # try to simulate getting (x,0) shape
+#        data_points = [[ 413634. ],]
+#        array_data_points = ensure_numeric(data_points)
+#        if not (0,) == array_data_points.shape:
+#            assert len(array_data_points.shape) == 2
+#            assert array_data_points.shape[1] == 2
+
+        # strings input should raise exception
+        self.failUnlessRaises(Exception, ensure_numeric(['abc',]))
+        self.failUnlessRaises(Exception, ensure_numeric(('abc',)))
+        self.failUnlessRaises(Exception, ensure_numeric(num.array(('abc',))))
 
     def NO_test_ensure_numeric_char(self):
@@ -468 +469 @@
     ##
     # @brief Test to see if ensure_numeric() behaves as we expect.
-    # @note Under Numeric ensure_numeric() *always* returned a copy.
+    # @note Under Numeric ensure_numeric() *always* returned a copy (bug).
     #       Under numpy it copies only when it has to.
     def test_ensure_numeric_copy(self):
@@ -524 +525 @@
         #####
         # Make 'points' a numeric array of int coordinates.
-        # Should be changed by ensure_numeric().
+        # Should be changed by ensure_numeric(, num.float).
         #####
         points = num.array([[1,2], [3,4], [5,6]], num.int)
@@ -551 +552 @@
         msg = 'ensure_numeric() should return the original input'
         self.failUnless(points_new_id == points_id, msg)
+
+        # should never change it's input parameter
+        msg = "ensure_numeric() changed it's input parameter"
+        self.failUnless(points_id == id(points), msg)
+
+        #####
+        # Make 'points' a numeric array of float32 coordinates.
+        # Should NOT be changed by ensure_numeric(, num.float32).
+        #####
+        points = num.array([[1.,2.], [3.,4.], [5.,6.]], num.float32)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float32)
+        points_new_id = id(points_new)
+
+        msg = 'ensure_numeric() should return the original input'
+        self.failUnless(points_new_id == points_id, msg)
+
+        # should never change it's input parameter
+        msg = "ensure_numeric() changed it's input parameter"
+        self.failUnless(points_id == id(points), msg)
+
+        #####
+        # Make 'points' a numeric array of float32 coordinates.
+        # Should be changed by ensure_numeric(, num.float64).
+        #####
+        points = num.array([[1.,2.], [3.,4.], [5.,6.]], num.float32)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float64)
+        points_new_id = id(points_new)
+
+        msg = 'ensure_numeric() should return a copy of the input'
+        self.failUnless(points_new_id != points_id, msg)
+
+        # should never change it's input parameter
+        msg = "ensure_numeric() changed it's input parameter"
+        self.failUnless(points_id == id(points), msg)
+
+        #####
+        # Make 'points' a numeric array of float coordinates.
+        # Should NOT be changed by ensure_numeric(, num.float64).
+        #####
+        points = num.array([[1.,2.], [3.,4.], [5.,6.]], num.float)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float64)
+        points_new_id = id(points_new)
+
+        msg = 'ensure_numeric() should return the original input'
+        self.failUnless(points_new_id == points_id, msg)
+        #msg = 'ensure_numeric() should return a copy of the input'
+        #self.failUnless(points_new_id != points_id, msg)
+
+        # should never change it's input parameter
+        msg = "ensure_numeric() changed it's input parameter"
+        self.failUnless(points_id == id(points), msg)
+
+        #####
+        # Make 'points' a numeric array of float coordinates.
+        # Should be changed by ensure_numeric(, num.float96).
+        #####
+        points = num.array([[1.,2.], [3.,4.], [5.,6.]], num.float)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float96)
+        points_new_id = id(points_new)
+
+        msg = 'ensure_numeric() should return a copy of the input'
+        self.failUnless(points_new_id != points_id, msg)
 
         # should never change it's input parameter