added inside poly profile script

jdh2358 · jdh2358 · commit 167fbffae4c1 · 2006-09-05T01:15:22.000Z
svn path=/trunk/matplotlib/; revision=2752
diff --git a/examples/lasso_demo.py b/examples/lasso_demo.py
@@ -8,7 +8,8 @@
 inside polygon detection routine.
 """
 from matplotlib.widgets import Lasso
-from matplotlib.mlab import inside_poly
+import matplotlib.mlab 
+from matplotlib.nxutils import points_inside_poly
 from matplotlib.colors import colorConverter
 from matplotlib.collections import RegularPolyCollection
 
@@ -47,8 +48,8 @@ def __init__(self, ax, data):
         
     def callback(self, verts):
         #print 'all done', verts
-        ind = inside_poly(self.xys, verts)
-        
+        #ind = matplotlib.mlab._inside_poly_deprecated(self.xys, verts)
+        ind = nx.nonzero(points_inside_poly(self.xys, verts))
         for i in range(self.Nxy):
             if i in ind:
                 self.facecolors[i] = Datum.colorin
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -61,6 +61,7 @@
 import numerix.mlab 
 from numerix import linear_algebra
 import numerix as nx
+import nxutils
 
 from numerix import array, asarray, arange, divide, exp, arctan2, \
      multiply, transpose, ravel, repeat, resize, reshape, floor, ceil,\
@@ -1428,8 +1429,9 @@ def stineman_interp(xi,x,y,yp=None):
         
     return yi
 
-def inside_poly(points, verts):
+def _inside_poly_deprecated(points, verts):
     """
+    # use nxutils.points_inside_poly instead
     points is a sequence of x,y points
     verts is a sequence of x,y vertices of a poygon
 
@@ -1439,7 +1441,6 @@ def inside_poly(points, verts):
     xys = nx.asarray(points)
     Nxy = xys.shape[0]
     Nv = len(verts)
-    
 
     def angle(x1, y1, x2, y2):
         twopi = 2*nx.pi
@@ -1469,6 +1470,16 @@ def angle(x1, y1, x2, y2):
         angles += a
     return nx.nonzero(nx.greater_equal(nx.absolute(angles), nx.pi))
 
+def inside_poly(points, verts):
+    """"
+    points is a sequence of x,y points
+    verts is a sequence of x,y vertices of a poygon
+
+    return value is a sequence on indices into points for the points
+    that are inside the polygon
+    """
+    return nx.nonzero(nxutils.points_inside_poly(points, verts))
+
 ### the following code was written and submitted by Fernando Perez
 ### from the ipython numutils package under a BSD license
 # begin fperez functions
diff --git a/src/nxutils.c b/src/nxutils.c
@@ -221,10 +221,10 @@ points_inside_poly(PyObject *self, PyObject *args)
 
 
 static PyMethodDef module_methods[] = {
-  {"pnpoly",  pnpoly, METH_VARARGS, "inside = pnpoly(x, y, xyverts)\nreturn True if x,y is inside the polygon defined by the sequence of x,y vertices in xyverts"},
+  {"pnpoly",  pnpoly, METH_VARARGS, "inside = pnpoly(x, y, xyverts)\nreturn 1 if x,y is inside the polygon defined by the sequence of x,y vertices in xyverts"},
   {"points_inside_poly",  points_inside_poly, METH_VARARGS, "mask = points_inside_poly(xypoints, xyverts)\nreturn a mask of length xypoints indicating whether each x,y point is inside the polygon defined by the sequence of x,y vertices in xyverts"},
   {NULL}  /* Sentinel */
-};
+}
 
 
 #ifdef NUMARRAY
diff --git a/unit/inside_poly_profile.py b/unit/inside_poly_profile.py
@@ -0,0 +1,25 @@
+import os, sys, time
+
+import matplotlib.nxutils as nxutils
+import matplotlib.numerix as nx
+import matplotlib.mlab
+import matplotlib.patches as patches
+if 1:
+    numtrials, numverts, numpoints = 50, 1000, 1000
+    verts = patches.CirclePolygon((0.5, 0.5), radius=0.5, resolution=numverts).get_verts()
+
+    t0 = time.time()
+    for i in range(numtrials):
+        points = nx.mlab.rand(numpoints,2)
+        mask = matplotlib.mlab._inside_poly_deprecated(points, verts)
+    told = time.time() - t0
+
+    t0 = time.time()
+    for i in range(numtrials):
+        points = nx.mlab.rand(numpoints,2)
+        mask = nxutils.points_inside_poly(points, verts)
+    tnew = time.time() - t0
+    print numverts, numpoints, told, tnew, told/tnew
+
+                                                                                        
+
