Merge branch 'subtotals-missing-on-3d-cube-with-mr-as-col-dim-1572814…

…79' into rel-5.1.108
Crunch-io · May 3, 2018 · 4293fc1 · 4293fc1
2 parents a7f641f + c9e6421
commit 4293fc1
Show file tree

Hide file tree

Showing 4 changed files with 1,715 additions and 1 deletion.
diff --git a/src/cr/cube/crunch_cube.py b/src/cr/cube/crunch_cube.py
@@ -714,7 +714,9 @@ def _mr_proportions(self, axis, weighted, prune,
                 if axis == 1 else
                 self.margin(axis=0)
             )
-            return self.as_array() / margin
+            return self.as_array(
+                include_transforms_for_dims=include_transforms_for_dims
+            ) / margin
 
         return self._transform(res, include_transforms_for_dims, valid_indices)
 

diff --git a/tests/integration/fixtures/__init__.py b/tests/integration/fixtures/__init__.py
@@ -100,6 +100,7 @@ def _load(cube_file):
 CA_SUBVAR_X_CAT_HS = _load('ca-subvar-x-cat-hs.json')
 CAT_X_MR_X_MR = _load('cat-x-mr-x-mr.json')
 CAT_X_MR_X_MR_PRUNED_ROWS = _load('cat-x-mr-x-mr-pruned-rows.json')
+CAT_X_MR_WEIGHTED_HS = _load('cat-x-mr-weighted-hs.json')
 FRUIT_X_PETS_ARRAY_SUBVARS_FIRST = _load(
     'fruit-x-pets-array-subvars-first.json'
 )