Changeset 6441 for branches/numpy/anuga/utilities/test_numerical_tools.py

Timestamp:

Mar 4, 2009, 8:26:22 AM (15 years ago)

Author:

rwilson

Message:

After changes to get_absolute, ensure_numeric, etc.

File:

• branches/numpy/anuga/utilities/test_numerical_tools.py (modified) (1 diff)

branches/numpy/anuga/utilities/test_numerical_tools.py

@@ -466 +466 @@
 #        t(num.array('abc', num.float), False)
 
+    ##
+    # @brief Test to see if ensure_numeric() behaves as we expect.
+    # @note Under Numeric ensure_numeric() *always* returned a copy.
+    #       Under numpy it copies only when it has to.
+    def test_ensure_numeric_copy(self):
+        #####
+        # Make 'points' a _list_ of coordinates.
+        # Should be changed by ensure_numeric().
+        #####
+        points = [[1.,2.], [3.,4.], [5.,6.]]
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float)
+        points_new_id = id(points_new)
+
+        msg = 'ensure_numeric() should return a copy of a list'
+        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 _tuple_ of coordinates.
+        # Should be changed by ensure_numeric().
+        #####
+        points = ((1.,2.), (3.,4.), (5.,6.))
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.int)
+        points_new_id = id(points_new)
+
+        msg = 'ensure_numeric() should return a copy of a list'
+        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().
+        #####
+        points = num.array([[1.,2.], [3.,4.], [5.,6.]], num.float)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float)
+        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 int coordinates.
+        # Should be changed by ensure_numeric().
+        #####
+        points = num.array([[1,2], [3,4], [5,6]], num.int)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.float)
+        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 int coordinates.
+        # Should NOT be changed by ensure_numeric(, num.int).
+        #####
+        points = num.array([[1,2], [3,4], [5,6]], num.int)
+        points_id = id(points)
+
+        points_new = ensure_numeric(points, num.int)
+        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)
+
 ################################################################################