-
-
Notifications
You must be signed in to change notification settings - Fork 18k
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
BUG: Fix make_sparse mask generation #17574
Merged
jreback
merged 12 commits into
pandas-dev:master
from
Licht-T:fix-make_spase-mask-generation
Sep 28, 2017
Merged
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
7804303
BUG: Fix make_sparse mask generation not to cast when dtype is object
Licht-T b64c123
TST: Add test of the make_sparse mask generation
Licht-T bff0ac0
TST: Add GitHub PR number comment on the test
Licht-T 7190704
BUG: Fix the element-wise mask generation method in make_spase
Licht-T c9d674a
DOC: Add the description of make_sparse bug fix in whatsnew note
Licht-T 7727c5a
TST: Fix wrong array comparison in the make_sparse bug-fix test
Licht-T 26cb4ca
BUG: Simplified the mask generation method in make_spase
Licht-T 8e01026
TST: Add the SparseArray constructor performance test
Licht-T a48f957
DOC: Add the description of make_sparse mask generation routine
Licht-T 3589072
PERF: Reimplement the SparseArray mask create method for object ndarr…
Licht-T 48687b3
TST: Add asv tests for the object dtype SparseArray with NaN fill value
Licht-T 2c6bca4
Merge branch 'master' into fix-make_spase-mask-generation
Licht-T 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ | |
from pandas.core.dtypes.common import ( | ||
_ensure_platform_int, | ||
is_float, is_integer, | ||
is_object_dtype, | ||
is_integer_dtype, | ||
is_bool_dtype, | ||
is_list_like, | ||
|
@@ -789,7 +790,15 @@ def make_sparse(arr, kind='block', fill_value=None): | |
if is_string_dtype(arr): | ||
arr = arr.astype(object) | ||
|
||
mask = arr != fill_value | ||
if is_object_dtype(arr.dtype): | ||
mask = np.ones(len(arr), dtype=np.bool) | ||
fv_type = type(fill_value) | ||
|
||
itr = (type(x) is fv_type for x in arr) | ||
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 is still quite cumbersome can you simplify |
||
cond = np.fromiter(itr, dtype=np.bool) | ||
mask[cond] = arr[cond] != fill_value | ||
else: | ||
mask = arr != fill_value | ||
|
||
length = len(arr) | ||
if length != mask.size: | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,6 +61,15 @@ def test_constructor_object_dtype(self): | |
assert arr.dtype == np.object | ||
assert arr.fill_value == 'A' | ||
|
||
# GH 17574 | ||
data = [False, 0, 100.0, 0.0] | ||
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. add the issues number as a comment |
||
arr = SparseArray(data, dtype=np.object, fill_value=False) | ||
assert arr.dtype == np.object | ||
assert arr.fill_value is False | ||
arr_expected = np.array(data, dtype=np.object) | ||
it = (type(x) == type(y) and x == y for x, y in zip(arr, arr_expected)) | ||
assert np.fromiter(it, dtype=np.bool).all() | ||
|
||
def test_constructor_spindex_dtype(self): | ||
arr = SparseArray(data=[1, 2], sparse_index=IntIndex(4, [1, 2])) | ||
tm.assert_sp_array_equal(arr, SparseArray([np.nan, 1, 2, np.nan])) | ||
|
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.
ok pls add a comment on what/why this is happening.
no general numpy routine to do this? (I don't think we have a pandas one), but have a look around.
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.
@jreback Added comments. I haven't found yet. I think there is no numpy general method.