diff options
| author | sasha <sasha@localhost> | 2006-03-06 16:58:35 +0000 |
|---|---|---|
| committer | sasha <sasha@localhost> | 2006-03-06 16:58:35 +0000 |
| commit | 377645d4602e5dde51cba0ab859a66a958750157 (patch) | |
| tree | b83357fadb3dc4e73c216973176b084c188d1103 | |
| parent | 881883965ecc9977b15d861d0f38ab503d46652a (diff) | |
| download | numpy-377645d4602e5dde51cba0ab859a66a958750157.tar.gz | |
removed checks for the mask shape; fixes ticket:19 by timl
| -rw-r--r-- | numpy/core/ma.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/numpy/core/ma.py b/numpy/core/ma.py index e88ad0686..36cf32c90 100644 --- a/numpy/core/ma.py +++ b/numpy/core/ma.py @@ -310,14 +310,6 @@ class masked_unary_operation: if self.domain is not None: m = mask_or(m, self.domain(d1)) result = self.f(d1, *args, **kwargs) - if m is not nomask: - try: - shape = result.shape - except AttributeError: - pass - else: - if m.shape != shape: - m = mask_or(getmaskarray(a), getmaskarray(b)) return masked_array(result, m) def __str__ (self): @@ -360,14 +352,6 @@ class domained_binary_operation: mb = mask_or(mb, t) m = mask_or(ma, mb) result = self.f(d1, d2) - if m is not nomask: - try: - shape = result.shape - except AttributeError: - pass - else: - if m.shape != shape: - m = mask_or(getmaskarray(a), getmaskarray(b)) return masked_array(result, m) def __str__ (self): @@ -391,14 +375,6 @@ class masked_binary_operation: d1 = filled(a, self.fillx) d2 = filled(b, self.filly) result = self.f(d1, d2, *args, **kwargs) - if m is not nomask: - try: - shape = result.shape - except AttributeError: - pass - else: - if m.shape != shape: - m = mask_or(getmaskarray(a), getmaskarray(b)) return masked_array(result, m) def reduce (self, target, axis=0): |