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

Skip to content

[MRG] ENH Adding various averages to classification_report #11679

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

Jump to bottom
Merged
qinhanmin2014 merged 17 commits into from
Aug 7, 2018
Merged

[MRG] ENH Adding various averages to classification_report #11679

qinhanmin2014 merged 17 commits into from
Aug 7, 2018

Conversation

@qinhanmin2014
Copy link
Member

@qinhanmin2014 qinhanmin2014 commented Jul 25, 2018 •
edited
Loading

Closes #4558
Closes #4622
Closes #10029
Closes #11657

(1) Support dictionary output
(2) Reorganize to avoid duplicate code
(3) Return int/float instead of np.int/np.float in classification_report (See #11657)

apacha and others added 16 commits October 27, 2017 18:44
@apacha
Adding average-option to classification_report to make default more e…
8d4eb5e 
…xplicit and allow changing it easily for the report (#4558).
@apacha
Fixed documentation to reflect new output.
995e4fb
@apacha
Replacing remaining occurencies of total/avg in documentation with "w…
1d75f22 
…eighted avg" and improving style to comply with Style-guidelines (line-width <80 chars).
@apacha
Merge remote-tracking branch 'upstream/master'
28e1f08 
# Conflicts:
#	sklearn/metrics/classification.py
@apacha
Removing 'binary' option as it is redundant.
d50adc8
@apacha
Merge branch 'master-upstream'
6095e49
@apacha
Reporting all averages (micro, macro, weighted and sample (if applica…
486e39c 
…ble)) when calling classification_report.

Updated numbers in working_with_text_data tutorial, because the data seems to have changed.
@apacha
Removing code that accidentally slipped into a test.
af4fd16
@apacha
Adding entry in 'whats new' documentation and crediting myself.
a48377f
@apacha
Dummy-change to trigger rebuild of CI.
f9bc14d
@amueller
Merge branch 'master' into pr/10029
f902fb8 
# Conflicts:
#	sklearn/metrics/classification.py
@amueller
fix some doctests in text data
1f1fe77
@qinhanmin2014
Merge branch 'master' into 10029
9a7c8b0
@qinhanmin2014
dict output
8db20a5
@qinhanmin2014
what's new
428280d
@qinhanmin2014
what's new
3ee4455
This was referenced Jul 25, 2018
Closed
Closed
@qinhanmin2014 qinhanmin2014 added this to the 0.20 milestone Jul 25, 2018
@qinhanmin2014 qinhanmin2014 changed the title ENH Adding various averages to classification_report [MRG] ENH Adding various averages to classification_report Jul 25, 2018
@qinhanmin2014
Copy link
Member Author

qinhanmin2014 commented Jul 25, 2018

cc reviewers from the original PR
@jnothman @glemaitre @GaelVaroquaux @amueller
Note that this is not backward compatible, i.e., users cannot get the old output. But I think that's acceptable, since users are actually getting more information here.

jnothman
jnothman approved these changes Jul 25, 2018
View reviewed changes
Copy link
Member

@jnothman jnothman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there something particular I was meant to see / look at?

@qinhanmin2014
Copy link
Member Author

qinhanmin2014 commented Jul 26, 2018

Thanks @jnothman for the review :)

Was there something particular I was meant to see / look at?

For you, maybe no, since you've approved #10029 and #11657. The main purpose of this PR is to support average option for dictionary output.

@qinhanmin2014 qinhanmin2014 mentioned this pull request Jul 28, 2018
Closed
@qinhanmin2014
Copy link
Member Author

qinhanmin2014 commented Aug 7, 2018

I'll count my +1 and merge when green. Hope that users won't complain about the backward incompatible.

@jnothman
Copy link
Member

jnothman commented Aug 7, 2018 via email

@qinhanmin2014 qinhanmin2014 merged commit 0efaf2d into scikit-learn:master Aug 7, 2018
@qinhanmin2014
Copy link
Member Author

qinhanmin2014 commented Aug 7, 2018

Thanks @apacha

@qinhanmin2014 qinhanmin2014 deleted the 10029 branch August 7, 2018 11:54
@amueller amueller mentioned this pull request Oct 9, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jnothman jnothman jnothman approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.20

Development

Successfully merging this pull request may close these issues.

4 participants

@qinhanmin2014 @jnothman @apacha @amueller