Skip to content

Commit

Permalink
Merge pull request scikit-learn#6336 from GaelVaroquaux/fix_roc_auc_d…
Browse files Browse the repository at this point in the history
…oc_phrasing

DOC: trival PR: incorrect phrasing of inputs to roc
  • Loading branch information
agramfort committed Feb 13, 2016
2 parents 7cd0419 + 4efec8f commit 97015de
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions sklearn/metrics/ranking.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ def average_precision_score(y_true, y_score, average="macro",
y_score : array, shape = [n_samples] or [n_samples, n_classes]
Target scores, can either be probability estimates of the positive
class, confidence values, or binary decisions.
class, confidence values, or non-thresholded measure of decisions
(as returned by "decision_function" on some classifiers).
average : string, [None, 'micro', 'macro' (default), 'samples', 'weighted']
If ``None``, the scores for each class are returned. Otherwise,
Expand Down Expand Up @@ -197,7 +198,8 @@ def roc_auc_score(y_true, y_score, average="macro", sample_weight=None):
y_score : array, shape = [n_samples] or [n_samples, n_classes]
Target scores, can either be probability estimates of the positive
class, confidence values, or binary decisions.
class, confidence values, or non-thresholded measure of decisions
(as returned by "decision_function" on some classifiers).
average : string, [None, 'micro', 'macro' (default), 'samples', 'weighted']
If ``None``, the scores for each class are returned. Otherwise,
Expand Down Expand Up @@ -435,7 +437,8 @@ def roc_curve(y_true, y_score, pos_label=None, sample_weight=None,
y_score : array, shape = [n_samples]
Target scores, can either be probability estimates of the positive
class or confidence values.
class, confidence values, or non-thresholded measure of decisions
(as returned by "decision_function" on some classifiers).
pos_label : int
Label considered as positive and others are considered negative.
Expand Down Expand Up @@ -565,7 +568,8 @@ def label_ranking_average_precision_score(y_true, y_score):
y_score : array, shape = [n_samples, n_labels]
Target scores, can either be probability estimates of the positive
class, confidence values, or binary decisions.
class, confidence values, or non-thresholded measure of decisions
(as returned by "decision_function" on some classifiers).
Returns
-------
Expand Down Expand Up @@ -637,7 +641,8 @@ def coverage_error(y_true, y_score, sample_weight=None):
y_score : array, shape = [n_samples, n_labels]
Target scores, can either be probability estimates of the positive
class, confidence values, or binary decisions.
class, confidence values, or non-thresholded measure of decisions
(as returned by "decision_function" on some classifiers).
sample_weight : array-like of shape = [n_samples], optional
Sample weights.
Expand Down Expand Up @@ -695,7 +700,8 @@ def label_ranking_loss(y_true, y_score, sample_weight=None):
y_score : array, shape = [n_samples, n_labels]
Target scores, can either be probability estimates of the positive
class, confidence values, or binary decisions.
class, confidence values, or non-thresholded measure of decisions
(as returned by "decision_function" on some classifiers).
sample_weight : array-like of shape = [n_samples], optional
Sample weights.
Expand Down

0 comments on commit 97015de

Please sign in to comment.