Merge pull request #1278 from ioam/interface_aggregate

Fixes for grid interface aggregation support with spreadfn

holoviews/core/data/xarray.py

@@ -261,7 +261,7 @@ def add_dimension(cls, dataset, dimension, dim_pos, values, vdim):
             raise Exception("Cannot add key dimension to a dense representation.")
         dim = dimension.name if isinstance(dimension, Dimension) else dimension
         arr = xr.DataArray(values, coords=dataset.data.coords, name=dim,
-                           dims=dataset.data.dims)
+                           dims=dataset.data.indexes)
         return dataset.data.assign(**{dim: arr})
 
 

holoviews/element/raster.py

@@ -229,7 +229,7 @@ class Image(Dataset, Raster, SheetCoordinateSystem):
     bounds = param.ClassSelector(class_=BoundingRegion, default=BoundingBox(), doc="""
        The bounding region in sheet coordinates containing the data.""")
 
-    datatype = param.List(default=['image', 'grid', 'xarray', 'dataframe', 'dictionary'])
+    datatype = param.List(default=['image', 'grid', 'xarray', 'cube', 'dataframe', 'dictionary'])
 
     group = param.String(default='Image', constant=True)
 

tests/testimageinterfaces.py

@@ -153,6 +153,15 @@ def test_dataset_reindex_non_constant(self):
                        kdims=['y'], vdims=['z'])
         self.assertEqual(reindexed, data)
 
+    def test_aggregate_with_spreadfn(self):
+        with DatatypeContext([self.datatype, 'columns', 'dataframe'], self.image):
+            agg = self.image.aggregate('x', np.mean, np.std)
+        xs = self.image.dimension_values('x', expanded=False)
+        mean = self.array.mean(axis=0)
+        std = self.array.std(axis=0)
+        self.assertEqual(agg, Curve((xs, mean, std), kdims=['x'],
+                                    vdims=['z', 'z_std']))
+
 
 class ImageGridInterfaceTest(ImageInterfaceTest):
 
@@ -190,6 +199,10 @@ def test_reduce_x_dimension(self):
     def test_reduce_y_dimension(self):
         raise SkipTest("Not supported")
 
+    def test_aggregate_with_spreadfn(self):
+        raise SkipTest("Not supported")
+
+
 
 class RGBInterfaceTest(ComparisonTestCase):