Changeset 6517 for branches/numpy/anuga/coordinate_transforms/test_geo_reference.py

Timestamp:

Mar 16, 2009, 11:06:22 AM (15 years ago)

Author:

rwilson

Message:

Hand-merged recent changes in main trunk. Still work to be done in shallow_water.

File:

• branches/numpy/anuga/coordinate_transforms/test_geo_reference.py (modified) (1 diff)

branches/numpy/anuga/coordinate_transforms/test_geo_reference.py

@@ -235 +235 @@
         y = 3.0
         
-        g = Geo_reference(56, x, y)
-        points = [[3.0,34.0], [64.0,6.0]]
-        new_points = g.get_absolute(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(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()
-        points = [[3.0,34.0], [64.0,6.0]]
-        new_points = g.get_absolute(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')
+        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')
             
         # test that calling get_absolute twice does the right thing