Thanks to visit codestin.com
Credit goes to github.com

Skip to content

FIX Validate estimators in Voting{Classifier,Regressor} #30649

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.

Sign up for GitHub

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
lesteve merged 5 commits into from
Jan 21, 2025
Merged

FIX Validate estimators in Voting{Classifier,Regressor} #30649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ea4579
Validate estimators in Voting{Classifier,Regressor}
thomasjpfan Jan 15, 2025
f82c7b4
Add PR number
thomasjpfan Jan 15, 2025
57c673c
Also validate the first entry
thomasjpfan Jan 15, 2025
807c843
Update doc/whats_new/upcoming_changes/sklearn.ensemble/30649.fix.rst
thomasjpfan Jan 15, 2025
56c8cad
Silently allow lists
thomasjpfan Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/whats_new/upcoming_changes/sklearn.ensemble/30649.fix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- :class:`ensemble.VotingClassifier` and :class:`ensemble.VotingRegressor`
validate `estimators` to make sure it is a list of tuples. By `Thomas Fan`_.
5 changes: 4 additions & 1 deletion sklearn/ensemble/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,10 @@ def __init__(self, estimators):
self.estimators = estimators

def _validate_estimators(self):
if len(self.estimators) == 0:
if len(self.estimators) == 0 or not all(
isinstance(item, (tuple, list)) and isinstance(item[0], str)
for item in self.estimators
):
raise ValueError(
"Invalid 'estimators' attribute, 'estimators' should be a "
"non-empty list of (string, estimator) tuples."
Expand Down
8 changes: 8 additions & 0 deletions sklearn/ensemble/tests/test_voting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
{"estimators": []},
"Invalid 'estimators' attribute, 'estimators' should be a non-empty list",
),
(
{"estimators": [LogisticRegression()]},
"Invalid 'estimators' attribute, 'estimators' should be a non-empty list",
),
(
{"estimators": [(213, LogisticRegression())]},
"Invalid 'estimators' attribute, 'estimators' should be a non-empty list",
),
(
{"estimators": [("lr", LogisticRegression())], "weights": [1, 2]},
"Number of `estimators` and weights must be equal",
Expand Down
Loading