Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

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.

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
theengineear merged 38 commits into master from dendrogram-andrew-tweaks
Oct 2, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
3d6dbb9
Added Dendrogram class and tests
merenlin Jul 28, 2015
2d9b88c
Added a small validator
merenlin Aug 4, 2015
819e41e
updates after renaming
merenlin Aug 4, 2015
3781906
Moved dendrogram tests to optional
merenlin Aug 12, 2015
31efa33
Protected scipy imports
merenlin Aug 12, 2015
02beb6c
Fixed typos, docstring and return value
merenlin Aug 12, 2015
bfd3cca
Typo
merenlin Aug 12, 2015
ff98cb7
Fixing default colors mapping
merenlin Aug 15, 2015
4afc8c9
Minor styling changes and fixes
merenlin Aug 15, 2015
57e15bd
pep8 and docsrings
merenlin Aug 15, 2015
b7d3d31
pep8 in tests
merenlin Aug 15, 2015
44cdece
Styling and imports
merenlin Aug 28, 2015
16c74c1
Cleanup of labels, axis and tests
merenlin Sep 1, 2015
ebff53e
Added more tests and fixed axis reference
merenlin Sep 1, 2015
0de0349
another fix for axis confusion
merenlin Sep 1, 2015
20fc40c
Added colorscale test
merenlin Sep 4, 2015
88842b1
cow comments
merenlin Sep 4, 2015
b9352d7
Merge branch 'master' into dendrogram-andrew-tweaks
theengineear Sep 30, 2015
e7bf58c
Duplicate `width` to `height` in layout update.
theengineear Sep 30, 2015
3632084
Make docs a little bit more consistent.
theengineear Sep 30, 2015
8aea12e
Spell check.
theengineear Sep 30, 2015
fae2047
pep:8ball:
theengineear Sep 30, 2015
723dde4
pep:8ball:
theengineear Sep 30, 2015
806a6e0
`autoscale` —> `autosize`
theengineear Sep 30, 2015
ca08777
Add a `NumpyTestUtilsMixin` to help dict comps.
theengineear Sep 30, 2015
8866e34
Show that the dendrogram test should have failed!
theengineear Sep 30, 2015
d0b0f6a
Fix dendrogram test, lock down *entire* figure.
theengineear Sep 30, 2015
fc7ce40
Merge branch 'dendrogram-andrew-tweaks' of https://github.com/plotly/...
theengineear Sep 30, 2015
bed3bec
Lock down `test_dendrogram_random_matrix` test.
theengineear Sep 30, 2015
f3b57fc
Fix duplicated `test_dendrogram_orientation` test.
theengineear Sep 30, 2015
3cf13ae
Lock down `test_dendrogram_orientation_two` spec.
theengineear Sep 30, 2015
dab5d37
Rename `.._orientation_two` —> `.._colorscale`.
theengineear Sep 30, 2015
89592cd
PY3 fix. Can’t index a `.keys()` view.
theengineear Sep 30, 2015
3e3de24
Loosen `dtype` on constructor in test. (PY3 fail).
theengineear Sep 30, 2015
76361e6
Rename test suite for figure factory.
theengineear Sep 30, 2015
85dccd1
Merge branch 'master' into dendrogram-andrew-tweaks
theengineear Oct 1, 2015
01d2826
For consistency use Fixed and Added in changelog.
theengineear Oct 1, 2015
3815a8f
version bump —> 1.8.7 (added dendrogram)
theengineear Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pep:8ball:
  • Loading branch information
theengineear committed Sep 30, 2015
commit fae204752f4331cc99f07a0274dda4ed710197a5
14 changes: 7 additions & 7 deletions plotly/tests/test_optional/test_opt_tracefactory.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,8 @@ def test_simple_streamline(self):
class TestDendrogram(TestCase):

def test_default_dendrogram(self):
dendro = tls.FigureFactory.create_dendrogram(X=np.array([[1, 2, 3, 4],
[1, 1, 3, 4],
[1, 2, 1, 4],
[1, 2, 3, 1]]))
X = np.array([[1, 2, 3, 4], [1, 1, 3, 4], [1, 2, 1, 4], [1, 2, 3, 1]])
dendro = tls.FigureFactory.create_dendrogram(X=X)
expected_data = [{'marker': {'color': 'rgb(255,133,27)'},
'mode': 'lines', 'xaxis': 'xs',
'yaxis': 'y',
Expand Down Expand Up @@ -348,7 +346,9 @@ def test_dendrogram_orientation(self):
dendro_bottom = tls.FigureFactory.create_dendrogram(
X, orientation='bottom')
self.assertEqual(len(dendro_bottom['layout']['xaxis']['ticktext']), 5)
tickvals_bottom = np.array(dendro_bottom['layout']['xaxis']['tickvals'])
tickvals_bottom = np.array(
dendro_bottom['layout']['xaxis']['tickvals']
)
self.assertTrue((tickvals_bottom >= 0).all())

dendro_top = tls.FigureFactory.create_dendrogram(X, orientation='top')
Expand All @@ -361,8 +361,8 @@ def test_dendrogram_orientation(self):
[1, 2, 1, 4],
[1, 2, 3, 1]])
greyscale = [
'rgb(0,0,0)', # black
'rgb(05,105,105)', # dim grey
'rgb(0,0,0)', # black
'rgb(05,105,105)', # dim grey
'rgb(128,128,128)', # grey
'rgb(169,169,169)', # dark grey
'rgb(192,192,192)', # silver
Expand Down
16 changes: 8 additions & 8 deletions plotly/tools.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3272,14 +3272,14 @@ def get_color_dict(self, colorscale):

if colorscale is None:
colorscale = [
'rgb(0,116,217)', # blue
'rgb(0,116,217)', # blue
'rgb(35,205,205)', # cyan
'rgb(61,153,112)', # green
'rgb(40,35,35)', # black
'rgb(133,20,75)', # magenta
'rgb(255,65,54)', # red
'rgb(255,255,255)', # white
'rgb(255,220,0)'] # yellow
'rgb(40,35,35)', # black
'rgb(133,20,75)', # magenta
'rgb(255,65,54)', # red
'rgb(255,255,255)', # white
'rgb(255,220,0)'] # yellow

for i in range(len(default_colors.keys())):
k = default_colors.keys()[i]
Expand Down Expand Up @@ -3313,8 +3313,8 @@ def set_axis_layout(self, axis_key):
axis_key_labels = self.yaxis
if axis_key_labels not in self.layout:
self.layout[axis_key_labels] = {}
self.layout[axis_key_labels]['tickvals'] = [zv*self.sign[axis_key]
for zv in self.zero_vals]
self.layout[axis_key_labels]['tickvals'] = \
[zv*self.sign[axis_key] for zv in self.zero_vals]
self.layout[axis_key_labels]['ticktext'] = self.labels
self.layout[axis_key_labels]['tickmode'] = 'array'

Expand Down

AltStyle によって変換されたページ (->オリジナル) /