Skip to content
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

ENH: zero_division parameter for classification… #14900

Merged
merged 13 commits into from Oct 12, 2019
Merged

ENH: zero_division parameter for classification… #14900

merged 13 commits into from Oct 12, 2019

Commits on Sep 6, 2019

  1. first commit for issue 14876: zero_division parameter

    @marctorsoc
    marctorsoc committed Sep 6, 2019
    Copy the full SHA
    84d3813 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/scikit-learn/scikit-learn … 

    …into prec_rec_fscore_zero_division

# Conflicts:
#	sklearn/metrics/classification.py
#	sklearn/metrics/tests/test_classification.py

lost some stuff after merging, need a review
    @marctorsoc
    marctorsoc committed Sep 6, 2019
    Copy the full SHA
    9ae7dab View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. - merge with master 

    - Changed whats_new to 0.22
- F-score only warns if both prec and rec are ill-defined
- new private method to simplify _prf_divide
    @marctorsoc
    marctorsoc committed Sep 7, 2019
    Copy the full SHA
    16dcda1 View commit details
    Browse the repository at this point in the history

  2. fixed "[...0 0...]" --> "[...0, 0...]" in docstring

    @marctorsoc
    marctorsoc committed Sep 7, 2019
    Copy the full SHA
    29d1109 View commit details
    Browse the repository at this point in the history

  3. corrected docstring examples

    @marctorsoc
    marctorsoc committed Sep 7, 2019
    Copy the full SHA
    f4e85e6 View commit details
    Browse the repository at this point in the history

  4. corrected docstring examples (again)

    @marctorsoc
    marctorsoc committed Sep 7, 2019
    Copy the full SHA
    446f878 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. - tests for warn and [0,1] separated to make them more clear; 

    - better docstrings
- more explicit use of zero_division value
    @marctorsoc
    marctorsoc committed Sep 11, 2019
    Copy the full SHA
    e189423 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Merge branch 'sklearn_master' into prec_rec_fscore_zero_division 

    # Conflicts:
#	doc/whats_new/v0.22.rst
    @marctorsoc
    marctorsoc committed Sep 12, 2019
    Copy the full SHA
    eadf88d View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. Merge branch 'sklearn_master' into prec_rec_fscore_zero_division

    @marctorsoc
    marctorsoc committed Sep 23, 2019
    Copy the full SHA
    31d075f View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. - removed fstring to make compatible with python<3.6

    @marctorsoc
    marctorsoc committed Sep 24, 2019
    Copy the full SHA
    3befe31 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. - reverted changes to avoid flake8 warnings 

    - added tests for YTN or YPN to check prec/rec with zero_division value
- cleaner tests
    @marctorsoc
    marctorsoc committed Sep 25, 2019
    Copy the full SHA
    7a2bc7d View commit details
    Browse the repository at this point in the history

  2. small refactoring requested by @thomasjpfan

    @marctorsoc
    marctorsoc committed Sep 25, 2019
    Copy the full SHA
    7891156 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. assert_warns --> pytest.warns

    @marctorsoc
    marctorsoc committed Oct 10, 2019
    Copy the full SHA
    3d3760e View commit details
    Browse the repository at this point in the history