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

Skip to content

Dendrogram andrew tweaks #312

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 38 commits into from
Oct 2, 2015
Merged

Dendrogram andrew tweaks #312

merged 38 commits into from
Oct 2, 2015

Conversation

theengineear
Copy link
Contributor

This is based off of @OxanaSachenkova 's branch, which added Dendrogram plots \o/\o/\o/

Todo:

  • version bump
  • changelog

merenlin and others added 30 commits August 4, 2015 12:55
@merenlin
Added Dendrogram class and tests
3d6dbb9
@merenlin
Added a small validator
2d9b88c
@merenlin
updates after renaming
819e41e
@merenlin
Moved dendrogram tests to optional
3781906
@merenlin
Protected scipy imports
31efa33
@merenlin
Fixed typos, docstring and return value
02beb6c
@merenlin
Typo
bfd3cca
@merenlin
Fixing default colors mapping
ff98cb7
@merenlin
Minor styling changes and fixes
4afc8c9
@merenlin
pep8 and docsrings
57e15bd
@merenlin
pep8 in tests
b7d3d31
@merenlin
Styling and imports
44cdece
@merenlin
Cleanup of labels, axis and tests
16c74c1
@merenlin
Added more tests and fixed axis reference
ebff53e
@merenlin
another fix for axis confusion
0de0349
@merenlin
Added colorscale test
20fc40c
@merenlin
cow comments
88842b1
@theengineear
Merge branch 'master' into dendrogram-andrew-tweaks
b9352d7 
Conflicts:
	plotly/tools.py
@theengineear
Duplicate width to height in layout update.
e7bf58c
@theengineear
Make docs a little bit more consistent.
3632084
@theengineear
Spell check.
8aea12e
@theengineear
pep:8ball:
fae2047
@theengineear
pep:8ball:
723dde4
@theengineear
autoscale —> autosize
806a6e0
@theengineear
Add a NumpyTestUtilsMixin to help dict comps.
ca08777 
The difficulty of comparing dicts with nested either (a) ndarrays or (b)
number arrays that equal one another up-to-a-tolerance was preventing us
from writing stronger tests.

This is far from perfect, but it allows you to just throw a set of dict
objects in without getting false negative results.
@theengineear
Show that the dendrogram test should have failed!
8866e34
@theengineear
Fix dendrogram test, lock down *entire* figure.
d0b0f6a
@theengineear
Merge branch 'dendrogram-andrew-tweaks' of https://github.com/plotly/…
fc7ce40 
…python-api into dendrogram-andrew-tweaks

Conflicts:
	plotly/tests/test_optional/test_opt_tracefactory.py
@theengineear
Lock down test_dendrogram_random_matrix test.
bed3bec
@theengineear
Fix duplicated test_dendrogram_orientation test.
f3b57fc
@theengineear
Copy link
Contributor Author

@OxanaSachenkova , I mostly did some re-arranging and I tried to strengthen the test suite by always checking the full objects that get returned from your code-paths.

Mind giving the tests a look to make sure they're as expected?

@theengineear
Copy link
Contributor Author

@etpinard @chriddyp @cldougl this has been looked over a bunch and is going in as beta functionality. Think we can merge it in?

@chriddyp
Copy link
Member

looks good to me! can you add whatever ipython notebook that you've been using to test-run this package to the documentation repo when it's merged? you'll just need to add one line to the end of the notebook that describes the URL, etc. See here for an example: https://github.com/plotly/documentation/blob/source/_posts/python/finance/candlestick-charts.ipynb

@merenlin
Copy link
Contributor

@chriddyp will do! just need to polish it up a bit, quite messy right now

@theengineear theengineear mentioned this pull request Oct 1, 2015
Closed
@theengineear
Copy link
Contributor Author

Can we 💃 on it?

@chriddyp
Copy link
Member

chriddyp commented Oct 2, 2015

💃

theengineear added a commit that referenced this pull request Oct 2, 2015
@theengineear
Merge pull request #312 from plotly/dendrogram-andrew-tweaks
814c1d5 
Dendrogram andrew tweaks
@theengineear theengineear merged commit 814c1d5 into master Oct 2, 2015
@theengineear theengineear deleted the dendrogram-andrew-tweaks branch October 2, 2015 07:52
@theengineear
Copy link
Contributor Author

Thanks again @OxanaSachenkova !

@jackparmer
Copy link
Contributor

Hey @cldougl Could add some dendrogram examples to the Python docs when you have some free time? I want to get these into next month's blog posts.

@cldougl
Copy link
Member

cldougl commented Oct 20, 2015

@theengineear @chriddyp
not sure the dendrograms are still embedding in notebooks correctly http://nbviewer.ipython.org/gist/cldougl/cfdffaf7b8b0185af552 (unless I'm doing something wrong but they're fine not embedded https://plot.ly/~chelsea_lyn/7664 ).

@chriddyp
Copy link
Member

@cldougl - can you try moving the height and width into the layout and out
of iplot?

On Tue, Oct 20, 2015 at 3:46 PM, Chelsea [email protected] wrote:

@theengineear https://github.com/theengineear @chriddyp
https://github.com/chriddyp
not sure the dendrograms are still embedding in notebooks correctly
http://nbviewer.ipython.org/gist/cldougl/cfdffaf7b8b0185af552 (unless I'm
doing something wrong but they're fine not embedded
https://plot.ly/~chelsea_lyn/7664 ).

—
Reply to this email directly or view it on GitHub
#312 (comment).

Chris Parmer
Plotly, Chief Product Officer
514 571 5897
https://plot.ly/team

@cldougl
Copy link
Member

cldougl commented Oct 20, 2015

yep that works- I'll update the examples in the docstring

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@theengineear @chriddyp @merenlin @jackparmer @cldougl @etpinard