Changeset 3052 for inundation/pmesh/test_mesh_interface.py

Timestamp:

Jun 2, 2006, 1:12:20 PM (19 years ago)

Author:

ole

Message:

Changed semantics of inside_polygon (and outside_polygon) so that one point is treated as a list containing that one point. For the old boolean functionality use is_inside_polygon and is_outside_polygon.
Fixed unit tests as well

File:

• inundation/pmesh/test_mesh_interface.py (modified) (4 diffs)

inundation/pmesh/test_mesh_interface.py

@@ -5 +5 @@
 from mesh_interface import *
 from load_mesh.loadASCII import *
-from utilities.polygon import inside_polygon
+from utilities.polygon import is_inside_polygon
 from coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
 
@@ -74 +74 @@
         # poly_point values are relative to the mesh geo-ref
         # make them absolute
-        self.failUnless(inside_polygon([poly_point.x+x,poly_point.y+y],
-                                       polygon_absolute, closed = False),
+        self.failUnless(is_inside_polygon([poly_point.x+x,poly_point.y+y],
+                                          polygon_absolute, closed = False),
                         'FAILED!')
         
@@ -88 +88 @@
         # poly_point values are relative to the mesh geo-ref
         # make them absolute
-        self.failUnless(inside_polygon([poly_point.x+x,poly_point.y+y],
-                                       inner1_polygon_absolute,
-                                       closed = False),
+        self.failUnless(is_inside_polygon([poly_point.x+x,poly_point.y+y],
+                                          inner1_polygon_absolute,
+                                          closed = False),
                         'FAILED!')
         
@@ -103 +103 @@
         # poly_point values are relative to the mesh geo-ref
         # make them absolute
-        self.failUnless(inside_polygon([poly_point.x+x,poly_point.y+y],
-                                       inner2_polygon_absolute,
-                                       closed = False),
+        self.failUnless(is_inside_polygon([poly_point.x+x,poly_point.y+y],
+                                          inner2_polygon_absolute,
+                                          closed = False),
                         'FAILED!')