-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
BUG: Rolling apply on DataFrame with Datetime index returns NaN #17156
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
3882c39
Update window.pyx
FXocena 97adfd9
fix roll_generic in window.pyx
FXocena 0a7db15
fix roll_generic in window.pyx
FXocena a569538
fix PEP8 issues
FXocena eb34348
for Travis
FXocena 679ad4e
fix issue #15305, update _libs\window.pyx and tests\test_window.py
FXocena 5890579
changed test_window.py::TestRolling
FXocena 4148bb3
changed test_window.py::TestRolling
FXocena 334a7d1
changed test_window.py::TestRolling
FXocena 9c5e1c1
clean up whatsnew, parametrize tests, fix some whitespace issues
jreback 8f165d7
Merge branch 'master' into master
jorisvandenbossche 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 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
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 |
---|---|---|
|
@@ -423,6 +423,27 @@ def test_constructor_with_timedelta_window(self): | |
expected = df.rolling('3D').sum() | ||
tm.assert_frame_equal(result, expected) | ||
|
||
def test_constructor_with_timedelta_window_and_minperiods(self): | ||
# GH 15305 | ||
n = 10 | ||
df = pd.DataFrame({'value': np.arange(n)}, | ||
index=pd.date_range('2015-12-24', | ||
periods=n, | ||
freq="D")) | ||
expected_data = np.append([np.NaN, 1.], np.arange(3., 27., 3)) | ||
for window in [timedelta(days=3), pd.Timedelta(days=3)]: | ||
result_roll_sum = df.rolling(window=window, min_periods=2).sum() | ||
result_roll_generic = df.rolling(window=window, | ||
min_periods=2).apply(sum) | ||
expected = pd.DataFrame({'value': expected_data}, | ||
index=pd.date_range('2015-12-24', | ||
periods=n, | ||
freq="D")) | ||
tm.assert_frame_equal(result_roll_sum, expected) | ||
tm.assert_frame_equal(result_roll_generic, expected) | ||
expected = df.rolling('3D', min_periods=2).sum() | ||
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. what is this last part testing? 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. This tests when window == '3D'. I'd better put it together with [timedelta(days=3), pd.Timedelta(days=3)] |
||
tm.assert_frame_equal(result_roll_generic, expected) | ||
|
||
def test_numpy_compat(self): | ||
# see gh-12811 | ||
r = rwindow.Rolling(Series([2, 4, 6]), window=2) | ||
|
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.
you can put the expected_data directly in the frame.