Changeset 3056 for inundation/pmesh

Timestamp:

Jun 2, 2006, 3:10:48 PM (19 years ago)

Author:

duncan

Message:

Fixing mesh_interface tests. geospatial_data.py now has ensure_geospatial.

Location:

inundation/pmesh

Files:

• mesh_interface.py (modified) (3 diffs)
• test_mesh_interface.py (modified) (4 diffs)

inundation/pmesh/mesh_interface.py

@@ -17 +17 @@
     from mesh import Mesh
 
+import exceptions
+class PolygonError(exceptions.Exception): pass
 
 def create_mesh_from_regions(bounding_polygon,
@@ -44 +46 @@
 
     poly_geo_reference is the geo_reference of the polygons.
+    The bounding polygon and the interior polygons
     If none, assume absolute.  Please pass one though, since absolute
     references have a zone.
@@ -61 +64 @@
     # To do make maximum_triangle_area optional?
     # check the segment indexes - throw an error if they are out of bounds
-    #
+    #(DSG) Yes!
+    
     #In addition I reckon the polygons could be of class Geospatial_data 
-
+    #(DSG) Yes!
 
     # First check that interior polygons are fully contained in bounding polygon
-
-    # FIXME (Ole): This causes the tests to fail because coordinates have been
-    # converted to relative coordinates (I think). How can we simplify this?
-    #
-    #FIXME (DSG-DSG) this code does not take into account geo-referencing
-    #if interior_regions is not None:        
+    #Note, Both poly's have the same geo_ref, therefore don't take into account
+    # geo_ref
+    if interior_regions is not None:        
      
-     #   for interior_polygon, res in interior_regions:
-      #      indices = inside_polygon(interior_polygon, bounding_polygon,
-       #                              closed = True, verbose = False)
+        for interior_polygon, res in interior_regions:
+            indices = inside_polygon(interior_polygon, bounding_polygon,
+                                     closed = True, verbose = False)
     
-       #     if len(indices) <> len(interior_polygon): 
-        #        msg = 'Interior polygon %s is outside bounding polygon: %s'\
-         #             %(str(interior_polygon), str(bounding_polygon))
-          #      raise msg
+            if len(indices) <> len(interior_polygon): 
+                msg = 'Interior polygon %s is outside bounding polygon: %s'\
+                      %(str(interior_polygon), str(bounding_polygon))
+                raise PolygonError, msg
 
 

inundation/pmesh/test_mesh_interface.py

@@ -113 +113 @@
 
         # These are the absolute values
-        min_x = 10 
-        min_y = 88
+        min_x = -10 
+        min_y = -88
         polygon_absolute = [[min_x,min_y],[1000,100],[1000,1000],[100,1000]]
         
@@ -170 +170 @@
 
         # These are the absolute values
-        min_x = 10 
-        min_y = 88
+        min_x = -10 
+        min_y = -88
         polygon = [[min_x,min_y],[1000,100],[1000,1000],[100,1000]]
         
@@ -221 +221 @@
                         'FAILED!')
 
-    def NOT_IMPLEMEMTED_test_create_mesh_from_regions_interior_regions(self):
+    def test_create_mesh_from_regions_interior_regions(self):
         ### Test that create_mesh_from_regions fails when an interior region is
         ### outside bounding polygon.
@@ -301 +301 @@
     suite = unittest.makeSuite(TestCase,'test')
     #suite = unittest.makeSuite(meshTestCase,'test_asciiFile')
-    runner = unittest.TextTestRunner(verbosity=2) #verbosity=2)
+    runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)