Skip to content

[WIP] rewrite precision_recall_fscore_support #1990

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

Closed
wants to merge 30 commits into from
Closed

[WIP] rewrite precision_recall_fscore_support #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5a35592
FIX helper to check multilabel types
jnothman May 22, 2013
1425594
Fix, document and test check_multilabel_type
jnothman May 22, 2013
76a2d61
Rename check_multilabel_type -> is_multilabel and rewrite
jnothman May 22, 2013
852e8ba
Remove old implementation(!)
jnothman May 22, 2013
0aae0b1
Fix use of changed return value
jnothman May 22, 2013
ed326f9
Test strings in multilabel
jnothman May 22, 2013
65abef9
Replace is_multilabel with type_of_targets
jnothman May 25, 2013
f5ff005
BUG: set random state in LogisticRegression
May 21, 2013
4afaab6
DOC clarification in Scoring objects: Its not a good sign if I don't …
amueller May 21, 2013
6da8719
FIX bug in f_score with beta !=1
arjoly May 22, 2013
1ac31ce
FIX formula inversion for sample-based precision/recall
arjoly May 22, 2013
bb42c17
FIX set same default behavior for precision, recall and f-score
arjoly May 23, 2013
90cc715
ENH support multilabel targets in LabelEncoder
jnothman May 22, 2013
062871d
Simplify precision_recall_fscore_support
jnothman May 22, 2013
b31ac03
Avoid floats for counts
jnothman May 22, 2013
3b80b37
More robust template
jnothman May 22, 2013
2be242b
TST Use assert_almost_equal in test_symmetry
jnothman May 22, 2013
b44fcba
Fix unusual cases for tests
jnothman May 22, 2013
3af9b23
Ravel in checking arrays
jnothman May 22, 2013
60959db
Add comments
jnothman May 22, 2013
ce85e20
Support labels argument
jnothman May 22, 2013
881ba77
COSMIT prefer partial over lambda in test_metrics
jnothman May 22, 2013
9e826d7
TSTFIX use name, not metric, in test_metrics error messages
jnothman May 22, 2013
d5c0460
Ensure non-positive label indicators are 0 before summing
jnothman May 23, 2013
25000df
Add todo for a warning
jnothman May 23, 2013
bab82ff
Use list comprehensions instead of vectorize
jnothman May 23, 2013
859a9a7
Warn on setting 0-denominator metrics to 0
jnothman May 26, 2013
d9a3c7f
start handling PRF warnings in tests
jnothman May 26, 2013
a904cf5
Reimplement bincount for multilabel-sequence
jnothman May 28, 2013
d6dfaf7
Rename pos_sum to pred_sum
jnothman May 28, 2013
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: 1 addition & 1 deletion doc/modules/model_evaluation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ a score (``greater_is_better=True``) or a loss (``greater_is_better=False``),
whether the function you provided takes predictions as input
(``needs_threshold=False``) or needs confidence scores
(``needs_threshold=True``) and any additional parameters, such as ``beta`` in
the example above.
the previous example.


Implementing your own scoring object
Expand Down
2 changes: 1 addition & 1 deletion sklearn/linear_model/logistic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def __init__(self, penalty='l2', dual=False, tol=1e-4, C=1.0,
super(LogisticRegression, self).__init__(
penalty=penalty, dual=dual, loss='lr', tol=tol, C=C,
fit_intercept=fit_intercept, intercept_scaling=intercept_scaling,
class_weight=class_weight, random_state=None)
class_weight=class_weight, random_state=random_state)

def predict_proba(self, X):
"""Probability estimates.
Expand Down
Loading