summaryrefslogtreecommitdiff
path: root/numpy/core/ma.py
diff options
context:
space:
mode:
authorsasha <sasha@localhost>2006-04-07 04:08:44 +0000
committersasha <sasha@localhost>2006-04-07 04:08:44 +0000
commit18c2a959e5ef86a576cc13470ac845174b57a39c (patch)
treeef22812153e10b26467a83b2c3448b46ff7d721e /numpy/core/ma.py
parentb6427785d14ee282c6e4251771f8a48283a0ecaf (diff)
downloadnumpy-18c2a959e5ef86a576cc13470ac845174b57a39c.tar.gz
fixed mask calculation in cum* methods
Diffstat (limited to 'numpy/core/ma.py')
-rw-r--r--numpy/core/ma.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/ma.py b/numpy/core/ma.py
index 772feaa23..74fa08ac3 100644
--- a/numpy/core/ma.py
+++ b/numpy/core/ma.py
@@ -2155,14 +2155,14 @@ array.copy = _m(not_implemented)
def _cumprod(self, axis=0, dtype=None):
m = self.mask
if m is not nomask:
- m = umath.logical_and.accumulate(self.mask, axis)
+ m = umath.logical_or.accumulate(self.mask, axis)
return MaskedArray(data = self.filled(1).cumprod(axis, dtype), mask=m)
array.cumprod = _m(_cumprod)
def _cumsum(self, axis=0, dtype=None):
m = self.mask
if m is not nomask:
- m = umath.logical_and.accumulate(self.mask, axis)
+ m = umath.logical_or.accumulate(self.mask, axis)
return MaskedArray(data=self.filled(0).cumsum(axis, dtype), mask=m)
array.cumsum = _m(_cumsum)