Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[MRG + 1] 13 more examples fixed with matplotlib2.0 update #9029

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

Merged
merged 22 commits into from
Jun 28, 2017

Conversation

thismlguy
Copy link
Contributor

13 more examples updated with matplotlib 2.0 updates.

Fixes issue #8364

The old and new plots will be posted soon after circleCI build completes.

@tguillemot
Copy link
Contributor

tguillemot commented Jun 7, 2017

Can you check flake8 for examples/ensemble/plot_forest_iris.py ?
Can you also add before/after please ?

@@ -95,11 +97,14 @@
scores = clf.score(X, y)
# Create a title for each column and the console by using str() and
# slicing away useless parts of the string
model_title = str(type(model)).split(".")[-1][:-2][:-len("Classifier")]
model_title = str(type(model)).split(
".")[-1][:-2][:-len("Classifier")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Certainly a flake8 pb here ?

# surfaces. These points are regularly space and do not have a
# black outline
xx_coarser, yy_coarser = np.meshgrid(np.arange(x_min, x_max,
plot_step_coarser),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe :

xx_coarser, yy_coarser = np.meshgrid(
    np.arange(x_min, x_max, plot_step_coarser),
    np.arange(y_min, y_max, plot_step_coarser))

@thismlguy
Copy link
Contributor Author

somehow flake8 on my local doesn't give this error. I tried the older version 2.5.1 as well. Read on stack over-flow that its an indentation issue. Hopefully its fixed now as I couldn't test it on my local.

Will share old/new for this and the other PR once all checks are passed.

@tguillemot
Copy link
Contributor

OK thanks @aarshayj

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

cross_decomposition/plot_compare_cross_decomposition.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

datasets/plot_iris_dataset.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

datasets/plot_random_dataset.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

decomposition/plot_kernel_pca.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

ensemble/plot_adaboost_twoclass.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

ensemble/plot_forest_iris.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

ensemble/plot_isolation_forest.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

ensemble/plot_partial_dependence.html

Old:

New:

The other image was not changed

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

ensemble/plot_random_forest_embedding.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 7, 2017

ensemble/plot_random_forest_regression_multioutput.html

Old:

New:

@thismlguy
Copy link
Contributor Author

thismlguy commented Jun 10, 2017

yeah the colors not matching up looks like a bug, though I did find that really hard to do... I think using imshow instead of contourf makes it easier.

@amueller - i resolved it back to the default colormap so that the colors of the dots and contour match. i know that it doesn't look great but will that work? using other colors and matching will add some lines of code which will complicate the example. sounds like a fair trade-off?

Also, all the plots here are updated with the latest circleCI build. still awaiting Appveyor build to complete.

@amueller
Copy link
Member

You can merge master to fix the appveyor builds if you want, but it's not critical because unrelated

@amueller amueller added this to the 0.19 milestone Jun 19, 2017
@amueller amueller changed the title 13 more examples fixed with matplotlib2.0 update [MRG + 1] 13 more examples fixed with matplotlib2.0 update Jun 19, 2017
@amueller
Copy link
Member

LGTM :)

@thismlguy
Copy link
Contributor Author

You can merge master to fix the appveyor builds if you want, but it's not critical because unrelated

I didn't get it. How can I merge master? Do you mean merge on my local and send a PR to master directly?

@jnothman
Copy link
Member

jnothman commented Jun 19, 2017 via email

@thismlguy
Copy link
Contributor Author

@jnothman - ahh i see what @amueller meant. thanks!

@amueller
Copy link
Member

If you do that, the red cross goes away, which might encourage reviewers ;)

@raghavrv
Copy link
Member

@aarshayj could you do update with master? I'll merge once the CIs pass. This looks good to me.

@thismlguy
Copy link
Contributor Author

@raghavrv - i've merged master. pls merge when the tests pass.

@ogrisel ogrisel merged commit a74d31a into scikit-learn:master Jun 28, 2017
@ogrisel
Copy link
Member

ogrisel commented Jun 28, 2017

LGTM, I merged. Thanks @aarshayj!

@amueller
Copy link
Member

was that all of them now @aarshayj ?

midinas pushed a commit to midinas/scikit-learn that referenced this pull request Jun 29, 2017
midinas pushed a commit to midinas/scikit-learn that referenced this pull request Jun 29, 2017
@thismlguy thismlguy deleted the example_modifications_set2 branch June 29, 2017 18:21
@thismlguy
Copy link
Contributor Author

@amueller - yes all of the unresolved ones from #8364 are covered.

@GaelVaroquaux
Copy link
Member

GaelVaroquaux commented Jul 1, 2017 via email

dmohns pushed a commit to dmohns/scikit-learn that referenced this pull request Aug 7, 2017
dmohns pushed a commit to dmohns/scikit-learn that referenced this pull request Aug 7, 2017
NelleV pushed a commit to NelleV/scikit-learn that referenced this pull request Aug 11, 2017
paulha pushed a commit to paulha/scikit-learn that referenced this pull request Aug 19, 2017
AishwaryaRK pushed a commit to AishwaryaRK/scikit-learn that referenced this pull request Aug 29, 2017
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
jwjohnson314 pushed a commit to jwjohnson314/scikit-learn that referenced this pull request Dec 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants