feat: Implement Six New Series Methods #23
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -87,13 +87,113 @@ def __add__(self, other) -> Series: | |
|
|
||
| def __radd__(self, other) -> Series: | ||
| return Series(getattr(other, "_data", other) + self._data) | ||
|
|
||
| def __sub__(self, other) -> Series: | ||
| return Series(self._data - getattr(other, "_data", other)) | ||
|
|
||
| def __rsub__(self, other) -> Series: | ||
| return Series(getattr(other, "_data", other) - self._data) | ||
|
|
||
| def __mul__(self, other) -> Series: | ||
| return Series(self._data * getattr(other, "_data", other)) | ||
|
|
||
| def __rmul__(self, other) -> Series: | ||
| return Series(getattr(other, "_data", other) * self._data) | ||
|
|
||
| def __truediv__(self, other) -> Series: | ||
| return Series(self._data / getattr(other, "_data", other)) | ||
|
|
||
| def __rtruediv__(self, other) -> Series: | ||
| return Series(getattr(other, "_data", other) / self._data) | ||
|
|
||
| def __floordiv__(self, other) -> Series: | ||
| return Series(self._data // getattr(other, "_data", other)) | ||
|
|
||
| def __rfloordiv__(self, other) -> Series: | ||
| return Series(getattr(other, "_data", other) // self._data) | ||
|
|
||
| def __mod__(self, other) -> Series: | ||
| return Series(self._data % getattr(other, "_data", other)) | ||
|
|
||
| def __rmod__(self, other) -> Series: | ||
| return Series(getattr(other, "_data", other) % self._data) | ||
|
|
||
| other_data = getattr(other, "_data", other) | ||
| result = self._data**other_data | ||
|
|
||
| is_self_int = self._data.type().is_integer() | ||
| is_other_int = False | ||
| if isinstance(other_data, ibis_types.Column): | ||
| is_other_int = other_data.type().is_integer() | ||
| elif isinstance(other_data, int): | ||
| is_other_int = True | ||
|
|
||
| if is_self_int and is_other_int: | ||
| return Series(result.cast("int64")) | ||
| return Series(result) | ||
|
|
||
| def __pow__(self, other): | ||
| other_data = getattr(other, "_data", other) | ||
| result = self._data**other_data | ||
|
|
||
| is_self_int = self._data.type().is_integer() | ||
| is_other_int = False | ||
| if isinstance(other_data, ibis_types.Column): | ||
| is_other_int = other_data.type().is_integer() | ||
| elif isinstance(other_data, int): | ||
| is_other_int = True | ||
|
|
||
| if is_self_int and is_other_int: | ||
| return Series(result.cast("int64")) | ||
| return Series(result) | ||
|
|
||
| def __rpow__(self, other): | ||
| other_data = getattr(other, "_data", other) | ||
| result = other_data**self._data | ||
|
|
||
| is_self_int = self._data.type().is_integer() | ||
| is_other_int = False | ||
| if isinstance(other_data, ibis_types.Column): | ||
| is_other_int = other_data.type().is_integer() | ||
| elif isinstance(other_data, int): | ||
| is_other_int = True | ||
|
|
||
| if is_self_int and is_other_int: | ||
| return Series(result.cast("int64")) | ||
| return Series(result) | ||
|
Comment on lines
+135
to
+163
Collaborator
There was a problem hiding this comment. @google-labs-jules likewise, pow and rpow could use further explanation in comments |
||
|
|
||
| def add(self, other) -> "Series": | ||
| """Return the addition of the Series and the other.""" | ||
| return self + other | ||
|
|
||
| def sub(self, other) -> "Series": | ||
| """Return the subtraction of the Series and the other.""" | ||
| return self - other | ||
|
|
||
| def mul(self, other) -> "Series": | ||
| """Return the multiplication of the Series and the other.""" | ||
| return self * other | ||
|
|
||
| def div(self, other) -> "Series": | ||
| """Return the true division of the Series and the other.""" | ||
| return self / other | ||
|
|
||
| def truediv(self, other) -> "Series": | ||
| """Return the true division of the Series and the other.""" | ||
| return self / other | ||
|
|
||
| def floordiv(self, other) -> "Series": | ||
| """Return the floor division of the Series and the other.""" | ||
| return self // other | ||
|
|
||
| def mod(self, other) -> "Series": | ||
| """Return the modulo of the Series and the other.""" | ||
| return self % other | ||
|
|
||
| def pow(self, other) -> "Series": | ||
| """Return the power of the Series and the other.""" | ||
| return self**other | ||
|
|
||
| def __lt__(self, other) -> Series: | ||
| return Series(self._data < getattr(other, "_data", other)) | ||
|
|
||
|
|
||
This file contains hidden or 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 hidden or 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
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.
@google-labs-jules please explain in some comments the logic of rmod. I'm having trouble understanding it at a glance.
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.
I've added comments to all the reverse binary operators to clarify their purpose. I also noticed some stray code in
__rmod__and a duplicate__pow__definition, which I've now fixed. Thanks for catching that!