Cleanup of labels, axis and tests

Author: merenlin

plotly/tests/test_optional/test_opt_tracefactory.py

@@ -115,29 +115,29 @@ def test_default_dendrogram(self):
                                                                  [1, 2, 3, 1]]))
         expected_dendro_data = [{'marker': {'color': 'rgb(255,133,27)'},
                                  'mode': 'lines', 'xaxis': 'xs',
-                                 'yaxis': 'ys',
+                                 'yaxis': 'y',
                                  'y': np.array([0.,  1.,  1.,  0.]),
                                  'x': np.array([25.,  25.,  35.,  35.]),
                                  'type': u'scatter'},
                                 {'marker': {'color': 'rgb(255,133,27)'},
                                  'mode': 'lines',
-                                 'xaxis': 'xs',
-                                 'yaxis': 'ys',
+                                 'xaxis': 'x',
+                                 'yaxis': 'y',
                                  'y': np.array([0., 2.23606798,
                                                2.23606798, 1.]),
                                  'x': np.array([15., 15., 30., 30.]),
                                  'type': u'scatter'},
                                 {'marker': {'color': 'blue'},
                                  'mode': 'lines',
-                                 'xaxis': 'xs',
-                                 'yaxis': 'ys',
+                                 'xaxis': 'x',
+                                 'yaxis': 'y',
                                  'y': np.array([0., 3.60555128,
                                                3.60555128, 2.23606798]),
                                  'x': np.array([5., 5., 22.5, 22.5]),
                                  'type': u'scatter'}]
 
         self.assertEqual(len(dendro['data']), len(expected_dendro_data))
-        self.assertTrue(np.array_equal(dendro['labels'],
+        self.assertTrue(np.array_equal(dendro['layout']['x']['ticktext'],
                                        np.array(['3', '2', '0', '1'])))
 
         for i in range(1, len(dendro['data'])):
@@ -152,7 +152,32 @@ def test_dendrogram_random_matrix(self):
         # variable 2 is correlated with all the other variables
         X[2, :] = sum(X, 0)
 
-        dendro = tls.FigureFactory.create_dendrogram(X)
+        names = ['Jack', 'Oxana', 'John', 'Chelsea', 'Mark']
+        dendro = tls.FigureFactory.create_dendrogram(X, labels=names)
 
-        # Check that 2 is in a separate cluster
-        self.assertEqual(dendro['labels'][0], '2')
+        # Check that 2 is in a separate cluster and it's labelled correctly
+        self.assertEqual(dendro['layout']['x']['ticktext'][0], 'John')
+
+    def test_dendrogram_orientation(self):
+        X = np.random.rand(5, 5) 
+
+        dendro_left = tls.FigureFactory.create_dendrogram(X, orientation='left')
+
+        self.assertEqual(len(dendro_left['layout']['y']['ticktext']), 5)
+        tickvals_left = np.array(dendro_left['layout']['y']['tickvals'])
+        self.assertTrue((tickvals_left <= 0).all())
+
+        dendro_right = tls.FigureFactory.create_dendrogram(X, orientation='right')
+        tickvals_right = np.array(dendro_right['layout']['y']['tickvals'])
+        self.assertTrue((tickvals_right >= 0).all())
+
+        dendro_bottom = tls.FigureFactory.create_dendrogram(X, orientation='bottom')
+        self.assertEqual(len(dendro_bottom['layout']['x']['ticktext']), 5)
+        tickvals_bottom = np.array(dendro_bottom['layout']['x']['tickvals'])
+        self.assertTrue((tickvals_bottom >= 0).all())
+
+        dendro_top = tls.FigureFactory.create_dendrogram(X, orientation='top')
+        tickvals_top = np.array(dendro_top['layout']['x']['tickvals'])
+        self.assertTrue((tickvals_top <= 0).all())
+
+      

plotly/tools.py

@@ -2346,8 +2346,7 @@ def create_dendrogram(X, orientation="bottom", labels=None,
         dendrogram = _Dendrogram(X, orientation, labels, colorscale)
 
         return {'layout': dendrogram.layout,
-                'data': dendrogram.data,
-                'labels': dendrogram.labels}
+                'data': dendrogram.data}
 
 
 class _Quiver(FigureFactory):
@@ -2953,7 +2952,7 @@ class _Dendrogram(FigureFactory):
     """
 
     def __init__(self, X, orientation='bottom', labels=None, colorscale=None,
-                 width="100%", height="100%", xaxis='xaxis', yaxis='yaxis'):
+                 width="100%", height="100%", xaxis='x', yaxis='y'):
         self.orientation = orientation
         self.labels = labels
         self.xaxis = xaxis
@@ -3125,8 +3124,8 @@ def get_dendrogram_traces(self, X, colorscale):
                             y=np.multiply(self.sign[self.yaxis], ys),
                             mode='lines',
                             marker=Marker(color=colors[color_key]))
-            trace['xaxis'] = 'x'+self.xaxis[-1]
-            trace['yaxis'] = 'y'+self.yaxis[-1]
+            trace['xaxis'] = self.xaxis
+            trace['yaxis'] = self.yaxis
             trace_list.append(trace)
 
         return trace_list, icoord, dcoord, ordered_labels, P['leaves']