8000 Add missing 'values_format' param to disp.plot() in plot_confusion_matrix by blynotes · Pull Request #15937 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

Add missing 'values_format' param to disp.plot() in plot_confusion_matrix #15937

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

Merged
merged 5 commits into from
Dec 31, 2019
Merged

Add missing 'values_format' param to disp.plot() in plot_confusion_matrix #15937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76d285e
I added the missing "values_format" parameter to "disp.plot()" call i…
blynotes Dec 20, 2019
aa75f93
Added test coverage to verify 'plot_confusion_matrix' passes through …
blynotes Dec 21, 2019
ddbabf2
Merge remote-tracking branch 'upstream/master' into update-plot_confu…
blynotes Dec 30, 2019
dd4fc16
Updated Release Notes and removed 'order="C"' from the cm.ravel() cal…
blynotes Dec 30, 2019
0fcf565
Update v0.22.rst
qinhanmin2014 Dec 31, 2019
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
4 changes: 4 additions & 0 deletions doc/whats_new/v0.22.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ Changelog
value of the ``zero_division`` keyword argument. :pr:`15879`
by :user:`Bibhash Chandra Mitra <Bibyutatsu>`.

- |Fix| Fixed a bug in :func:`metrics.plot_confusion_matrix` to correctly
pass the `values_format` parameter to the :class:`ConfusionMatrixDisplay`
plot() call. :pr:`15937` by :user:`Stephen Blystone <blynotes>`.

:mod:`sklearn.semi_supervised`
..............................

Expand Down
3 changes: 2 additions & 1 deletion sklearn/metrics/_plot/confusion_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,5 @@ def plot_confusion_matrix(estimator, X, y_true, labels=None,
disp = ConfusionMatrixDisplay(confusion_matrix=cm,
display_labels=display_labels)
return disp.plot(include_values=include_values,
cmap=cmap, ax=ax, xticks_rotation=xticks_rotation)
cmap=cmap, ax=ax, xticks_rotation=xticks_rotation,
values_format=values_format)
19 changes: 19 additions & 0 deletions sklearn/metrics/_plot/tests/test_plot_confusion_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,22 @@ def test_confusion_matrix_pipeline(pyplot, clf, data, n_classes):

assert_allclose(disp.confusion_matrix, cm)
assert disp.text_.shape == (n_classes, n_classes)


@pytest.mark.parametrize("values_format", ['e', 'n'])
def test_confusion_matrix_text_format(pyplot, data, y_pred, n_classes,
fitted_clf, values_format):
# Make sure plot text is formatted with 'values_format'.
X, y = data
cm = confusion_matrix(y, y_pred)
disp = plot_confusion_matrix(fitted_clf, X, y,
include_values=True,
values_format=values_format)

assert disp.text_.shape == (n_classes, n_classes)

expected_text = np.array([format(v, values_format)
for v in cm.ravel()])
text_text = np.array([
t.get_text() for t in disp.text_.ravel()])
assert_array_equal(expected_text, text_text)
0