Skip to content

/ scikit-learn

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.

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

[MRG + 2] add pairwise property to basesearchcv #15524

Merged
merged 11 commits into from Nov 10, 2019
Merged

[MRG + 2] add pairwise property to basesearchcv #15524

merged 11 commits into from Nov 10, 2019

Conversation

@xun-tang
Copy link
Contributor

xun-tang commented Nov 3, 2019

Reference Issues/PRs

Fixes #13920. Pulled from a stalled PR #13925.

What does this implement/fix? Explain your changes.

  • Address the all comments from @NicolasHug on #13925
    -- use GridSearchCV not creating a dummy class for test.
    -- docstring changes
  • Split the test to two separate tests since they test different
    aspects of the functionality.

Any other comments?

My first non-documentation PR on sklearn. Comments welcome.
isrobson added 5 commits May 22, 2019
@isrobson
add _pairwise property to BaseSearchCV
Loading status checks…
52851c2
@isrobson
basesearchcv _pairwise comment shortening
Loading status checks…
e492ca0
@isrobson
add _pairwise property test for BaseSearchCV
Loading status checks…
2546ef9
@isrobson
shorten _pairwise test for BaseSearchCV
Loading status checks…
10abb32
@isrobson
second blank line for _pairwise test of BaseSearchCV
Loading status checks…
a1e2413
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented on sklearn/model_selection/tests/test_search.py in 2546ef9 May 23, 2019

when the attribute name is const, you should just use est._pairwise = ...

This comment has been minimized.

Sign in to view
Copy link
Author

isrobson replied May 23, 2019

Yes, that would be a bit simpler
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented on sklearn/model_selection/tests/test_search.py in 2546ef9 May 23, 2019

verity -> verify
isrobson and others added 5 commits May 24, 2019
@isrobson
rework _pairwise BaseSearchCV test
Loading status checks…
907d5b2
@isrobson
_pairwise BaseSearchCV changelog add
Loading status checks…
5789be0
@xun-tang
Merge branch 'basesearchcv_pairwise' of github.com:isrobson/scikit-le…
b6a6249 
…arn into xun-13925-add_pairwise_property_to_basesearchcv_master
@xun-tang
Split up two tests for _pairwise
Loading status checks…
fb9ec9e
@xun-tang
Fix flake8 linting
Loading status checks…
0189a95
@jnothman
jnothman approved these changes Nov 4, 2019
View changes
@NicolasHug
NicolasHug approved these changes Nov 5, 2019
View changes
Copy link
Contributor

NicolasHug left a comment

Thanks @xun-tang , just a few comments but LGTM
doc/whats_new/v0.22.rst Show resolved Hide resolved
sklearn/model_selection/tests/test_search.py Show resolved Hide resolved
sklearn/model_selection/tests/test_search.py Show resolved Hide resolved
@xun-tang
Add notes for non-regression tests
Loading status checks…
4b99b80
@xun-tang xun-tang changed the title [MRG] add pairwise property to basesearchcv [MRG + 2] add pairwise property to basesearchcv Nov 6, 2019
@cmarmo

This comment has been minimized.

Sign in to view
Copy link
Member

cmarmo commented Nov 10, 2019

@jnothman , @NicolasHug if you are happy with the changes, this one could be merge?
@jnothman jnothman merged commit 3ef8357 into scikit-learn:master Nov 10, 2019
20 checks passed
20 checks passed
LGTM analysis: C/C++ No code changes detected
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No new or fixed alerts
Details
ci/circleci: deploy Your tests passed on CircleCI!
Details
ci/circleci: doc Your tests passed on CircleCI!
Details
ci/circleci: doc artifact Link to 0/doc/_changed.html
Details
ci/circleci: doc-min-dependencies Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 97.16%)
Details
codecov/project 97.16% (+<.01%) compared to 0aab621
Details
scikit-learn.scikit-learn Build #20191106.68 succeeded
Details
scikit-learn.scikit-learn (Linting) Linting succeeded
Details
scikit-learn.scikit-learn (Linux py35_conda_openblas) Linux py35_conda_openblas succeeded
Details
scikit-learn.scikit-learn (Linux py35_ubuntu_atlas) Linux py35_ubuntu_atlas succeeded
Details
scikit-learn.scikit-learn (Linux pylatest_pip_openblas_pandas) Linux pylatest_pip_openblas_pandas succeeded
Details
scikit-learn.scikit-learn (Linux32 py35_ubuntu_atlas_32bit) Linux32 py35_ubuntu_atlas_32bit succeeded
Details
scikit-learn.scikit-learn (Linux_Runs pylatest_conda_mkl) Linux_Runs pylatest_conda_mkl succeeded
Details
scikit-learn.scikit-learn (Windows py35_pip_openblas_32bit) Windows py35_pip_openblas_32bit succeeded
Details
scikit-learn.scikit-learn (Windows py37_conda_mkl) Windows py37_conda_mkl succeeded
Details
scikit-learn.scikit-learn (macOS pylatest_conda_mkl) macOS pylatest_conda_mkl succeeded
Details
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Nov 10, 2019

Thanks @xun-tang
@xun-tang xun-tang deleted the xun-tang:xun-13925-add_pairwise_property_to_basesearchcv branch Nov 27, 2019
@cmarmo cmarmo mentioned this pull request Dec 12, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnothman jnothman

@NicolasHug NicolasHug

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@xun-tang @cmarmo @jnothman @NicolasHug @isrobson
You can’t perform that action at this time.