Skip to content

Commit 4ec8630

Browse files
committed
Merge pull request scikit-learn#3444 from arjoly/explain-default-score
[MRG+1] ENH + DOC set a default scorer in the multiclass module
2 parents 0807e19 + c03b987 commit 4ec8630

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

sklearn/base.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,16 @@ class ClassifierMixin(object):
270270
def score(self, X, y, sample_weight=None):
271271
"""Returns the mean accuracy on the given test data and labels.
272272
273+
In multi-label classification, this is the subset accuracy
274+
which is a harsh metric since you require for each sample that
275+
each label set be correctly predicted.
276+
273277
Parameters
274278
----------
275279
X : array-like, shape = (n_samples, n_features)
276280
Test samples.
277281
278-
y : array-like, shape = (n_samples,)
282+
y : array-like, shape = (n_samples) or (n_samples, n_outputs)
279283
True labels for X.
280284
281285
sample_weight : array-like, shape = [n_samples], optional
@@ -308,7 +312,7 @@ def score(self, X, y, sample_weight=None):
308312
X : array-like, shape = (n_samples, n_features)
309313
Test samples.
310314
311-
y : array-like, shape = (n_samples,)
315+
y : array-like, shape = (n_samples) or (n_samples, n_outputs)
312316
True values for X.
313317
314318
sample_weight : array-like, shape = [n_samples], optional

sklearn/multiclass.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,13 +376,6 @@ def multilabel_(self):
376376
"""Whether this is a multilabel classifier"""
377377
return self.label_binarizer_.y_type_.startswith('multilabel')
378378

379-
def score(self, X, y):
380-
if self.multilabel_:
381-
raise NotImplementedError(
382-
"score is not supported for multilabel classifiers")
383-
else:
384-
return super(OneVsRestClassifier, self).score(X, y)
385-
386379
@property
387380
def classes_(self):
388381
return self.label_binarizer_.classes_

0 commit comments

Comments
 (0)