Updating Delaunay tests

Author: jgostick

example.py

@@ -4,8 +4,10 @@
 import matplotlib.pyplot as plt
 op.visualization.set_mpl_style()
 ws = op.Workspace()
+ws.settings['default_solver'] = 'ScipySpsolve'
 ws.clear()
 
+
 pn = op.network.Cubic(shape=[25, 25, 1], spacing=1e-4)
 
 # Create domain

openpnm/_skgraph/generators/tools/_funcs.py

@@ -34,6 +34,9 @@ def parse_points(shape, points, reflect=False):
         if points.shape[1] == 2:
             zeros = np.atleast_2d(np.zeros_like(points[:, 0])).T
             points = np.hstack((points, zeros))
+        # Ensure z-axis is all 0's if shape ends in 0 (ie. square or disk)
+        if shape[-1] == 0:
+            points[:, -1] = 0.0
     return points
 
 

tests/unit/network/DelaunayGabrielTest.py

@@ -0,0 +1,67 @@
+import numpy as np
+import openpnm as op
+
+
+class DelaunayGabrielTest:
+    def setup_class(self):
+        pass
+
+    def teardown_class(self):
+        pass
+
+    def test_delaunay_square_with_2D_points(self):
+        np.random.seed(0)
+        pts = np.random.rand(50, 2)
+        tri = op.network.Delaunay(points=pts, shape=[1, 1, 0])
+        assert tri.coords.shape == (50, 3)
+        assert np.all(tri.coords[:, :2] == pts)
+
+    def test_delaunay_square_with_3D_points(self):
+        np.random.seed(0)
+        pts = np.random.rand(50, 3)
+        tri = op.network.Delaunay(points=pts, shape=[1, 1, 0])
+        assert tri.coords.shape == (50, 3)
+        assert np.all(tri.coords[:, :2] == pts[:, :2])
+        assert np.all(tri.coords[:, -1] != pts[:, -1])
+        assert np.all(tri.coords[:, -1] == 0.0)
+
+    def test_delaunay_cube_with_points(self):
+        np.random.seed(0)
+        pts = np.random.rand(50, 3)
+        tri = op.network.Delaunay(points=pts, shape=[1, 1, 1])
+        assert tri.coords.shape == (50, 3)
+        assert np.all(tri.coords == pts)
+
+    def test_delaunay_disk_with_2D_points(self):
+        np.random.seed(0)
+        pts = np.random.rand(50, 2)
+        tri = op.network.Delaunay(points=pts, shape=[1, 0])
+        assert tri.coords.shape == (50, 3)
+        assert np.all(tri.coords[:, :2] == pts[:, :2])
+        assert np.all(tri.coords[:, -1] != pts[:, -1])
+        assert np.all(tri.coords[:, -1] == 0.0)
+
+    def test_delaunay_disk_with_3D_points(self):
+        np.random.seed(0)
+        pts = np.random.rand(50, 3)
+        tri = op.network.Delaunay(points=pts, shape=[1, 1])
+        assert tri.coords.shape == (50, 3)
+        assert np.all(tri.coords == pts)
+
+    def test_delaunay_cylinder_with_points(self):
+        np.random.seed(0)
+        pts = np.random.rand(50, 3)
+        tri = op.network.Delaunay(points=pts, shape=[1, 1])
+        assert tri.coords.shape == (50, 3)
+        assert np.all(tri.coords == pts)
+
+
+if __name__ == '__main__':
+
+    t = DelaunayGabrielTest()
+    t.setup_class()
+    self = t
+    for item in t.__dir__():
+        if item.startswith('test'):
+            print('running test: '+item)
+            t.__getattribute__(item)()