Changeset 8054

Timestamp:

Oct 29, 2010, 11:00:29 AM (12 years ago)

Author:

habili

Message:

Test for line intersect

File:

• trunk/anuga_core/source/anuga/geometry/test_polygon.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/geometry/test_polygon.py

@@ -13 +13 @@
                     plot_polygons, outside_polygon, is_outside_polygon, \
                     intersection, is_complex, polygon_overlap, not_polygon_overlap,\
-                    polyline_overlap, not_polyline_overlap,\
+                    line_intersect, not_line_intersect,\
                     is_inside_triangle, interpolate_polyline, inside_polygon, \
                     in_and_outside_polygon
@@ -503 +503 @@
         assert num.allclose([0], indices)             
                      
-    def test_polyline_overlap(self):
+    def test_line_intersect(self):
         #rectangular polygon, 2 triangles overlap
-        polyline = [[3.,3.],[4.,3.]]
+        line = [[3.,3.],[4.,3.]]
         triangles = [[7.,10.],#does not overlap
                      [8.,12.],
@@ -525 +525 @@
                      [3., 1.]]
                      
-        indices = polyline_overlap(triangles, polyline)        
+        indices = line_intersect(triangles, line)        
         assert num.allclose([1, 2, 3, 5], indices)
 
-    def test_not_polyline_overlap(self):
+    def test_not_line_intersect(self):
         #rectangular polygon, 2 triangles overlap
-        polyline = [[3.,3.],[4.,3.]]
+        line = [[3.,3.],[4.,3.]]
         triangles = [[7.,10.],#does not overlap
                      [8.,12.],
@@ -550 +550 @@
                      [3., 1.]]
  
-        indices = not_polyline_overlap(triangles, polyline)        
+        indices = not_line_intersect(triangles, line)
         assert num.allclose([4, 0], indices)