Changeset 6304 for branches/numpy/anuga/coordinate_transforms

Timestamp:

Feb 10, 2009, 11:11:04 AM (16 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/coordinate_transforms/geo_reference.py (modified) (8 diffs)
• anuga/coordinate_transforms/test_geo_reference.py (modified) (6 diffs)
• anuga/coordinate_transforms/test_lat_long_UTM_conversion.py (modified) (1 diff)
• anuga/coordinate_transforms/test_redfearn.py (modified) (1 diff)

branches/numpy/anuga/coordinate_transforms/geo_reference.py

@@ -11 +11 @@
 from anuga.utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
      ShapeError
-
-import Numeric as num
+from anuga.config import netcdf_float, netcdf_int, netcdf_float32
+
+import numpy as num
 
 
@@ -64 +65 @@
         self.xllcorner = xllcorner
         self.yllcorner = yllcorner        
+        #self.is_absolute = num.allclose([self.xllcorner, self.yllcorner], 0) 
             
         if NetCDFObject is not None:
@@ -99 +101 @@
         
         # Fix some assertion failures
-        if type(self.zone) == num.ArrayType and self.zone.shape == ():
+        if isinstance(self.zone, num.ndarray) and self.zone.shape == ():
             self.zone = self.zone[0]
-        if type(self.xllcorner) == num.ArrayType and self.xllcorner.shape == ():
+        if isinstance(self.xllcorner, num.ndarray) and self.xllcorner.shape == ():
             self.xllcorner = self.xllcorner[0]
-        if type(self.yllcorner) == num.ArrayType and self.yllcorner.shape == ():
+        if isinstance(self.yllcorner, num.ndarray) and self.yllcorner.shape == ():
             self.yllcorner = self.yllcorner[0]
 
-        assert (type(self.xllcorner) == types.FloatType or\
-                type(self.xllcorner) == types.IntType)
-        assert (type(self.yllcorner) == types.FloatType or\
-                type(self.yllcorner) == types.IntType)
-        assert (type(self.zone) == types.IntType)
+        assert (self.xllcorner.dtype.kind in num.typecodes['Float'] or
+                self.xllcorner.dtype.kind in num.typecodes['Integer'])
+        assert (self.yllcorner.dtype.kind in num.typecodes['Float'] or
+                self.yllcorner.dtype.kind in num.typecodes['Integer'])
+        assert (self.zone.dtype.kind in num.typecodes['Integer'])
         
         try:
@@ -173 +175 @@
             
         # Fix some assertion failures
-        if(type(self.zone) == num.ArrayType and self.zone.shape == ()):
+        if isinstance(self.zone, num.ndarray) and self.zone.shape == ():
             self.zone = self.zone[0]
-        if type(self.xllcorner) == num.ArrayType and self.xllcorner.shape == ():
+        if isinstance(self.xllcorner, num.ndarray) and self.xllcorner.shape == ():
             self.xllcorner = self.xllcorner[0]
-        if type(self.yllcorner) == num.ArrayType and self.yllcorner.shape == ():
+        if isinstance(self.yllcorner, num.ndarray) and self.yllcorner.shape == ():
             self.yllcorner = self.yllcorner[0]
-    
-        assert (type(self.xllcorner) == types.FloatType)
-        assert (type(self.yllcorner) == types.FloatType)
-        assert (type(self.zone) == types.IntType)
-        
+
+# useless asserts - see try/except code above
+#        assert (type(self.xllcorner) == types.FloatType)
+#        assert (type(self.yllcorner) == types.FloatType)
+#        assert (type(self.zone) == types.IntType)
+
         
     def change_points_geo_ref(self, points,
                               points_geo_ref=None):
         """
-        Change the geo reference of a list or Numeric array of points to
+        Change the geo reference of a list or numeric array of points to
         be this reference.(The reference used for this object)
         If the points do not have a geo ref, assume 'absolute' values
@@ -197 +200 @@
             is_list = True
 
-        points = ensure_numeric(points, num.Float)
+        points = ensure_numeric(points, num.float)
         
         if len(points.shape) == 1:
@@ -243 +246 @@
 
         
-    
+    ##
+    # @brief 
+    # @param points 
+    # @return 
+    # @note 
     def get_absolute(self, points):
-        """
-        Given a set of points geo referenced to this instance,
+        """Given a set of points geo referenced to this instance,
         return the points as absolute values.
         """
 
-        #if self.is_absolute():
+        #if self.is_absolute:
         #    return points
+
         is_list = False
         if type(points) == types.ListType:
             is_list = True
 
-        points = ensure_numeric(points, num.Float)
+        points = ensure_numeric(points, num.float)
         if len(points.shape) == 1:
             #One point has been passed
@@ -264 +271 @@
                 #points = reshape(points, (1,2))
 
-
         msg = 'Input must be an N x 2 array or list of (x,y) values. '
         msg += 'I got an %d x %d array' %points.shape    
         if not points.shape[1] == 2:
             raise ShapeError, msg    
-            
         
         # Add geo ref to points
+        #if not self.is_absolute:
         if not self.is_absolute():
             points[:,0] += self.xllcorner 
             points[:,1] += self.yllcorner
-
+            #self.is_absolute = True
         
         if is_list:
@@ -296 +302 @@
             is_list = True
 
-        points = ensure_numeric(points, num.Float)
+        points = ensure_numeric(points, num.float)
         if len(points.shape) == 1:
             #One point has been passed

branches/numpy/anuga/coordinate_transforms/test_geo_reference.py

@@ -9 +9 @@
 from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
 
-import Numeric as num
+import numpy as num
 
 
@@ -171 +171 @@
         #print "4 new_lofl",new_lofl
 
-        self.failUnless(type(new_lofl) == num.ArrayType, ' failed')
+        self.failUnless(isinstance(new_lofl, num.ndarray), ' failed')
         self.failUnless(type(new_lofl) == type(lofl), ' failed')
         lofl[:,0] -= x
@@ -189 +189 @@
         #print "5 new_lofl",new_lofl
 
-        self.failUnless(type(new_lofl) == num.ArrayType, ' failed')
+        self.failUnless(isinstance(new_lofl, num.ndarray), ' failed')
         self.failUnless(type(new_lofl) == type(lofl), ' failed')
 
@@ -206 +206 @@
         #print "new_lofl",new_lofl
 
-        self.failUnless(type(new_lofl) == num.ArrayType, ' failed')
+        self.failUnless(isinstance(new_lofl, num.ndarray), ' failed')
         self.failUnless(type(new_lofl) == type(lofl), ' failed')
         for point,new_point in map(None,[lofl],new_lofl):
@@ -229 +229 @@
             self.failUnless(point[0]+point_x-x==new_point[0], ' failed')
             self.failUnless(point[1]+point_y-y==new_point[1], ' failed')
-      
-
-    def test_get_absolute(self):
+
+    def test_get_absolute_list(self):
+        # test with supplied offsets
         x = 7.0
         y = 3.0
         
-        g = Geo_reference(56,x,y)
-        lofl = [[3.0,34.0], [64.0,6.0]]
-        new_lofl = g.get_absolute(lofl)
-        #print "lofl",lofl 
-        #print "new_lofl",new_lofl
-
-        self.failUnless(type(new_lofl) == types.ListType, ' failed')
-        self.failUnless(type(new_lofl) == type(lofl), ' failed')
-        for point,new_point in map(None,lofl,new_lofl):
-            self.failUnless(point[0]+x==new_point[0], ' failed')
-            self.failUnless(point[1]+y==new_point[1], ' failed')
-
+        g = Geo_reference(56, x, y)
+        points = [[3.0,34.0], [64.0,6.0]]
+        new_points = g.get_absolute(points)
+
+        self.failUnless(type(new_points) == types.ListType, 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        for point, new_point in map(None, points, new_points):
+            self.failUnless(point[0]+x == new_point[0], 'failed')
+            self.failUnless(point[1]+y == new_point[1], 'failed')
+
+        # test with no supplied offsets
+        g = Geo_reference()
+        points = [[3.0,34.0], [64.0,6.0]]
+        new_points = g.get_absolute(points)
+
+        self.failUnless(type(new_points) == types.ListType, 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        for point, new_point in map(None, points, new_points):
+            self.failUnless(point[0] == new_point[0], 'failed')
+            self.failUnless(point[1] == new_point[1], 'failed')
             
+        # test that calling get_absolute twice does the right thing
+        # first call
+        dx = 10.0
+        dy = 10.0
+        g = Geo_reference(56, dx, dy)
+        points = [[3.0,34.0], [64.0,6.0]]
+        expected_new_points = [[3.0+dx,34.0+dy], [64.0+dx,6.0+dy]]
+        new_points = g.get_absolute(points)
+
+        self.failUnless(type(new_points) == types.ListType, 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        for point, new_point in map(None, expected_new_points, new_points):
+            self.failUnless(point[0] == new_point[0], 'failed')
+            self.failUnless(point[1] == new_point[1], 'failed')
+
+        # and repeat from 'new_points = g.get_absolute(points)' above
+        # to see if second call with same input gives same results.
+        new_points = g.get_absolute(points)
+
+        self.failUnless(type(new_points) == types.ListType, 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        for point, new_point in map(None, expected_new_points, new_points):
+            self.failUnless(point[0] == new_point[0], 'failed')
+            self.failUnless(point[1] == new_point[1], 'failed')
+
+    def test_get_absolute_array(self):
+        '''Same test as test_get_absolute_list(), but with numeric arrays.'''
+
+        # test with supplied offsets
+        x = 7.0
+        y = 3.0
+        
+        g = Geo_reference(56, x, y)
+        points = num.array([[3.0,34.0], [64.0,6.0]])
+        new_points = g.get_absolute(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        self.failUnless(num.alltrue(points == new_points), 'failed')
+
+        # test with no supplied offsets
         g = Geo_reference()
-        lofl = [[3.0,34.0], [64.0,6.0]]
-        new_lofl = g.get_absolute(lofl)
-        #print "lofl",lofl 
-        #print "new_lofl",new_lofl
-
-        self.failUnless(type(new_lofl) == types.ListType, ' failed')
-        self.failUnless(type(new_lofl) == type(lofl), ' failed')
-        for point,new_point in map(None,lofl,new_lofl):
-            self.failUnless(point[0]==new_point[0], ' failed')
-            self.failUnless(point[1]==new_point[1], ' failed')
-            
+        points = num.array([[3.0,34.0], [64.0,6.0]])
+        new_points = g.get_absolute(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        self.failUnless(num.alltrue(points == new_points), 'failed')
+
+        # test that calling get_absolute twice does the right thing
+        # first call
+        dx = 10.0
+        dy = 10.0
+        g = Geo_reference(56, dx, dy)
+        points = num.array([[3.0,34.0], [64.0,6.0]])
+        expected_new_points = num.array([[3.0+dx,34.0+dy], [64.0+dx,6.0+dy]])
+        new_points = g.get_absolute(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = ('First call of .get_absolute() returned %s\nexpected %s'
+               % (str(new_points), str(expected_new_points)))
+        self.failUnless(num.alltrue(expected_new_points == new_points), msg)
+
+        # and repeat from 'new_points = g.get_absolute(points)' above
+        # to see if second call with same input gives same results.
+        new_points = g.get_absolute(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = ('Second call of .get_absolute() returned %s\nexpected %s'
+               % (str(new_points), str(expected_new_points)))
+        self.failUnless(num.alltrue(expected_new_points == new_points), msg)
+
+        # and repeat again to see if *third* call with same input
+        # gives same results.
+        new_points = g.get_absolute(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = ('Second call of .get_absolute() returned %s\nexpected %s'
+               % (str(new_points), str(expected_new_points)))
+        self.failUnless(num.alltrue(expected_new_points == new_points), msg)
+
     def test_is_absolute(self):
         
@@ -427 +507 @@
 if __name__ == "__main__":
 
-    suite = unittest.makeSuite(geo_referenceTestCase,'test')
+    #suite = unittest.makeSuite(geo_referenceTestCase,'test')
+    suite = unittest.makeSuite(geo_referenceTestCase,'test_get_absolute')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)

branches/numpy/anuga/coordinate_transforms/test_lat_long_UTM_conversion.py

@@ -12 +12 @@
 from anuga.utilities.anuga_exceptions import ANUGAError
 
-import Numeric as num
+import numpy as num
 
 

branches/numpy/anuga/coordinate_transforms/test_redfearn.py

@@ -11 +11 @@
 from anuga.utilities.anuga_exceptions import ANUGAError
 
-import Numeric as num
+import numpy as num