Skip to content

ENH pandas-dev#60693: shift operations for Series and DataFrames #61540

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Other enhancements
- Add ``"delete_rows"`` option to ``if_exists`` argument in :meth:`DataFrame.to_sql` deleting all records of the table before inserting data (:issue:`37210`).
- Added half-year offset classes :class:`HalfYearBegin`, :class:`HalfYearEnd`, :class:`BHalfYearBegin` and :class:`BHalfYearEnd` (:issue:`60928`)
- Errors occurring during SQL I/O will now throw a generic :class:`.DatabaseError` instead of the raw Exception type from the underlying driver manager library (:issue:`60748`)
- Implemented :meth:`Series.rshift`, :meth:`Series.lshift`, :meth:`DataFrame.rshift` and :meth:`DataFrame.lshift` for bitwise right and left shift operations (:issue:`60693`)
- Implemented :meth:`Series.str.isascii` and :meth:`Series.str.isascii` (:issue:`59091`)
- Improved deprecation message for offset aliases (:issue:`60820`)
- Multiplying two :class:`DateOffset` objects will now raise a ``TypeError`` instead of a ``RecursionError`` (:issue:`59442`)
Expand Down
16 changes: 16 additions & 0 deletions pandas/core/arraylike.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,22 @@ def __pow__(self, other):
def __rpow__(self, other):
return self._arith_method(other, roperator.rpow)

@unpack_zerodim_and_defer("__rshift__")
def __rshift__(self, other):
return self._arith_method(other, operator.rshift)

@unpack_zerodim_and_defer("__rrshift__")
def __rrshift__(self, other):
return self._arith_method(other, roperator.rrshift)

@unpack_zerodim_and_defer("__lshift__")
def __lshift__(self, other):
return self._arith_method(other, operator.lshift)

@unpack_zerodim_and_defer("__rlshift__")
def __rlshift__(self, other):
return self._arith_method(other, roperator.rlshift)


# -----------------------------------------------------------------------------
# Helpers to implement __array_ufunc__
Expand Down
4 changes: 4 additions & 0 deletions pandas/core/computation/expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ def _evaluate_numexpr(op, op_str, left_op, right_op):
roperator.rmod: None,
operator.pow: "**",
roperator.rpow: "**",
operator.rshift: None,
roperator.rrshift: None,
operator.lshift: None,
roperator.rlshift: None,
operator.eq: "==",
operator.ne: "!=",
operator.le: "<=",
Expand Down
32 changes: 32 additions & 0 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -8454,6 +8454,38 @@ def rpow(
other, roperator.rpow, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("rshift", "dataframe"))
def rshift(
self, other, axis: Axis = "columns", level=None, fill_value=None
) -> DataFrame:
return self._flex_arith_method(
other, operator.rshift, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("rrshift", "dataframe"))
def rrshift(
self, other, axis: Axis = "columns", level=None, fill_value=None
) -> DataFrame:
return self._flex_arith_method(
other, roperator.rrshift, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("lshift", "dataframe"))
def lshift(
self, other, axis: Axis = "columns", level=None, fill_value=None
) -> DataFrame:
return self._flex_arith_method(
other, operator.lshift, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("rlshift", "dataframe"))
def rlshift(
self, other, axis: Axis = "columns", level=None, fill_value=None
) -> DataFrame:
return self._flex_arith_method(
other, roperator.rlshift, level=level, fill_value=fill_value, axis=axis
)

# ----------------------------------------------------------------------
# Combination-Related

Expand Down
10 changes: 10 additions & 0 deletions pandas/core/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -11705,6 +11705,16 @@ def __ixor__(self, other) -> Self:
# error: Unsupported left operand type for ^ ("Type[NDFrame]")
return self._inplace_method(other, type(self).__xor__) # type: ignore[operator]

@final
def __irshift__(self, other) -> Self:
# error: Unsupported left operand type for >> ("Type[NDFrame]")
return self._inplace_method(other, type(self).__rshift__) # type: ignore[operator]

@final
def __ilshift__(self, other) -> Self:
# error: Unsupported left operand type for << ("Type[NDFrame]")
return self._inplace_method(other, type(self).__lshift__) # type: ignore[operator]

# ----------------------------------------------------------------------
# Misc methods

Expand Down
2 changes: 2 additions & 0 deletions pandas/core/ops/array_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,8 @@ def get_array_op(op):
"mod",
"divmod",
"pow",
"shift",
"lshift",
}:
return partial(arithmetic_op, op=op)
else:
Expand Down
39 changes: 39 additions & 0 deletions pandas/core/ops/docstrings.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,31 @@ def make_flex_doc(op_name: str, typ: str) -> str:
"""
)

_rshift_example_SERIES = (
_common_examples_algebra_SERIES
+ """
>>> a.rshift(1, fill_value=0)
a 0.0
b 0.0
c 0.0
d NaN
dtype: float64
"""
)

_lshift_example_SERIES = (
_common_examples_algebra_SERIES
+ """
>>> a.rshift(1, fill_value=0)
a 2.0
b 2.0
c 2.0
d NaN
dtype: float64
"""
)


_ne_example_SERIES = (
_common_examples_algebra_SERIES
+ """
Expand Down Expand Up @@ -365,6 +390,20 @@ def make_flex_doc(op_name: str, typ: str) -> str:
"series_returns": _returns_tuple,
"df_examples": None,
},
"rshift": {
"op": ">>",
"desc": "Bitwise right shift",
"reverse": "rrshift",
"series_examples": _rshift_example_SERIES,
"series_returns": _returns_series,
},
"lshift": {
"op": "<<",
"desc": "Bitwise left shift",
"reverse": "rlshift",
"series_examples": _lshift_example_SERIES,
"series_returns": _returns_series,
},
# Comparison Operators
"eq": {
"op": "==",
Expand Down
8 changes: 8 additions & 0 deletions pandas/core/roperator.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,11 @@ def ror_(left, right):

def rxor(left, right):
return operator.xor(right, left)


def rrshift(left, right):
return operator.rshift(right, left)


def rlshift(left, right):
return operator.lshift(right, left)
24 changes: 24 additions & 0 deletions pandas/core/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -6578,6 +6578,30 @@ def rdivmod(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
other, roperator.rdivmod, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("rshift", "series"))
def rshift(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
return self._flex_method(
other, operator.rshift, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("rrshift", "series"))
def rrshift(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
return self._flex_method(
other, roperator.rrshift, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("lshift", "series"))
def lshift(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
return self._flex_method(
other, operator.lshift, level=level, fill_value=fill_value, axis=axis
)

@Appender(ops.make_flex_doc("rlshift", "series"))
def rlshift(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
return self._flex_method(
other, roperator.rlshift, level=level, fill_value=fill_value, axis=axis
)

# ----------------------------------------------------------------------
# Reductions

Expand Down
96 changes: 96 additions & 0 deletions pandas/tests/frame/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -2199,3 +2199,99 @@ def test_mixed_col_index_dtype(using_infer_string):
dtype = "string"
expected.columns = expected.columns.astype(dtype)
tm.assert_frame_equal(result, expected)


def test_dataframe_rshift():
df = DataFrame({"a": [8, 16], "b": [32, 64]})
result = df >> 2
expected = DataFrame({"a": [2, 4], "b": [8, 16]})

tm.assert_frame_equal(result, expected)


def test_dataframe_rshift_negative():
df = DataFrame({"a": [8, 16], "b": [32, 64]})
result = df >> -1
expected = DataFrame({"a": [0, 0], "b": [0, 0]})

tm.assert_frame_equal(result, expected)


def test_dataframe_rshift_zero():
df = DataFrame({"a": [8, 16], "b": [32, 64]})
result = df >> 0

tm.assert_frame_equal(result, df)


def test_dataframe_lshift():
df = DataFrame({"a": [1, 2], "b": [4, 8]})
result = df << 2
expected = DataFrame({"a": [4, 8], "b": [16, 32]})

tm.assert_frame_equal(result, expected)


def test_dataframe_lshift_negative():
df = DataFrame({"a": [8, 16], "b": [32, 64]})
result = df << -1
expected = DataFrame({"a": [0, 0], "b": [0, 0]})

tm.assert_frame_equal(result, expected)


def test_dataframe_lshift_zero():
df = DataFrame({"a": [8, 16], "b": [32, 64]})
result = df << 0

tm.assert_frame_equal(result, df)


def test_dataframe_rrshift():
df = DataFrame({"a": [1, 2], "b": [3, 4]})
result = operator.rshift(64, df)
expected = DataFrame({"a": [32, 16], "b": [8, 4]})

tm.assert_frame_equal(result, expected)


def test_dataframe_rlshift():
df = DataFrame({"a": [1, 2], "b": [3, 4]})
result = operator.lshift(1, df)
expected = DataFrame({"a": [2, 4], "b": [8, 16]})

tm.assert_frame_equal(result, expected)


def test_dataframe_irshift():
df = DataFrame({"a": [8, 16], "b": [32, 64]})
df >>= 2
expected = DataFrame({"a": [2, 4], "b": [8, 16]})

tm.assert_frame_equal(df, expected)


def test_dataframe_ilshift():
df = DataFrame({"a": [1, 2], "b": [4, 8]})
df <<= 2
expected = DataFrame({"a": [4, 8], "b": [16, 32]})

tm.assert_frame_equal(df, expected)


def test_dataframe_rshift_dataframe():
df1 = DataFrame({"a": [8, 4], "b": [2, 1]})
df2 = DataFrame({"a": [3, 2], "b": [1, 0]})
result = df1 >> df2
expected = DataFrame({"a": [1, 1], "b": [1, 1]})

tm.assert_frame_equal(result, expected)


def test_dataframe_lshift_dataframe():
df1 = DataFrame({"a": [1, 2], "b": [4, 8]})
df2 = DataFrame({"a": [3, 2], "b": [1, 0]})
result = df1 << df2
expected = DataFrame({"a": [8, 8], "b": [8, 8]})

tm.assert_frame_equal(result, expected)
Loading
Loading