Skip to content

Commit

Permalink
[#157326121]: Fix after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
slobodan-ilic committed May 21, 2018
1 parent 2b5850c commit 0473e4b
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions src/cr/cube/crunch_cube.py
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ def _mr_props_as_0th(self, axis, table, hs_dims, prune):
include_transforms_for_dims=hs_dims
)
else:
den = self.margin(axis=axis)[:, np.newaxis]
den = self._margin(axis=axis)[:, np.newaxis]
return num / den

def _mr_props_as_1st(self, axis, table, hs_dims, prune):
Expand Down Expand Up @@ -780,11 +780,7 @@ def _mr_proportions(self, axis, weighted, prune, hs_dims=None):
if self.ndim == 1:
return self._mr_props_single_dim(table, valid_indices, prune)

hs_dims = (
include_transforms_for_dims
if include_transforms_for_dims else
self.hs_dims
)
hs_dims = hs_dims if hs_dims else self.hs_dims

if self.mr_dim_ind == 0:
return self._mr_props_as_0th(axis, table, hs_dims, prune)
Expand Down

0 comments on commit 0473e4b

Please sign in to comment.