-
-
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
BUG: Add limit_area to EA ffill/bfill #56616
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
60aa82f
BUG: Add limit_area to EA ffill/bfill
rhshadrach 27b0c57
GH#s
rhshadrach fd44a52
Merge branch 'main' into bug_ffill_limit_area
rhshadrach 2033b59
Merge remote-tracking branch 'upstream/main' into bug_ffill_limit_area
rhshadrach 0f4e400
Better error message; whatsnew
rhshadrach da58e4b
Merge remote-tracking branch 'origin/bug_ffill_limit_area' into bug_f…
rhshadrach 9e53011
fixup
rhshadrach ab863d1
fix typo
rhshadrach 8271d68
Merge remote-tracking branch 'upstream/main' into bug_ffill_limit_area
rhshadrach 09cccb8
Merge branch 'main' into bug_ffill_limit_area
rhshadrach File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -193,7 +193,12 @@ def __getitem__(self, item: PositionalIndexer) -> Self | Any: | |
return self._simple_new(self._data[item], newmask) | ||
|
||
def _pad_or_backfill( | ||
self, *, method: FillnaOptions, limit: int | None = None, copy: bool = True | ||
self, | ||
*, | ||
method: FillnaOptions, | ||
limit: int | None = None, | ||
limit_area: Literal["inside", "outside"] | None = None, | ||
copy: bool = True, | ||
) -> Self: | ||
mask = self._mask | ||
|
||
|
@@ -205,7 +210,21 @@ def _pad_or_backfill( | |
if copy: | ||
npvalues = npvalues.copy() | ||
new_mask = new_mask.copy() | ||
elif limit_area is not None: | ||
mask = mask.copy() | ||
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. Non-blocking, but why do we need this copy here? |
||
func(npvalues, limit=limit, mask=new_mask) | ||
|
||
if limit_area is not None and not mask.all(): | ||
mask = mask.T | ||
neg_mask = ~mask | ||
first = neg_mask.argmax() | ||
last = len(neg_mask) - neg_mask[::-1].argmax() - 1 | ||
if limit_area == "inside": | ||
new_mask[:first] |= mask[:first] | ||
new_mask[last + 1 :] |= mask[last + 1 :] | ||
elif limit_area == "outside": | ||
new_mask[first + 1 : last] |= mask[first + 1 : last] | ||
|
||
if copy: | ||
return self._simple_new(npvalues.T, new_mask.T) | ||
else: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
We only get here if 3rd party authors didn't implement this themselves, correct?
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.
Right - this is only hit when EA author overrides
.fillna
but not._pad_or_backfill
. Currently pandas.ffill
will call the EA's.fillna
in such a case, which can only be correctly done whenlimit_area
is None.