Added unit tests for datashading QuadMesh

holoviz · Dec 20, 2017 · 7aabc20 · 7aabc20
1 parent 36a2ec4
commit 7aabc20
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git a/tests/testdatashader.py b/tests/testdatashader.py
@@ -2,12 +2,13 @@
 from nose.plugins.attrib import attr
 
 import numpy as np
-from holoviews import Curve, Points, Image, Dataset, RGB, Path, Graph
+from holoviews import Curve, Points, Image, Dataset, RGB, Path, Graph, TriMesh, QuadMesh
 from holoviews.element.comparison import ComparisonTestCase
 
 try:
+    import datashader as ds
     from holoviews.operation.datashader import (
-        aggregate, regrid, ds_version, stack, directly_connect_edges
+        aggregate, regrid, ds_version, stack, directly_connect_edges, rasterize
     )
 except:
     ds_version = None
@@ -150,6 +151,32 @@ def test_regrid_disabled_expand(self):
         self.assertEqual(regridded, img)
 
 
+@attr(optional=1)
+class DatashaderRasterizeTests(ComparisonTestCase):
+    """
+    Tests for datashader aggregation
+    """
+
+    def setUp(self):
+        if ds_version is None or ds_version <= '0.6.4':
+            raise SkipTest('Regridding operations require datashader>=0.7.0')
+
+    def test_rasterize_trimesh(self):
+        simplices = [(0, 1, 2, 0.5), (3, 2, 1, 1.5)]
+        vertices = [(0., 0.), (0., 1.), (1., 0), (1, 1)]
+        trimesh = TriMesh((simplices, vertices), vdims=['z'])
+        img = rasterize(trimesh, width=3, height=3, dynamic=False, aggregator=ds.mean('z'))
+        image = Image(np.array([[1.5, 1.5, np.NaN], [0.5, 1.5, np.NaN], [np.NaN, np.NaN, np.NaN]]),
+                      bounds=(0, 0, 1, 1))
+        self.assertEqual(img, image)
+
+    def test_rasterize_quadmesh(self):
+        qmesh = QuadMesh(([0, 1], [0, 1], np.array([[0, 1], [2, 3]])))
+        img = rasterize(qmesh, width=3, height=3, dynamic=False, aggregator=ds.mean('z'))
+        image = Image(np.array([[2., 3., np.NaN], [0, 1, np.NaN], [np.NaN, np.NaN, np.NaN]]),
+                      bounds=(-.5, -.5, 1.5, 1.5))
+        self.assertEqual(img, image)
+
 
 @attr(optional=1)
 class DatashaderStackTests(ComparisonTestCase):

diff --git a/tests/testraster.py b/tests/testraster.py
@@ -3,7 +3,7 @@
 """
 
 import numpy as np
-from holoviews.element import Raster, Image, Curve, QuadMesh
+from holoviews.element import Raster, Image, Curve, QuadMesh, TriMesh
 from holoviews.element.comparison import ComparisonTestCase
 
 class TestRaster(ComparisonTestCase):
@@ -75,3 +75,19 @@ def test_cast_image_to_quadmesh(self):
         self.assertEqual(qmesh.group, img.group)
         self.assertEqual(qmesh.label, img.label)
 
+    def test_quadmesh_to_trimesh(self):
+        qmesh = QuadMesh(([0, 1], [0, 1], np.array([[0, 1], [2, 3]])))
+        trimesh = qmesh.trimesh()
+        simplices = np.array([[0, 1, 3, 0],
+                              [1, 2, 4, 2],
+                              [3, 4, 6, 1],
+                              [4, 5, 7, 3],
+                              [4, 3, 1, 0],
+                              [5, 4, 2, 2],
+                              [7, 6, 4, 1],
+                              [8, 7, 5, 3]])
+        vertices = np.array([(-0.5, -0.5), (-0.5, 0.5), (-0.5, 1.5),
+                             (0.5, -0.5), (0.5, 0.5), (0.5, 1.5),
+                             (1.5, -0.5), (1.5, 0.5), (1.5, 1.5)])
+        self.assertEqual(trimesh.array(), simplices)
+        self.assertEqual(trimesh.nodes.array([0, 1]), vertices)