-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
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
REF: use BlockManager.apply for Rolling.count #35883
Merged
mroeschke
merged 14 commits into
pandas-dev:master
from
jbrockmendel:ref-count-blockwise
Aug 31, 2020
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
4c5eddd
REF: remove unnecesary try/except
jbrockmendel c632c9f
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel 9e64be3
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel 42649fb
TST: add test for agg on ordered categorical cols (#35630)
mathurk1 47121dd
TST: resample does not yield empty groups (#10603) (#35799)
tkmz-n 1decb3e
revert accidental rebase
jbrockmendel 57c5dd3
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel a358463
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel ffa7ad7
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel e5e98d4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel 408db5a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel d3493cf
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel b1e1225
REF: use BlockManager.apply for Rolling.count
jbrockmendel 38b7f40
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel 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 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.
I was actually hoping that count could be defined in terms of
self._apply
so we can have less custom logicMight be not as straightforward (possibly) but just a heads up of where (hopefully) count should head.
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.
is this something you're planning on doing in the forseeable future? i agree thatd be a nicer solution
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'll experiment with this tonight and get a PR up if tests pass
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.
Looks like this version allows (inconsistently with other rolling function) non-numeric data like datetimes and strings because of the ahead of time coercing with
notna().astype(int)
. Taking longer than expected to tie out tests with using theroll_count
cython versionThere 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.
Not sure if anything can be shared, but it looks like
DataFrameGroupBy.count
is doing things kludgily blockwise and should also use an apply pattern