diff options
author | Mark Wiebe <mwwiebe@gmail.com> | 2011-08-25 21:47:27 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-27 07:27:01 -0600 |
commit | cc326304a60c35d38dc29adf2544a29d6dcedfee (patch) | |
tree | 2dfe5b1d41bff282e76286558651b9f784ec3528 /numpy/core/fromnumeric.py | |
parent | a43d255dbc243ea7910e1b92ba83704e1a880c70 (diff) | |
download | numpy-cc326304a60c35d38dc29adf2544a29d6dcedfee.tar.gz |
ENH: missingdata: Make numpy.all follow the NA && False == False rule
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r-- | numpy/core/fromnumeric.py | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index f374951c9..8e7a556ac 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1514,8 +1514,12 @@ def sometrue(a, axis=None, out=None, skipna=False, keepdims=False): any : equivalent function """ - return um.logical_or.reduce(a, axis=axis, out=out, skipna=skipna, keepdims=keepdims) + arr = asanyarray(a) + try: + return arr.any(axis=axis, out=out, skipna=skipna, keepdims=keepdims) + except TypeError: + return arr.any(axis=axis, out=out) def alltrue (a, axis=None, out=None, skipna=False, keepdims=False): """ @@ -1526,7 +1530,12 @@ def alltrue (a, axis=None, out=None, skipna=False, keepdims=False): numpy.all : Equivalent function; see for details. """ - return um.logical_and.reduce(a, axis=axis, out=out, skipna=skipna, keepdims=keepdims) + arr = asanyarray(a) + + try: + return arr.all(axis=axis, out=out, skipna=skipna, keepdims=keepdims) + except TypeError: + return arr.all(axis=axis, out=out) def any(a, axis=None, out=None, skipna=False, keepdims=False): """ @@ -1604,8 +1613,12 @@ def any(a, axis=None, out=None, skipna=False, keepdims=False): (191614240, 191614240) """ - return _methods._any(a, axis=axis, out=out, - skipna=skipna, keepdims=keepdims) + arr = asanyarray(a) + + try: + return arr.any(axis=axis, out=out, skipna=skipna, keepdims=keepdims) + except TypeError: + return arr.any(axis=axis, out=out) def all(a, axis=None, out=None, skipna=False, keepdims=False): """ @@ -1676,8 +1689,12 @@ def all(a, axis=None, out=None, skipna=False, keepdims=False): (28293632, 28293632, array([ True], dtype=bool)) """ - return _methods._all(a, axis=axis, out=out, - skipna=skipna, keepdims=keepdims) + arr = asanyarray(a) + + try: + return arr.all(axis=axis, out=out, skipna=skipna, keepdims=keepdims) + except TypeError: + return arr.all(axis=axis, out=out) def cumsum (a, axis=None, dtype=None, out=None): """ |