Codestin Search App

reshamas · 2019-12-30T15:36:04Z

Reference Issues/PRs

References #11364
Closes #14772

What does this implement/fix? Explain your changes.

This PR adds a boolean verbose flag for the classes in voting.py. Adds function _log_message to _BaseVoting and uses code format as in #11364.

Any other comments?

Continuing work begun by @hannahbrucemacdonald and @spbail at NYC sprint (Aug 2019)

addresses #14312

…ssor addresses issue #10360

reshamas · 2019-12-30T21:59:53Z

@jnothman @NicolasHug
There are lots of errors here, and I'm not sure where to begin.

cc: @cmarmo

cmarmo · 2020-01-01T21:48:22Z

@reshamas , I've tried to review this PR but it turns out there are a lot of things to change and I don't think I'm capable to guide you in making those changes... maybe the issue is less "Easy" than it was supposed to be... :)
If you don't mind I will propose a PR to your branch in the next days. Is that ok for you? Thanks!

reshamas · 2020-01-01T21:52:17Z

@cmarmo
Sure, that works. I also know there is redundant code in there I need to fix. But, thought best to focus on the errors first.

…ers to `_parallel_fit_estimator`.

Fix test errors for PR #15991

cmarmo · 2020-01-01T22:54:48Z

Oh my... :( ... sorry @reshamas ... lint error...

sklearn/ensemble/tests/test_voting.py:516:1: E302 expected 2 blank lines, found 1
def test_voting_verbose_vc(capsys):
^
sklearn/ensemble/tests/test_voting.py:542:1: E302 expected 2 blank lines, found 1
def test_voting_verbose_vr(capsys):

Could you take care of that? Thanks!

…into verbose_voting

…o verbose_voting

cmarmo · 2020-01-02T10:32:13Z

@thomasjpfan , this PR heavily relies on your example (#11364). Could you take a look, please?
Sorry to all previous reviewers: the code probably have lost your previous comments as it was remodeled by different people. We will try to do better for next sprints. Thanks for your patience and collaboration.

glemaitre

A couple of comments

glemaitre · 2020-01-02T14:38:31Z

@@ -64,8 +64,12 @@ def fit(self, X, y, sample_weight=None):

        self.estimators_ = Parallel(n_jobs=self.n_jobs)(
                delayed(_parallel_fit_estimator)(clone(clf), X, y,


Could you put clone(clf), .... on the next line. It will give you some space to call self._log_message() on the same line).

glemaitre · 2020-01-02T14:40:08Z

        check_is_fitted(self)
        return self._predict(X)
+
+    def _log_message(self, name, idx, total):


Since the function is called in both Voting* estimator, we could move it in _BaseVoting avoiding to have repeated code in both Voting* classes?

glemaitre · 2020-01-02T14:42:16Z

    check_no_attributes_set_in_init(estimator.__class__.__name__, estimator)


+def test_voting_verbose_vc(capsys):


Since the 2 tests are really similar, I would advise making them general enough such that we can parametrize the test with a VotingClassifier and a VotingRegressor.

glemaitre · 2020-01-02T14:45:13Z

 - |Enhancement| improve error message in :func:`utils.validation.column_or_1d`.
  :pr:`15926` by :user:`Loïc Estève <lesteve>`.
+
+Multiple modules


These are only in sklearn.ensemble

Co-Authored-By: Guillaume Lemaitre <[email protected]>

jnothman · 2020-01-09T20:21:23Z

Closed by #16069

hannahbrucemacdonald and others added 19 commits August 24, 2019 10:57

adds Attribute documentation for MiniBatchDictionaryLearning

b3f49bb

addresses #14312

removing trailing white space

10e4302

adding verbose option to voting.py classes, as an int

a8de299

adding _log_message function, changing verbose to bool to match #11364

ad47522

adding verbose option and message to VotingClassifier and VotingRegre…

376f118

…ssor addresses issue #10360

removing erroneous documentation from previous PR

03adb3a

linting voting.py

e0680e2

adding test for the verbose flag in voting classes

cbf4f23

fixing linting in test

e0fe8f2

linting

83c3f20

merging with master

01b380a

fixing merge conflicts

c63c17b

fixing flake8 errors; rm unused imports

4c8a644

adding back imports

d80c414

adding tests per JN

fb22fe9

fixing flake8 error

25d6bf1

cleaning up 'test_voting_verbose'

cbbea28

added VR test; docs update

9731995

removing unused import print_elapsed_time

4621b1f

cmarmo and others added 2 commits January 1, 2020 23:29

Fix test errors. Remove unuseful parametrization. Add message paramet…

382e24e

…ers to `_parallel_fit_estimator`.

Merge pull request #1 from cmarmo/reshamas-voting

76a9833

Fix test errors for PR #15991

Reshama added 4 commits January 1, 2020 18:01

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

6714569

…into verbose_voting

Merge branch 'verbose_voting' of github.com:reshamas/scikit-learn int…

2590324

…o verbose_voting

fix linting errors, add blank lines after functions

ea90121

added Chiara to change log

7a7ce1b

glemaitre reviewed Jan 2, 2020

View reviewed changes

glemaitre changed the title ~~add verbose flag for VotingClassifier and VotingRegressor~~ API add verbose flag for Voting* estimators Jan 2, 2020

glemaitre added the Needs work label Jan 2, 2020

reshamas and others added 3 commits January 2, 2020 12:02

Update sklearn/ensemble/_voting.py

e8f4b03

Co-Authored-By: Guillaume Lemaitre <[email protected]>

Update sklearn/ensemble/_voting.py

604d4fc

Co-Authored-By: Guillaume Lemaitre <[email protected]>

Update doc/whats_new/v0.23.rst

0f35c02

Co-Authored-By: Guillaume Lemaitre <[email protected]>

cmarmo mentioned this pull request Jan 9, 2020

ENH Add verbose option to VotingClassifier and VotingRegre… #16069

Merged

jnothman closed this Jan 9, 2020

Navigation Menu

Uh oh!

Uh oh!

API add verbose flag for Voting* estimators - #15991

API add verbose flag for Voting* estimators#15991
reshamas wants to merge 28 commits into
scikit-learn:masterfrom
reshamas:verbose_voting

reshamas commented Dec 30, 2019

Uh oh!

reshamas commented Dec 30, 2019

Uh oh!

cmarmo commented Jan 1, 2020

Uh oh!

reshamas commented Jan 1, 2020

Uh oh!

cmarmo commented Jan 1, 2020

Uh oh!

cmarmo commented Jan 2, 2020

Uh oh!

glemaitre left a comment

Uh oh!

glemaitre Jan 2, 2020

Uh oh!

Uh oh!

Uh oh!

glemaitre Jan 2, 2020

Uh oh!

glemaitre Jan 2, 2020

Uh oh!

Uh oh!

glemaitre Jan 2, 2020

Uh oh!

jnothman commented Jan 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		@@ -64,8 +64,12 @@ def fit(self, X, y, sample_weight=None):

		self.estimators_ = Parallel(n_jobs=self.n_jobs)(
		delayed(_parallel_fit_estimator)(clone(clf), X, y,

		check_no_attributes_set_in_init(estimator.__class__.__name__, estimator)


		def test_voting_verbose_vc(capsys):

Uh oh!

Uh oh!

Conversation

reshamas commented Dec 30, 2019

Reference Issues/PRs

What does this implement/fix? Explain your changes.

Any other comments?

Uh oh!

reshamas commented Dec 30, 2019

Uh oh!

cmarmo commented Jan 1, 2020

Uh oh!

reshamas commented Jan 1, 2020

Uh oh!

cmarmo commented Jan 1, 2020

Uh oh!

cmarmo commented Jan 2, 2020

Uh oh!

glemaitre left a comment

Choose a reason for hiding this comment

Uh oh!

glemaitre Jan 2, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

glemaitre Jan 2, 2020

Choose a reason for hiding this comment

Uh oh!

glemaitre Jan 2, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

glemaitre Jan 2, 2020

Choose a reason for hiding this comment

Uh oh!

jnothman commented Jan 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants