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

Skip to content

Fix hinton demo #6606

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 2 commits into from
Jun 19, 2016
Merged

Fix hinton demo #6606

merged 2 commits into from
Jun 19, 2016

Conversation

iliakur
Copy link
Contributor

@iliakur iliakur commented Jun 18, 2016

In the hinton demo the size of rectangles isn't normalized by max_weight. This PR fixes this issue and adds some whitespace around operators in the calculation of max_weight.

After reading the contributor guidelines I chose the 1.5.x branch as the target, feel free to let me know if that's incorrect!

@tacaswell tacaswell added this to the 2.0.1 (next bug fix release) milestone Jun 18, 2016
@tacaswell
Copy link
Member

Targeting 1.5.x is reasonable, but it looks like you added your commits on top of a checkout of master (which is why this show merging 250+ commits.

Can you please cherry-pick your two commits on top v1.5.x and then force-push to your branch.

@jenshnielsen
Copy link
Member

Thanks for the contribution @copper-head Looks correct to me. It looks like you have done your work on top of the master branch but targeted the 1.5.x branch. That means you have a lot of extra commits on this branch. You can either close this PR and open a new one against the master branch and we will take care of backporting. Alternatively you can cherrypick your commits onto a branch based of 1.5.x

@iliakur
Copy link
Contributor Author

iliakur commented Jun 19, 2016

Ah, sorry, I done goofed. Should be fixed now, I think.

@jenshnielsen jenshnielsen merged commit 1caf775 into matplotlib:v1.5.x Jun 19, 2016
@jenshnielsen
Copy link
Member

Thanks, looks good

@QuLogic QuLogic modified the milestones: 1.5.2 (Critical bug fix release), 2.0.1 (next bug fix release) Jun 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants