Skip to content

ENH: Addition of input arguments for boundaries to add more consistency between methods #40627

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.

Sign up for GitHub

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

Closed
wants to merge 8 commits into from
Closed

ENH: Addition of input arguments for boundaries to add more consistency between methods #40627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
89259db
if/else changes test
Mar 19, 2021
eda20a1
Series.between changes to inclusive boundaries
Mar 21, 2021
7af55a7
changes to date_range parameters
Mar 24, 2021
85a33cc
Changed series.between error handling to throw value error instead of…
Mar 24, 2021
c87e240
changes to series.between documentation and error message
Mar 24, 2021
cc6b24d
Merge pull request #1 from hewittk/new-boundary-inputs
hewittk Mar 25, 2021
4ebfa59
parameters as either booleans or strings
Mar 25, 2021
438f1ba
Merge pull request #2 from hewittk/new-boundary-inputs
hewittk Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pandas/core/arrays/datetimelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,15 +1830,18 @@ def validate_endpoints(closed):
left_closed = False
right_closed = False

if closed is None:
if closed is None or closed == True or closed == "neither":
left_closed = True
right_closed = True
elif closed == "left":
left_closed = True
elif closed == "right":
right_closed = True
elif closed == "both" or closed == False:
left_closed = False
right_closed = False
else:
raise ValueError("Closed has to be either 'left', 'right' or None")
raise ValueError("Closed has to be either 'left', 'right', 'neither', 'both' or None, or a boolean value")

return left_closed, right_closed

Expand Down
16 changes: 13 additions & 3 deletions pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4684,7 +4684,8 @@ def between(self, left, right, inclusive=True) -> Series:
Left boundary.
right : scalar or list-like
Right boundary.
inclusive : bool, default True
inclusive : str, default "True"

Include boundaries.

Returns
Expand Down Expand Up @@ -4736,12 +4737,21 @@ def between(self, left, right, inclusive=True) -> Series:
3 False
dtype: bool
"""
if inclusive:

if inclusive == True or inclusive == "both":
lmask = self >= left
rmask = self <= right
else:
elif inclusive == "left":
lmask = self >= left
rmask = self < right
elif inclusive == "right":
lmask = self > left
rmask = self <= right
elif inclusive == False or inclusive == "neither":
lmask = self > left
rmask = self < right
else:
raise ValueError("Input should be boolean or string of 'both', 'left', 'right', or 'neither'")

return lmask & rmask

Expand Down