10000 FIX Do not reset for non-fit in multiclass by thomasjpfan · Pull Request #20205 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

FIX Do not reset for non-fit in multiclass #20205

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
merged 5 commits into from
Jun 9, 2021
Merged

FIX Do not reset for non-fit in multiclass #20205

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ceebfec
FIX Do not reset for non-fit in multiclass
thomasjpfan Jun 3, 2021
259af07
Merge remote-tracking branch 'upstream/main' into multiclass_n_featur…
thomasjpfan Jun 7, 2021
0618741
ENH Adds validation to inner estimator
thomasjpfan Jun 7, 2021
e687c5e
FIX Fixes test errors
thomasjpfan Jun 7, 2021
f8dc509
STY Lint error
thomasjpfan Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
8000
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions sklearn/multiclass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,25 +114,34 @@ def _check_estimator(estimator):
class _ConstantPredictor(BaseEstimator):

def fit(self, X, y):
self._check_n_features(X, reset=True)
check_params = dict(force_all_finite=False, dtype=None,
ensure_2d=False, accept_sparse=True)
self._validate_data(X, y, reset=True,
validate_separately=(check_params, check_params))
self.y_ = y
return self

def predict(self, X):
check_is_fitted(self)
self._check_n_features(X, reset=True)
self._validate_data(X, force_all_finite=False, dtype=None,
accept_sparse=True,
ensure_2d=False, reset=False)

return np.repeat(self.y_, _num_samples(X))

def decision_function(self, X):
check_is_fitted(self)
self._check_n_features(X, reset=True)
self._validate_data(X, force_all_finite=False, dtype=None,
accept_sparse=True,
ensure_2d=False, reset=False)

return np.repeat(self.y_, _num_samples(X))

def predict_proba(self, X):
check_is_fitted(self)
self._check_n_features(X, reset=True)
self._validate_data(X, force_all_finite=False, dtype=None,
accept_sparse=True,
ensure_2d=False, reset=False)

return np.repeat([np.hstack([1 - self.y_, self.y_])],
_num_samples(X), axis=0)
Expand Down
0