Changeset 3038

Timestamp:

Jun 1, 2006, 12:13:01 PM (18 years ago)

Author:

ole

Message:

Added test for detecting interior polygons that stick outside bounding polygon
and also Jane's code for catching it. However, due to the way georeferencing
is resolved it is not so simple. Currently, the new test is failing.

Location:

inundation/pmesh

Files:

• mesh_interface.py (modified) (4 diffs)
• test_mesh_interface.py (modified) (1 diff)

inundation/pmesh/mesh_interface.py

@@ -63 +63 @@
     #In addition I reckon the polygons could be of class Geospatial_data 
 
+
+    # 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?
+    #
+    #if interior_regions is not None:        
+    #    from utilities.polygon import inside_polygon
+    # 
+    #    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
+
+
+
+    # Resolve geo referencing        
     if mesh_geo_reference is None:
         bounding_polygon = ensure_numeric(bounding_polygon, Float)
@@ -81 +102 @@
     m = Mesh(geo_reference=mesh_geo_reference)
 
-    #Do bounding polygon
+    # Do bounding polygon
     m.add_region_from_polygon(bounding_polygon,
                               tags=boundary_tags,
                               geo_reference=poly_geo_reference)
 
-    #Find one point inside region automatically
+    # Find one point inside region automatically
     if interior_regions is not None:
         excluded_polygons = []        
@@ -97 +118 @@
 
 
-    # convert bounding poly to absolute values
+    # Convert bounding poly to absolute values
     # this sort of thing can be fixed with the geo_points class
     if poly_geo_reference is not None:
@@ -110 +131 @@
     inner.setMaxArea(maximum_triangle_area)
 
-    #Do interior regions
+    # Do interior regions
     if interior_regions is not None:    
         for polygon, res in interior_regions:

inundation/pmesh/test_mesh_interface.py

@@ -221 +221 @@
                         'FAILED!')
 
+    def test_create_mesh_from_regions_interior_regions(self):
+        """Test that create_mesh_from_regions fails when an interior region is
+        outside bounding polygon.
+        """
+
+        # These are the absolute values
+        min_x = 10 
+        min_y = 88
+        polygon = [[min_x,min_y],[1000,100],[1000,1000],[100,1000]]
+
+        
+        boundary_tags = {'walls':[0,1],'bom':[2]}
+
+        # This one is inside bounding polygon - should pass
+        inner_polygon = [[800,400],[900,500],[800,600]]
+        
+        interior_regions = [(inner_polygon, 5)]
+        m = create_mesh_from_regions(polygon,
+                                     boundary_tags,
+                                     10000000,
+                                     interior_regions=interior_regions)
+
+
+        # This one sticks outside bounding polygon - should fail
+        inner_polygon = [[800,400],[1100,500],[800,600]]
+        interior_regions = [(inner_polygon, 5)]
+
+
+        
+        try:
+            m = create_mesh_from_regions(polygon,
+                                         boundary_tags,
+                                         10000000,
+                                         interior_regions=interior_regions)
+        except:
+            pass
+        else:
+            msg = 'Interior polygon sticking outside bounding polygon should '
+            msg += 'cause an Exception to be raised'
+            raise msg
+
+        
+
 
     def test_create_mesh_from_regions_with_duplicate_verts(self):