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

Timestamp:

Feb 10, 2009, 11:11:04 AM (15 years ago)

Author:

rwilson

Message:

Initial commit of numpy changes. Still a long way to go.

Location:

branches/numpy

Files:

• . (copied) (copied from anuga_core/source)
• anuga/utilities/test_numerical_tools.py (modified) (3 diffs)

branches/numpy/anuga/utilities/test_numerical_tools.py

@@ -3 +3 @@
 
 import unittest
-import Numeric as num
+import numpy as num
 
 from math import sqrt, pi
@@ -68 +68 @@
         A = [1,2,3,4]
         B = ensure_numeric(A)
-        assert type(B) == num.ArrayType
-        assert B.typecode() == 'l'
+        assert isinstance(B, num.ndarray)
+        assert B.dtype.char == 'l'
         assert B[0] == 1 and B[1] == 2 and B[2] == 3 and B[3] == 4
 
         A = [1,2,3.14,4]
         B = ensure_numeric(A)
-        assert type(B) == num.ArrayType
-        assert B.typecode() == 'd'
+        assert isinstance(B, num.ndarray)
+        assert B.dtype.char == 'd'
         assert B[0] == 1 and B[1] == 2 and B[2] == 3.14 and B[3] == 4
 
         A = [1,2,3,4]
-        B = ensure_numeric(A, num.Float)
-        assert type(B) == num.ArrayType
-        assert B.typecode() == 'd'
+        B = ensure_numeric(A, num.float)
+        assert isinstance(B, num.ndarray)
+        assert B.dtype.char == 'd'
         assert B[0] == 1.0 and B[1] == 2.0 and B[2] == 3.0 and B[3] == 4.0
 
         A = [1,2,3,4]
-        B = ensure_numeric(A, num.Float)
-        assert type(B) == num.ArrayType
-        assert B.typecode() == 'd'
+        B = ensure_numeric(A, num.float)
+        assert isinstance(B, num.ndarray)
+        assert B.dtype.char == 'd'
         assert B[0] == 1.0 and B[1] == 2.0 and B[2] == 3.0 and B[3] == 4.0
 
-        A = num.array([1,2,3,4], num.Int)      #array default#
+        A = num.array([1,2,3,4])
         B = ensure_numeric(A)
-        assert type(B) == num.ArrayType
-        assert B.typecode() == 'l'        
+        assert isinstance(B, num.ndarray)
+        assert B.dtype.char == 'l'        
         assert num.alltrue(A == B)    
         assert A is B   #Same object
 
-        A = num.array([1,2,3,4], num.Int)      #array default#
-        B = ensure_numeric(A, num.Float)
-        assert type(B) == num.ArrayType
-        assert B.typecode() == 'd'        
+# 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
+
+        A = num.array([1,2,3,4])
+        B = ensure_numeric(A, num.float)
+        assert isinstance(B, num.ndarray)
+        assert A.dtype.char == 'l'        
+        assert B.dtype.char == 'd'        
         assert num.alltrue(A == B)    
-        assert A is not B   #Not the same object
+        assert A is not B   # Not the same object
 
         # Check scalars
         A = 1
-        B = ensure_numeric(A, num.Float)
-        #print A, B[0], len(B), type(B) 
-        #print B.shape
+        B = ensure_numeric(A, num.float)
         assert num.alltrue(A == B)
-
-        B = ensure_numeric(A, num.Int)        
-        #print A, B
-        #print B.shape
+#        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
+
+
+    def NO_test_ensure_numeric_char(self):
+        '''numpy can't handle this'''
+
         # Error situation
-
-        B = ensure_numeric('hello', num.Int)                
+        B = ensure_numeric('hello', num.int)                
         assert num.allclose(B, [104, 101, 108, 108, 111])
 
@@ -343 +359 @@
         assert x == 5.
 
-                                    
+
+################################################################################
+# Test the is_num_????() functions.
+################################################################################
+
+    def test_is_float(self):
+        def t(val, expected):
+            if expected == True:
+                msg = 'should be num.float?'
+            else:
+                msg = 'should not be num.float?'
+            msg = '%s (%s) %s' % (str(val), type(val), msg)
+            assert is_num_float(val) == expected, msg
+
+        t(1, False)
+        t(1.0, False)
+        t('abc', False)
+        t(None, False)
+        t(num.array(None), False)
+        # can't create array(None, num.int)
+#        t(num.array(None, num.int), False)
+        t(num.array(None, num.float), True)
+        t(num.array(()), True)
+        t(num.array((), num.int), False)
+        t(num.array((), num.float), True)
+        t(num.array((1), num.int), False)
+        t(num.array((1), num.float), True)
+
+        t(num.array((1,2)), False)
+        t(num.array((1,2), num.int), False)
+        t(num.array((1,2), num.float), True)
+        t(num.array([1,2]), False)
+        t(num.array([1,2], num.int), False)
+        t(num.array([1,2], num.float), True)
+
+        t(num.array((1.0,2.0)), True)
+        t(num.array((1.0,2.0), num.int), False)
+        t(num.array((1.0,2.0), num.float), True)
+        t(num.array([1.0,2.0]), True)
+        t(num.array([1.0,2.0], num.int), False)
+        t(num.array([1.0,2.0], num.float), True)
+
+        t(num.array(((1.0,2.0),(3.0,4.0))), True)
+        t(num.array(((1.0,2.0),(3.0,4.0)), num.int), False)
+        t(num.array(((1.0,2.0),(3.0,4.0)), num.float), True)
+        t(num.array([[1.0,2.0],[3.0,4.0]]), True)
+        t(num.array([1.0,2.0], num.int), False)
+        t(num.array([1.0,2.0], num.float), True)
+
+        t(num.array('abc'), False)
+        t(num.array('abc', num.character), False)
+        # can't create array as int from string
+#        t(num.array('abc', num.int), False)
+        # can't create array as float from string
+#        t(num.array('abc', num.float), True)
+
+    def test_is_int(self):
+        def t(val, expected):
+            if expected == True:
+                msg = 'should be num.int?'
+            else:
+                msg = 'should not be num.int?'
+            msg = '%s (%s) %s' % (str(val), type(val), msg)
+            assert is_num_int(val) == expected, msg
+
+        t(1, False)
+        t(1.0, False)
+        t('abc', False)
+        t(None, False)
+        t(num.array(None), False)
+        # can't create array(None, num.int)
+#        t(num.array(None, num.int), True)
+        t(num.array(None, num.float), False)
+        t(num.array((), num.int), True)
+        t(num.array(()), False)
+        t(num.array((), num.float), False)
+        t(num.array((1), num.int), True)
+        t(num.array((1), num.float), False)
+
+        t(num.array((1,2)), True)
+        t(num.array((1,2), num.int), True)
+        t(num.array((1,2), num.float), False)
+        t(num.array([1,2]), True)
+        t(num.array([1,2], num.int), True)
+        t(num.array([1,2], num.float), False)
+
+        t(num.array((1.0,2.0)), False)
+        t(num.array((1.0,2.0), num.int), True)
+        t(num.array((1.0,2.0), num.float), False)
+        t(num.array([1.0,2.0]), False)
+        t(num.array([1.0,2.0], num.int), True)
+        t(num.array([1.0,2.0], num.float), False)
+
+        t(num.array(((1.0,2.0),(3.0,4.0))), False)
+        t(num.array(((1.0,2.0),(3.0,4.0)), num.int), True)
+        t(num.array(((1.0,2.0),(3.0,4.0)), num.float), False)
+        t(num.array([[1.0,2.0],[3.0,4.0]]), False)
+        t(num.array([1.0,2.0], num.int), True)
+        t(num.array([1.0,2.0], num.float), False)
+
+        t(num.array('abc'), False)
+        t(num.array('abc', num.character), False)
+        # can't create array as int from string
+#        t(num.array('abc', num.int), True)
+        # can't create array as float from string
+#        t(num.array('abc', num.float), False)
+
 
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Numerical_Tools,'test')
-    #suite = unittest.makeSuite(Test_Numerical_Tools,'test_err')
+    #suite = unittest.makeSuite(Test_Numerical_Tools,'test')
+    suite = unittest.makeSuite(Test_Numerical_Tools,'test_is_')
     runner = unittest.TextTestRunner()
     runner.run(suite)