[MRG] Convert the negative indices to positive ones in ColumnTransformer._get_column_indices #13017
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
jnothman
reviewed
Jan 19, 2019
| @@ -630,11 +630,11 @@ def _get_column_indices(X, key): | |||
|
|
|||
| if _check_key_type(key, int): | |||
There was a problem hiding this comment.
We could simplify this code to:
if _check_key_type(key, str):
...
else:
return np.atleast_1d(np.arange(n_columns)[key]).tolist()
(maybe with a check that it's also at most 1d)
added 2 commits
January 20, 2019 13:06
|
|
||
| if (_check_key_type(key, int) | ||
| or hasattr(key, 'dtype') and np.issubdtype(key.dtype, np.bool_)): | ||
| return np.atleast_1d(np.arange(n_columns)[key]).tolist() |
There was a problem hiding this comment.
Now that I see it, this is a little hard to read.
Maybe add a comment # Interpret the index like numpy does
or pull out idx = np.arange(n_columns)[key]
jnothman
approved these changes
Jan 20, 2019
albertcthomas
approved these changes
Jan 21, 2019
jnothman
approved these changes
Jan 21, 2019
qinhanmin2014
approved these changes
Jan 22, 2019
There was a problem hiding this comment.
thanks @pierretallotte I've moved the what's new entry to the correct place, will merge when green
|
Thanks for the fix! |
thomasjpfan
pushed a commit
to thomasjpfan/scikit-learn
that referenced
this pull request
Feb 7, 2019
…r._get_column_indices (scikit-learn#13017)
jnothman
pushed a commit
to jnothman/scikit-learn
that referenced
this pull request
Feb 19, 2019
…r._get_column_indices (scikit-learn#13017)
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…r._get_column_indices (scikit-learn#13017)
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…ansformer._get_column_indices (scikit-learn#13017)" This reverts commit ed39d15.
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…ansformer._get_column_indices (scikit-learn#13017)" This reverts commit ed39d15.
koenvandevelde
pushed a commit
to koenvandevelde/scikit-learn
that referenced
this pull request
Jul 12, 2019
…r._get_column_indices (scikit-learn#13017)
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.
Reference Issues/PRs
Fixes #12946
What does this implement/fix? Explain your changes.
The negative indexes are now converted into positive ones when _get_column_indices is called.
I also add a test case as described in the issue.
Any other comments?