Fix merge issues for better SVR plot #12877
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: examples/svm/plot_svm_regression.py
jnothman
reviewed
Dec 30, 2018
examples/svm/plot_svm_regression.py
Outdated
| plt.legend() | ||
| fig, (ax1, ax2, ax3) = plt.subplots(1, 3, figsize=(15, 10), sharey=True) | ||
|
|
||
| ax1.plot(X, y_rbf, color='m', lw=lw, label='RBF model') |
There was a problem hiding this comment.
Could we please make use of a loop to avoid this repeated code now that we have three separate plots?
There was a problem hiding this comment.
Hi @jnothman. I created a loop for the plots, committed the code, and passed testing. Please let me know if there is anything else.
jnothman
approved these changes
Jan 9, 2019
| plt.title('Support Vector Regression') | ||
| plt.legend() | ||
|
|
||
| svrs = [svr_rbf, svr_lin, svr_poly] |
There was a problem hiding this comment.
I would perhaps rather an idiom with models = [{'est': svr_rbf, 'label': 'RBF', 'color': 'm', 'ax': axes[0]}], but this is fine by me.
|
Thanks! |
|
thank you!! @mferrari3 @jnothman and also to @ml4713 & @vasudhathinks |
jnothman
pushed a commit
to jnothman/scikit-learn
that referenced
this pull request
Feb 19, 2019
With thanks to @rishikksh20 and @ml4713
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
With thanks to @rishikksh20 and @ml4713
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
This reverts commit a517ced.
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
This reverts commit a517ced.
koenvandevelde
pushed a commit
to koenvandevelde/scikit-learn
that referenced
this pull request
Jul 12, 2019
With thanks to @rishikksh20 and @ml4713
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference Issues/PRs
This fixes #8365
This also closes #8367 and closes #12207
What does this implement/fix? Explain your changes.
This fixes the merge errors because the only failure was with the python 2.7 test and the update master no longer tests in python 2.7.
Any other comments?
cc: @reshamas
#wimlds