CLN: Simplify rolling.py helper functions #30672
Merged
Conversation
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
jbrockmendel
reviewed
Jan 4, 2020
| @@ -305,17 +290,6 @@ def _wrap_result(self, result, block=None, obj=None): | |||
|
|
|||
| if isinstance(result, np.ndarray): | |||
|
|
|||
| # coerce if necessary | |||
| if block is not None: | |||
| if is_timedelta64_dtype(block.values.dtype): | |||
There was a problem hiding this comment.
Don't think so. Our test suite includes timedelta64 which doesn't his this branch.
|
Nice cleanup |
jreback
requested changes
Jan 4, 2020
pandas/core/window/common.py
Outdated
| @@ -250,31 +250,10 @@ def _get_center_of_mass(comass, span, halflife, alpha): | |||
| return float(comass) | |||
|
|
|||
|
|
|||
| def _offset(window, center): | |||
| def _calculate_center_offset(window): | |||
There was a problem hiding this comment.
as a followup typing & doc-strings would be great. also ok to de-privatize these
pandas/core/window/rolling.py
Outdated
| def func(arg, window, min_periods=None, closed=None): | ||
| minp = check_minp(min_periods, len(window)) | ||
| return cfunc(arg, window, minp, **kwargs) | ||
| @staticmethod |
There was a problem hiding this comment.
instead of static can you make this a module level function, or is there a reason you want this as static?
WillAyd
approved these changes
Jan 5, 2020
| @@ -336,3 +315,12 @@ def _prep_binary(arg1, arg2): | |||
| Y = arg2 + 0 * arg1 | |||
|
|
|||
| return X, Y | |||
|
|
|||
|
|
|||
| def get_weighted_roll_func(cfunc: Callable) -> Callable: | |||
There was a problem hiding this comment.
Subtypes for Callable would be helpful here if you know from looking at this what they are
jreback
approved these changes
Jan 5, 2020
|
thanks @mroeschke doc-strings and types always welcome |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diffCleans helper functions in
rolling.pyand remove dead code paths.