summaryrefslogtreecommitdiff
path: root/numpy/core/ma.py
diff options
context:
space:
mode:
authorsasha <sasha@localhost>2006-01-26 20:43:33 +0000
committersasha <sasha@localhost>2006-01-26 20:43:33 +0000
commit434501d7248bf5c53aa0ab8df3bfea81ca95f198 (patch)
tree0125231c3d11f1c26d54b0c45fc7dbcba8f95c92 /numpy/core/ma.py
parent656b8ba14074b62b0560748324fd66186410e396 (diff)
downloadnumpy-434501d7248bf5c53aa0ab8df3bfea81ca95f198.tar.gz
fixed alltrue and sometrue
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 9be9aee1e..26c8962be 100644
--- a/numpy/core/ma.py
+++ b/numpy/core/ma.py
@@ -466,8 +466,6 @@ nonzero = masked_unary_operation(oldnumeric.nonzero)
around = masked_unary_operation(oldnumeric.round_)
floor = masked_unary_operation(umath.floor)
ceil = masked_unary_operation(umath.ceil)
-sometrue = masked_unary_operation(oldnumeric.sometrue)
-alltrue = masked_unary_operation(oldnumeric.alltrue, 1)
logical_not = masked_unary_operation(umath.logical_not)
add = masked_binary_operation(umath.add)
@@ -495,7 +493,9 @@ less.reduce = None
greater = masked_binary_operation(umath.greater)
greater.reduce = None
logical_and = masked_binary_operation(umath.logical_and)
+alltrue = masked_binary_operation(umath.logical_and, 1, 1).reduce
logical_or = masked_binary_operation(umath.logical_or)
+sometrue = logical_or.reduce
logical_xor = masked_binary_operation(umath.logical_xor)
bitwise_and = masked_binary_operation(umath.bitwise_and)
bitwise_or = masked_binary_operation(umath.bitwise_or)