Add convex hull tests

jni · Jul 6, 2015 · f2e89e9 · f2e89e9
1 parent 1275a1f
commit f2e89e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/gala/features/convex_hull.py b/gala/features/convex_hull.py
@@ -35,7 +35,7 @@ def convex_hull_ind(self, g, n1, n2=None):
         else:
             m.ravel()[list(g.extent(n1))] = 1
         m = m - nd.binary_erosion(m) #Only need border
-        ind = np.np.array(np.nonzero(m)).T
+        ind = np.array(np.nonzero(m)).T
         return ind
 
 

diff --git a/tests/test_features.py b/tests/test_features.py
@@ -114,6 +114,17 @@ def test_2channel_composite_feature():
                     'toy-data/test-04-composite-2channel-12-13.pck'), 2)
 
 
+def test_convex_hull():
+    ws = np.array([[1, 2, 2],
+                   [1, 1, 2],
+                   [1, 2, 2]], dtype=np.uint8)
+    chull = features.convex_hull.Manager()
+    g = agglo.Rag(ws, feature_manager=chull)
+    expected = np.array([0.5, 0.125, 0.5, 0.1, 1., 0.167, 0.025, 0.069,
+                         0.44, 0.056, 1.25, 1.5, 1.2, 0.667])
+    assert_allclose(chull(g, 1, 2), expected, atol=0.01, rtol=1.)
+
+
 if __name__ == '__main__':
     from numpy import testing
     testing.run_module_suite()