[MRG] API use drop a sentinel to disable estimators in voting #13780
Conversation
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
jnothman
reviewed
May 4, 2019
| # regression test for | ||
| # https://github.com/scikit-learn/scikit-learn/issues/13777 | ||
| voter.fit(X, y, sample_weight=np.ones(y.shape)) | ||
| voter.set_params(lr=None) |
sklearn/ensemble/voting.py
Outdated
| return [w for est, w in zip(self.estimators, | ||
| self.weights) if est[1] is not None] | ||
| return [w for est, w in zip(self.estimators, self.weights) | ||
| if not(est[1] is None or est[1] == 'drop')] |
|
None was introduced in 0.19: #7674 I assume that we have to keep it then. |
|
@qinhanmin2014 You can have a look a this now. I solved the conflicts. |
jnothman
reviewed
May 6, 2019
Co-Authored-By: glemaitre <g.lemaitre58@gmail.com>
jnothman
approved these changes
May 6, 2019
|
@jnothman Good to have in 0.21? |
jnothman
pushed a commit
to jnothman/scikit-learn
that referenced
this pull request
May 7, 2019
koenvandevelde
pushed a commit
to koenvandevelde/scikit-learn
that referenced
this pull request
Jul 12, 2019
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.
closes #13771
For consistency, we should allow
'drop'to work the same asNoneto disable estimators in Voting estimators.Need to merge #13777 before to have the bug fix regarding the None and the sample weight.