Changeset 744 for trunk/delaunay/tests

Timestamp:

01/16/08 23:52:16 (4 years ago)

Author:

rkern

Message:

Use numpy instead of scipy

Files:

• trunk/delaunay/tests/test_triangulate.py (modified) (4 diffs)

trunk/delaunay/tests/test_triangulate.py

@@ -1 +1 @@
 from scikits import delaunay as dlny
 from numpy import random
-import scipy as sp
+import numpy as np
 
 def onright(x0, y0, x1, y1, x, y):
@@ -13 +13 @@
     with radius r.
     """
-    r2 = sp.hypot(x-cx, y-cy)
+    r2 = np.hypot(x-cx, y-cy)
     assert r2 < r
 
@@ -32 +32 @@
             assert tri.edge_db.shape == (nedges, 2)
             assert tri.circumcenters.shape == (ntriangles, 2)
-            assert sp.sum((tri.triangle_neighbors == -1).astype(sp.int32).flat) == k
+            assert np.sum((tri.triangle_neighbors == -1).astype(np.int32).flat) == k
 
     def test_ccw_triangles(self):
@@ -63 +63 @@
             r2 = ((x[i] - tri.circumcenters[:,0])**2
                 + (y[i] - tri.circumcenters[:,1])**2)
-            alldist2 = (sp.subtract.outer(x, tri.circumcenters[:,0])**2
-                      + sp.subtract.outer(y, tri.circumcenters[:,1])**2)
+            alldist2 = (np.subtract.outer(x, tri.circumcenters[:,0])**2
+                      + np.subtract.outer(y, tri.circumcenters[:,1])**2)
             good = (r2 <= (alldist2 + 1e-12))
-            assert sp.alltrue(good)
+            assert np.alltrue(good)