Changeset 6535 for anuga_core/source/anuga/utilities/polygon.py

Timestamp:

Mar 17, 2009, 11:06:55 PM (16 years ago)

Author:

ole

Message:

Wrote is_inside_triangle in C and tested it some more.

File:

• anuga_core/source/anuga/utilities/polygon.py (modified) (5 diffs)

anuga_core/source/anuga/utilities/polygon.py

@@ -188 +188 @@
 def is_inside_triangle(point, triangle, 
                        closed=True, 
-                       rtol=1.0e-6,
-                       atol=1.0e-8,                      
+                       rtol=1.0e-12,
+                       atol=1.0e-12,                      
                        check_inputs=True, 
                        verbose=False):
@@ -228 +228 @@
     
     rtol and atol will determine how close the point has to be to the edge
-    before it is deemed on the edge.
+    before it is deemed to be on the edge.
     
     """
@@ -246 +246 @@
     if point[1] > max(triangle[:,1]): return False        
 
-    
+    return bool(_is_inside_triangle(point, triangle, int(closed), rtol, atol))
+    
+    
+
+    # FIXME (Ole): The rest of this function has been made 
+    # obsolete by the C extension
+        
     # Start search    
     A = triangle[0, :]
@@ -282 +288 @@
                                  Y[0], Y[1],
                                  rtol, atol)
+            
             if res:
                 return True
                 
-                
+    return False
 
 
@@ -1233 +1240 @@
     from polygon_ext import _separate_points_by_polygon
     from polygon_ext import _interpolate_polyline    
+    from polygon_ext import _is_inside_triangle        
     #from polygon_ext import _intersection