Changeset 745

Timestamp:

01/17/08 12:21:48 (10 months ago)

Author:

rkern

Message:

* BUG: fix a leak.
* Add some tests for the duplicate point handling contributed by "pv".

Files:

• trunk/delaunay/scikits/delaunay/_delaunay.cpp (modified) (3 diffs)
• trunk/delaunay/tests/test_triangulate.py (modified) (2 diffs)

trunk/delaunay/scikits/delaunay/_delaunay.cpp

@@ -127 +127 @@
-    vdg.getNumbers(length, numtri);
-
+    // Count the actual number of edges
+    i = 0;
+    vdg.resetEdgeListIter();
+    while (vdg.getNextDelaunay(tri0, tri0x, tri0y, tri1, tri1x, tri1y, reg0, reg1))
+        i++;
+    length = i;
+
-    dim[0] = length;
-    dim[1] = 2;
@@ -448 +455 @@
-{
-    PyObject *pyx, *pyy, *pyz, *pycenters, *pynodes, *pyneighbors, *pyintx, *pyinty;
-
+
+
-    double defvalue;
-    int size, npoints, ntriangles;
@@ -544 +552 @@
-        (double*)PyArray_DATA(intz), defvalue);
-
-
+
+
+
+
+
+
+
+
-    return intz;
-}

trunk/delaunay/tests/test_triangulate.py

@@ -1 @@
-
+
+
-from numpy import random
-import numpy as np
+
+from scikits import delaunay as dlny
-
-def onright(x0, y0, x1, y1, x, y):
@@ -67 +70 @@
-            good = (r2 <= (alldist2 + 1e-12))
-            assert np.alltrue(good)
+
+
+data = np.array([
+    [-3.14, -3.14], [-3.14, -2.36], [-3.14, -1.57], [-3.14, -0.79], [-3.14, 0.0],
+    [-3.14, 0.79], [-3.14, 1.57], [-3.14, 2.36], [-3.14, 3.14], [-2.36, -3.14],
+    [-2.36, -2.36], [-2.36, -1.57], [-2.36, -0.79], [-2.36, 0.0], [-2.36, 0.79],
+    [-2.36, 1.57], [-2.36, 2.36], [-2.36, 3.14], [-1.57, -0.79], [-1.57, 0.79],
+    [-1.57, -1.57], [-1.57, 0.0], [-1.57, 1.57], [-1.57, -3.14], [-1.57, -2.36],
+    [-1.57, 2.36], [-1.57, 3.14], [-0.79, -1.57], [-0.79, 1.57], [-0.79, -3.14],
+    [-0.79, -2.36], [-0.79, -0.79], [-0.79, 0.0], [-0.79, 0.79], [-0.79, 2.36],
+    [-0.79, 3.14], [0.0, -3.14], [0.0, -2.36], [0.0, -1.57], [0.0, -0.79], 
+    [0.0, 0.0], [0.0, 0.79], [0.0, 1.57], [0.0, 2.36], [0.0, 3.14], 
+    [0.79, -3.14], [0.79, -2.36], [0.79, -0.79], [0.79, 0.0], [0.79, 0.79],
+    [0.79, 2.36], [0.79, 3.14], [0.79, -1.57], [0.79, 1.57], [1.57, -3.14],
+    [1.57, -2.36], [1.57, 2.36], [1.57, 3.14], [1.57, -1.57], [1.57, 0.0],
+    [1.57, 1.57], [1.57, -0.79], [1.57, 0.79], [2.36, -3.14], [2.36, -2.36],
+    [2.36, -1.57], [2.36, -0.79], [2.36, 0.0], [2.36, 0.79], [2.36, 1.57],
+    [2.36, 2.36], [2.36, 3.14], [3.14, -3.14], [3.14, -2.36], [3.14, -1.57],
+    [3.14, -0.79], [3.14, 0.0], [3.14, 0.79], [3.14, 1.57], [3.14, 2.36], 
+    [3.14, 3.14],
+])
+
+class TestRegression(object):
+
+    def test_ticket_376(self):
+        x  = np.array([0, 1, 0, 1], dtype=np.float64)
+        y  = np.array([0, 0, 1, 1], dtype=np.float64)
+        z  = np.array([1, 2, 3, 4], dtype=np.float64)
+
+        tri1 = dlny.Triangulation(x, y)
+        nn1 = tri1.nn_interpolator(z)
+
+        xp = np.r_[x, x]
+        yp = np.r_[y, y]
+        zp = np.r_[z, z]
+
+        # shouldn't fail on duplicate points
+        tri2 = dlny.Triangulation(xp, yp)
+        nn2 = tri2.nn_interpolator(zp)
+
+        assert nn1(0.3, 0.5) == nn2(0.3, 0.5)
+
+    def test_ticket_376_2(self):
+        tri = dlny.Triangulation(data[:,0], data[:,1])
+        # should pass
+
+    def test_ticket_382(self):
+        x, y = np.meshgrid(np.linspace(0,1,4), np.linspace(0,1,3))
+
+        tri = dlny.Triangulation(x.flatten(), y.flatten())
+        refcount1 = sys.getrefcount(tri.x)
+        interp = tri.nn_interpolator(x.flatten())
+        refcount2 = sys.getrefcount(tri.x)
+        interp(x.flatten(), y.flatten())
+        refcount3 = sys.getrefcount(tri.x)
+
+        # shouldn't leak references
+        assert refcount1 == refcount2
+        assert refcount1 == refcount3
+
+if __name__ == '__main__':
+    import nose
+    nose.main()