-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
[ArrayManager] Add Series._as_manager (consolidate with DataFrame) #40304
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
jreback
merged 2 commits into
pandas-dev:master
from
jorisvandenbossche:am-series-as-manager
Mar 16, 2021
Merged
Changes from 1 commit
Commits
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 |
---|---|---|
|
@@ -72,13 +72,17 @@ | |
get_objs_combined_axis, | ||
union_indexes, | ||
) | ||
from pandas.core.internals.array_manager import ArrayManager | ||
from pandas.core.internals.array_manager import ( | ||
ArrayManager, | ||
SingleArrayManager, | ||
) | ||
from pandas.core.internals.blocks import ( | ||
ensure_block_shape, | ||
new_block, | ||
) | ||
from pandas.core.internals.managers import ( | ||
BlockManager, | ||
SingleBlockManager, | ||
create_block_manager_from_arrays, | ||
create_block_manager_from_blocks, | ||
) | ||
|
@@ -202,15 +206,21 @@ def mgr_to_mgr(mgr, typ: str): | |
if isinstance(mgr, BlockManager): | ||
new_mgr = mgr | ||
else: | ||
new_mgr = arrays_to_mgr( | ||
mgr.arrays, mgr.axes[0], mgr.axes[1], mgr.axes[0], typ="block" | ||
) | ||
if mgr.ndim == 2: | ||
new_mgr = arrays_to_mgr( | ||
mgr.arrays, mgr.axes[0], mgr.axes[1], mgr.axes[0], typ="block" | ||
) | ||
else: | ||
new_mgr = SingleBlockManager.from_array(mgr.arrays[0], mgr.index) | ||
elif typ == "array": | ||
if isinstance(mgr, ArrayManager): | ||
new_mgr = mgr | ||
else: | ||
arrays = [mgr.iget_values(i).copy() for i in range(len(mgr.axes[0]))] | ||
new_mgr = ArrayManager(arrays, [mgr.axes[1], mgr.axes[0]]) | ||
if mgr.ndim == 2: | ||
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. same |
||
arrays = [mgr.iget_values(i).copy() for i in range(len(mgr.axes[0]))] | ||
new_mgr = ArrayManager(arrays, [mgr.axes[1], mgr.axes[0]]) | ||
else: | ||
new_mgr = SingleArrayManager([mgr.internal_values()], [mgr.index]) | ||
else: | ||
raise ValueError(f"'typ' needs to be one of {{'block', 'array'}}, got '{typ}'") | ||
return new_mgr | ||
|
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.
can you make elif/else
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 personally wouldn't find that an improvement in readability. Now it's very clearly separated into two cases (manager already has the same type -> use as is, or else the manager needs to be converted)
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.
using nested elif/if is an anti-pattern
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.
It's only an anti-pattern if it's deeply nested and hampering readability. In this case, it makes the code easier to understand IMO.