-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
API: BooleanArray any/all with NA logic #30062
Changes from 3 commits
0bf654e
043f257
12d2729
15471d8
6ca6945
e59e91f
24797d4
ec7d072
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -557,6 +557,30 @@ def _values_for_argsort(self) -> np.ndarray: | |
data[self._mask] = -1 | ||
return data | ||
|
||
def any(self, skipna=True): | ||
# nv.validate_any((), dict(out=out, keepdims=keepdims)) | ||
valid_values = self._data[~self._mask] | ||
if skipna: | ||
return valid_values.any() | ||
else: | ||
result = valid_values.any() | ||
if result or len(self) == 0: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use not len(self) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In pandas/core, we actually use the (the typical pythonic idiom recommendation is about doing |
||
return result | ||
else: | ||
return self.dtype.na_value | ||
|
||
def all(self, skipna=True): | ||
# nv.validate_any((), dict(out=out, keepdims=keepdims)) | ||
valid_values = self._data[~self._mask] | ||
if skipna: | ||
return valid_values.all() | ||
else: | ||
result = valid_values.all() | ||
if not result or len(self) == 0: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above |
||
return result | ||
else: | ||
return self.dtype.na_value | ||
|
||
@classmethod | ||
def _create_logical_method(cls, op): | ||
def logical_method(self, other): | ||
|
@@ -646,6 +670,10 @@ def cmp_method(self, other): | |
return set_function_name(cmp_method, name, cls) | ||
|
||
def _reduce(self, name, skipna=True, **kwargs): | ||
|
||
if name in {"any", "all"}: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we usually use lists for these checks There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In this file we actually use more There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Heh, I'm probably to blame for the sets :) I like them more for membership tests, though it doesn't matter for small sets. |
||
return getattr(self, name)(skipna=skipna, **kwargs) | ||
|
||
data = self._data | ||
mask = self._mask | ||
|
||
|
@@ -657,12 +685,8 @@ def _reduce(self, name, skipna=True, **kwargs): | |
op = getattr(nanops, "nan" + name) | ||
result = op(data, axis=0, skipna=skipna, mask=mask, **kwargs) | ||
|
||
# if we have a boolean op, don't coerce | ||
if name in ["any", "all"]: | ||
pass | ||
|
||
# if we have numeric op that would result in an int, coerce to int if possible | ||
elif name in ["sum", "prod"] and notna(result): | ||
if name in ["sum", "prod"] and notna(result): | ||
int_result = np.int64(result) | ||
if int_result == result: | ||
result = int_result | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What happens with
np.any
with this? Do we need any keywords for compatibility?Is the expected behavior here different from
nanops.nanany
? /nanops.nanall
?