Fixed bug initializing empty data in combined dictionary format

holoviz · May 14, 2018 · 08103fc · 08103fc
1 parent 50fadb1
commit 08103fc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/holoviews/core/data/dictionary.py b/holoviews/core/data/dictionary.py
@@ -89,11 +89,15 @@ def init(cls, eltype, data, kdims, vdims):
             for d, vals in data.items():
                 if isinstance(d, tuple):
                     vals = np.asarray(vals)
-                    if not vals.ndim == 2 and vals.shape[1] == len(d):
+                    if vals.shape == (0,):
+                        for sd in d:
+                            unpacked.append((sd, np.array([])))
+                    elif not vals.ndim == 2 and vals.shape[1] == len(d):
                         raise ValueError("Values for %s dimensions did not have "
                                          "the expected shape.")
-                    for i, sd in enumerate(d):
-                        unpacked.append((sd, vals[:, i]))
+                    else:
+                        for i, sd in enumerate(d):
+                            unpacked.append((sd, vals[:, i]))
                 else:
                     vals = vals if np.isscalar(vals) else np.asarray(vals)
                     if not np.isscalar(vals) and not vals.ndim == 1:

diff --git a/tests/core/data/testdataset.py b/tests/core/data/testdataset.py
@@ -1077,6 +1077,11 @@ def test_dataset_empty_list_init_dtypes(self):
         for d in 'xy':
             self.assertEqual(dataset.dimension_values(d).dtype, np.float64)
 
+    def test_dataset_empty_combined_dimension(self):
+        ds = Dataset({('x', 'y'): []}, kdims=['x', 'y'])
+        ds2 = Dataset({'x': [], 'y': []}, kdims=['x', 'y'])
+        self.assertEqual(ds, ds2)
+
 
 class GridTests(object):
     """