Changeset 3134

Timestamp:

Jun 13, 2006, 10:10:40 AM (19 years ago)

Author:

duncan

Message:

small fixes

Location:

inundation/coordinate_transforms

Files:

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

inundation/coordinate_transforms/geo_reference.py

@@ -9 +9 @@
 from Numeric import array, Float, ArrayType, reshape, allclose
 from utilities.numerical_tools import ensure_numeric
-from utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError 
-
-
-#import exceptions
-#class TitleError(exceptions.IOError): pass
-#class ParsingError(exceptions.IOError): pass
+from utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
+     ShapeError
+
 
 DEFAULT_ZONE = -1
@@ -195 +192 @@
         """
 
-        if self.is_absolute():
-            return points
+        #if self.is_absolute():
+        #    return points
         
 
@@ -204 +201 @@
 
         points = ensure_numeric(points, Float)
-        
         if len(points.shape) == 1:
             #One point has been passed
             msg = 'Single point must have two elements'
-            assert len(points) == 2, msg
-            points = reshape(points, (1,2))
+            if not len(points) == 2:
+                raise ShapeError, msg    
+                #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    
-        assert points.shape[1] == 2, msg    
-            
-
-        # Old code    
-        #is_list = False
-        #if type(points) == types.ListType:
-        #    is_list = True
-        #    if len(points)>0 and type(points[0]) \
-        #           not in [types.ListType,types.TupleType]:
-        #        #a single point is being passed.  make it a list of lists
-        #        points = [points]
-        #elif type(points) == ArrayType:
-        #    if len(points.shape) == 1:
-        #        points = [points]       
-            
-        ## convert into array
-        #points = array(points).astype(Float)
-
-        
-        # Add primary geo ref from points
-
-
-        
-        points[:,0] += self.xllcorner 
-        points[:,1] += self.yllcorner
+        if not points.shape[1] == 2:
+            raise ShapeError, msg    
+            
+        
+        # Add geo ref to points
+        if not self.is_absolute():
+            points[:,0] += self.xllcorner 
+            points[:,1] += self.yllcorner
 
         

inundation/coordinate_transforms/test_geo_reference.py

@@ -107 +107 @@
             self.failUnless(point[0]-x==new_point[0], ' failed')
             self.failUnless(point[1]-y==new_point[1], ' failed')
+         
         
     def test_change_points_geo_ref2(self):
@@ -207 +208 @@
             self.failUnless(point[1]+point_y-y==new_point[1], ' failed')
       
+
     def test_get_absolute(self):
         x = 7.0
@@ -222 +224 @@
             self.failUnless(point[0]+x==new_point[0], ' failed')
             self.failUnless(point[1]+y==new_point[1], ' failed')
-                        
+
+            
+        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')
+            
     def test_is_absolute(self):
         
@@ -364 +379 @@
                         'bad text file did not raise error!')
             os.remove(point_file)
-         
+
+    def test_error_message_ShapeError(self):
+        
+        new_g = Geo_reference()
+        try:
+            new_g.get_absolute((8.9, 7.8, 9.0)) 
+        except ShapeError:
+            pass
+        else:
+            self.failUnless(0 ==1,
+                        'bad shape did not raise error!')
+            os.remove(point_file)
+            
+        new_g = Geo_reference()
+        try:
+            new_g.get_absolute(((8.9, 7.8, 9.0))) 
+        except ShapeError:
+            pass
+        else:
+            self.failUnless(0 ==1,
+                        'bad shape did not raise error!')
+            os.remove(point_file)
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":