[MRG+1] Added unit test for adding classes_ property to GridSearchCV, fixes #6298 #7661

abatula · 2016-10-13T04:56:04Z

Fixes #6298
Completes closed pull request #6449

Added a test to ensure the classes_ property is correclty added to GridSearchCV, and also check that regressors do not have the classes_ attribute. This should complete the previously closed pull request.

Adds a "classes_" property to BaseSearchCV

jnothman · 2016-10-13T12:26:10Z

Please also test that if a regressor is used, hasattr(gscv, 'classes_') is False.

Thansk.

…asses_ attribute

abatula · 2016-10-16T02:29:14Z

Added a second test to make sure regressors don't have a classes_ attribute.

jnothman

Otherwise, and with the Travis issues addressed, LGTM.

jnothman · 2016-10-16T06:10:25Z

sklearn/tests/test_grid_search.py

@@ -785,3 +786,30 @@ def test_parameters_sampler_replacement():
    sampler = ParameterSampler(params_distribution, n_iter=7)
    samples = list(sampler)
    assert_equal(len(samples), 7)
+
+
+def test_classes__property():


It's okay to combine these into one test function

And I'd prefer it.

jnothman · 2016-10-16T06:10:25Z

sklearn/tests/test_grid_search.py

+
+    clf = LinearSVC(random_state=0)
+
+    grid_search = GridSearchCV(clf, {'C': Cs}, scoring='accuracy')


scoring='accuracy' is unnecessary.

jnothman · 2016-10-16T06:10:25Z

sklearn/tests/test_grid_search.py

+    Cs = [.1, 1, 10]
+
+    clf = LinearSVC(random_state=0)
+


I don't think this blank line does much good.

In fact, I'd be fine with GridSearchCV(LinearSVC(random_state=0), param_grid)

jnothman · 2016-10-16T06:10:25Z

sklearn/tests/test_grid_search.py

+    y = np.array([0] * 5 + [1] * 5)
+
+    regr = Ridge()
+


Similarly, this is unhelpful whitespace

jnothman · 2016-10-16T06:11:38Z

Please add a what's new entry.

…le test.

…into gridsearch_classes

abatula · 2016-10-18T01:09:54Z

Merged the two tests into a single test, and fixed the whitespace issues found by Travis CI.

I can't find any information on adding a what's new entry, are there instructions that I'm missing?

amueller · 2016-10-18T03:44:50Z

Just checkout doc/whatsnew.rst. There are no instructions on adding a changelog but it should be pretty self-explanatory.

jnothman · 2016-10-19T04:21:31Z

doc/whats_new.rst

@@ -19,6 +19,11 @@ New features
 Enhancements
 ............

+   - Added ``classes_`` attribute to gridSearchCV object that matches the


gridSearchCV should be

:class:`model_selection.GridSearchCV`

abatula · 2016-10-20T01:22:24Z

Fixed reference to gridSearchCV in what's new entry.

amueller · 2016-10-20T14:07:37Z

thanks!

amueller · 2016-10-20T14:09:28Z

doc/whats_new.rst

+   - Added ``classes_`` attribute to :class:`model_selection.GridSearchCV`
+     that matches the ``classes_`` attribute of ``best_estimator_``. (`#7661
+     <https://github.com/scikit-learn/scikit-learn/pull/7661>`_) by `Alyssa
+     Batula`_ and `Dylan Werner-Meier`_.


You need to add your names to the bottom of the file for the links to work. I'll do that.

…ixes scikit-learn#6298 (scikit-learn#7661) * Fix issue scikit-learn#6298 Adds a "classes_" property to BaseSearchCV * Added test to ensure classes_ property is added to gridSearch correctly * Fixed formatting * Added test to ensure gridSearchCV with a regressor does not have a classes_ attribute * Fixed whitespace issues * Combined tests for the new GridSearchSV.classes_ property into a single test. * Removed trailing whitespace * Added what's new for pull request scikit-learn#7661 * Fixed formatting of update in what's new

unautre and others added 2 commits Feb 25, 2016

Fix issue #6298

Loading status checks…

07b474c

Adds a "classes_" property to BaseSearchCV

Added test to ensure classes_ property is added to gridSearch correctly

Loading status checks…

0d79716

abatula added 2 commits Oct 16, 2016

Fixed formatting

Loading status checks…

b8ee33d

Added test to ensure gridSearchCV with a regressor does not have a cl…

Loading status checks…

5c44632

…asses_ attribute

Fixed whitespace issues

Loading status checks…

6a1ef11

jnothman requested changes Oct 16, 2016

View changes

jnothman added the Waiting for Reviewer label Oct 16, 2016

jnothman changed the title ~~[MRG] Added unit test for adding classes_ property to GridSearchCV, fixes #6298~~ [MRG+1] Added unit test for adding classes_ property to GridSearchCV, fixes #6298 Oct 16, 2016

RPGOne approved these changes Oct 17, 2016

View changes

abatula added 3 commits Oct 17, 2016

Combined tests for the new GridSearchSV.classes_ property into a sing…

Loading status checks…

359e868

…le test.

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

fc4bb72

…into gridsearch_classes

Removed trailing whitespace

Loading status checks…

c1d844a

RPGOne approved these changes Oct 18, 2016

View changes

Added what's new for pull request #7661

Loading status checks…

1683de4

jnothman requested changes Oct 19, 2016

View changes

Fixed formatting of update in what's new

Loading status checks…

084d35d

amueller reviewed Oct 20, 2016

View changes

stephen-hoover mentioned this pull request Feb 4, 2017

[MRG+1] Add classes_ parameter to hyperparameter CV classes #8295

Merged

scikit-learn / scikit-learn

[MRG+1] Added unit test for adding classes_ property to GridSearchCV, fixes #6298 #7661

[MRG+1] Added unit test for adding classes_ property to GridSearchCV, fixes #6298 #7661

abatula commented Oct 13, 2016 •

edited

jnothman commented Oct 13, 2016

abatula commented Oct 16, 2016

jnothman left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jnothman commented Oct 16, 2016

abatula commented Oct 18, 2016

amueller commented Oct 18, 2016

This comment has been minimized.

abatula commented Oct 20, 2016

amueller commented Oct 20, 2016

This comment has been minimized.


		clf = LinearSVC(random_state=0)

		grid_search = GridSearchCV(clf, {'C': Cs}, scoring='accuracy')

scikit-learn / scikit-learn

Sponsor scikit-learn/scikit-learn

[MRG+1] Added unit test for adding classes_ property to GridSearchCV, fixes #6298 #7661

[MRG+1] Added unit test for adding classes_ property to GridSearchCV, fixes #6298 #7661

Conversation

abatula commented Oct 13, 2016 • edited

jnothman commented Oct 13, 2016

abatula commented Oct 16, 2016

jnothman left a comment

This comment has been minimized.

jnothman Oct 16, 2016 Member

This comment has been minimized.

jnothman Oct 16, 2016 Member

This comment has been minimized.

jnothman Oct 16, 2016 Member

This comment has been minimized.

jnothman Oct 16, 2016 Member

This comment has been minimized.

jnothman Oct 16, 2016 Member

This comment has been minimized.

jnothman Oct 16, 2016 Member

jnothman commented Oct 16, 2016

abatula commented Oct 18, 2016

amueller commented Oct 18, 2016

This comment has been minimized.

jnothman Oct 19, 2016 Member

abatula commented Oct 20, 2016

amueller commented Oct 20, 2016

This comment has been minimized.

amueller Oct 20, 2016 Member

abatula commented Oct 13, 2016 •

edited

jnothman Oct 16, 2016
Member

jnothman Oct 16, 2016
Member

jnothman Oct 16, 2016
Member

jnothman Oct 16, 2016
Member

jnothman Oct 16, 2016
Member

jnothman Oct 16, 2016
Member

jnothman Oct 19, 2016
Member

amueller Oct 20, 2016
Member