Changeset 6442

Timestamp:

Mar 4, 2009, 8:37:22 AM (16 years ago)

Author:

rwilson

Message:

Added tests for get_relative().

Location:

branches/numpy/anuga/coordinate_transforms

Files:

• geo_reference.py (modified) (3 diffs)
• test_geo_reference.py (modified) (2 diffs)

branches/numpy/anuga/coordinate_transforms/geo_reference.py

@@ -318 +318 @@
                 msg = 'Single point must have two elements'
                 raise ShapeError, msg
-                #points = reshape(points, (1,2))
 
         if not points.shape[1] == 2:
@@ -348 +347 @@
         """
 
-        is_list = False
-        if type(points) == types.ListType:
-            is_list = True
-
-        points = ensure_numeric(points, num.float)
+        # remember if we got a list
+        is_list = isinstance(points, list)
+
+        # convert to a numeric array, force a copy
+        points = ensure_numeric(copy.copy(points), num.float)
+
+        # sanity checks
         if len(points.shape) == 1:
             #One point has been passed
@@ -358 +359 @@
                 msg = 'Single point must have two elements'
                 raise ShapeError, msg
-                #points = reshape(points, (1,2))
 
         if not points.shape[1] == 2:

branches/numpy/anuga/coordinate_transforms/test_geo_reference.py

@@ -292 +292 @@
         msg = 'points=\n%s\nnew_points=\n%s' % (str(points), str(new_points))
         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')
+            self.failUnless(point[0]+x == new_point[0], msg)
+            self.failUnless(point[1]+y == new_point[1], msg)
 
         # test with no supplied offsets
@@ -336 +336 @@
         self.failUnless(type(new_points) == type(points), 'failed')
         msg = ('Third 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_get_relative_list(self):
+        # test with supplied offsets
+        x = 7.0
+        y = 3.0
+        
+        g = Geo_reference(56, x, y)
+        points = [[3.0,34.0], [64.0,6.0]]
+        new_points = g.get_relative(points)
+
+        self.failUnless(isinstance(new_points, list), '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_relative(points)
+
+        self.failUnless(isinstance(new_points, list), '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 = 12.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_relative(points)
+
+        self.failUnless(isinstance(new_points, list), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        self.failUnless(new_points == expected_new_points, '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_relative(points)
+
+        self.failUnless(isinstance(new_points, list), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        self.failUnless(new_points == expected_new_points, 'failed')
+
+    def test_get_relative_array(self):
+        '''Same test as test_get_relative_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_relative(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = 'points=\n%s\nnew_points=\n%s' % (str(points), str(new_points))
+        for point, new_point in map(None, points, new_points):
+            self.failUnless(point[0]-x == new_point[0], msg)
+            self.failUnless(point[1]-y == new_point[1], msg)
+
+        # test with no supplied offsets
+        g = Geo_reference()
+        points = num.array([[3.0,34.0], [64.0,6.0]])
+        new_points = g.get_relative(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_relative twice does the right thing
+        # first call
+        dx = 11.0
+        dy = 13.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_relative(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = ('First call of .get_relative() 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_relative(points)' above
+        # to see if second call with same input gives same results.
+        new_points = g.get_relative(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = ('Second call of .get_relative() returned\n%s\nexpected\n%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_relative(points)
+
+        self.failUnless(isinstance(new_points, num.ndarray), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        msg = ('Third call of .get_relative() returned %s\nexpected %s'
                % (str(new_points), str(expected_new_points)))
         self.failUnless(num.alltrue(expected_new_points == new_points), msg)