Distplot #275

cldougl · 2015-08-05T14:56:15Z

add distplot to FigureFactory
add validate_displot() method to tools.py
add core tests for distplot parameters

- Plotly version of seaborn.distplot to add to FigureFactory - plots histogram, curve (kde or normal), and rugplot

- add `validate_displot()` method to tools.py - add core tests for distplot parameters

- add protected import of scipy to tools.py - add distplot checks to tests_optional

- add scipy.stats - edit examples in docstring

- all distplot tests are depending on scipy

cldougl · 2015-08-05T22:05:43Z

@chriddyp @theengineear @aneda @etpinard
Hey everyone, here's a draft of the distplot (http://stanford.edu/~mwaskom/software/seaborn/generated/seaborn.distplot.html) FigureFactory addition.
One issue though - I'm not sure if the 'protected import' of scipy I tried is how we want to add it / correct in general- the tests won't pass on circle.

chriddyp · 2015-08-06T16:36:46Z

@cldougl from the Circle error:

======================================================================
ERROR: test_distplot_more_args (plotly.tests.test_optional.test_opt_tracefactory.TestDistplot)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/python-api/plotly/tests/test_optional/test_opt_tracefactory.py", line 109, in test_distplot_more_args
    show_rug=False, bin_size=.2)
  File "/home/ubuntu/python-api/plotly/tools.py", line 2418, in create_distplot
    FigureFactory.validate_distplot(hist_data, curve_type)
  File "/home/ubuntu/python-api/plotly/tools.py", line 1541, in validate_distplot
    raise ImportError("FigureFactory.create_distplot requires scipy")
ImportError: FigureFactory.create_distplot requires scipy

it looks like our Circle build doesn't have scipy. Circle will only build the packages that we explicitly configure. Here is the circle configuration file: https://github.com/plotly/python-api/blob/master/circle.yml#L7, note the "optional-requirements.txt" reference. if you add scipy to that file: https://github.com/plotly/python-api/blob/master/optional-requirements.txt, then circle should build it and tests should pass

cldougl · 2015-08-06T16:38:02Z

ahh thank you @chriddyp !!

theengineear · 2015-08-07T16:23:33Z

plotly/tools.py

+    _scipy_imported = True
+except ImportError:
+    _scipy_imported = False
+


Note that this is going to be a merge conflict with #274 . I guess we'll need to have some specific requirements specified... How about a syntax like:

_scipy_imported _scipy__spatial_imported _scipy__cluster__hierarchy_imported

I'm not sure which is going to land first, but the latter will have to implement this.

- DRYing type validation - fix over-indentation

theengineear · 2015-08-24T07:23:37Z

plotly/tools.py

+                "rgb(227, 119, 194)", "rgb(127, 127, 127)",
+                "rgb(188, 189, 34)", "rgb(23, 190, 207)"]
+        self.curve_x = [None]*self.trace_number
+        self.curve_y = [None]*self.trace_number


pep:8ball: spaces around operators

theengineear · 2015-08-24T07:27:02Z

@cldougl awesome! I'm ok with 💃 this. I'd like to let @chriddyp check over it again too though.

chriddyp · 2015-08-28T19:37:15Z

plotly/tools.py

@@ -1501,6 +1508,35 @@ def validate_ohlc(open, high, low, close, direction, **kwargs):
                                         "'both'")

    @staticmethod
+    def validate_distplot(hist_data, curve_type):


can we make these guys hidden? (by adding a _). there's hardly anything I like more than seeing the minimal number of functions in the ipython tab-tab helper:

chriddyp · 2015-08-28T20:59:49Z

plotly/tools.py

+                            zeroline=False),
+                yaxis1=dict(domain=[0., 1],
+                            anchor='free',
+                            position=0.0))


Could we reverse the legend? That way way the rugs will be displayed in the same order as the legend entries. Right now they're in opposite orders

chriddyp · 2015-08-28T21:43:19Z

otherwise, sweet!

- hide validate functions from tab-tab helper - add pandas example and pandas type to validation - replace `**kwargs` with `rug_text` and `colors` in - updated the docstring with Andrew’s nice terse suggestions - hid tick label from rug plot - modified rug_text so its indexed across datasets, not copied - edited examples - added import numpy where needed - increased sample sizes - reversed legend - fix the show_legend issue so a legend is shown if the hist is hidden - add test to test_core to check exception for `scipy_import = False` - edit tests in test optional to reflect the changes (mentioned above) made

- scipy will currently import in test_core

cldougl · 2015-09-14T14:19:51Z

@chriddyp can I merge this?

chriddyp · 2015-09-14T15:07:06Z

Looking good! It doesn't look like the colors argument is working for me:

import plotly.plotly as py
from plotly.tools import FigureFactory as FF
import numpy as np

x1 = np.random.randn(200)
x2 = np.random.randn(200)+1
x3 = np.random.randn(200)-1
x4 = np.random.randn(200)+2

hist_data = [x1] + [x2] + [x3] + [x4]
group_labels = ['2012', '2013', '2014', '2015']

fig = FF.create_distplot(
    hist_data, group_labels, curve_type='normal',
    bin_size=.2, colors=['yellow', 'pink', 'grey', 'aqua'])

iplot(fig)

chriddyp · 2015-09-17T17:51:12Z

Thx for fixing! All good by me now 💃 Can you add some python examples as ipython notebooks to /documentation?

cldougl · 2015-09-17T17:52:43Z

Thanks! yep doc's ready

Distplot

cldougl added 9 commits August 4, 2015 17:58

draft of distplot

7c480a7

- Plotly version of seaborn.distplot to add to FigureFactory - plots histogram, curve (kde or normal), and rugplot

add displot validations

2b84b1e

- add `validate_displot()` method to tools.py - add core tests for distplot parameters

edits re scipy

be77804

- add protected import of scipy to tools.py - add distplot checks to tests_optional

moved scipy dependent tests from core to optional

d88e0f2

edit scipy protected import

8bb46eb

add scipy.stats to protected import

f5240eb

- add scipy.stats - edit examples in docstring

edit scipy import in optional tests

e42634b

move non-scipy dependent checks to test_core

4f442e2

move distplot tests

0f2d92a

- all distplot tests are depending on scipy

add scipy to optional-requirements.txt

dfb59e7

theengineear reviewed Aug 7, 2015
View reviewed changes

cldougl added 2 commits August 7, 2015 13:10

distplot edits

7dd20f4

- DRYing type validation - fix over-indentation

fix setting colors

92458ea

theengineear reviewed Aug 24, 2015
View reviewed changes

pep8 operator spaces

2c5ab6c

chriddyp reviewed Aug 28, 2015
View reviewed changes

cldougl added 5 commits September 4, 2015 15:25

resolve merge conflicts and bump version #

5e8c0d7

edit list combination in examples

2e14a18

missed a _ to hide FF.flatten()

f91130e

comment out test to check import error

f46b00f

- scipy will currently import in test_core

fix colors variable

4702523

cldougl added a commit that referenced this pull request Sep 17, 2015

Merge pull request #275 from plotly/distplot

2a22483

Distplot

cldougl merged commit 2a22483 into master Sep 17, 2015

theengineear deleted the distplot branch September 30, 2015 06:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Distplot #275

Distplot #275

Uh oh!

cldougl commented Aug 5, 2015

Uh oh!

cldougl commented Aug 5, 2015

Uh oh!

chriddyp commented Aug 6, 2015

Uh oh!

cldougl commented Aug 6, 2015

Uh oh!

theengineear Aug 7, 2015

Uh oh!

theengineear Aug 24, 2015

Uh oh!

theengineear Aug 24, 2015

Uh oh!

theengineear commented Aug 24, 2015

Uh oh!

chriddyp Aug 28, 2015

Uh oh!

chriddyp Aug 28, 2015

Uh oh!

chriddyp commented Aug 28, 2015

Uh oh!

cldougl commented Sep 14, 2015

Uh oh!

chriddyp commented Sep 14, 2015

Uh oh!

chriddyp commented Sep 17, 2015

Uh oh!

cldougl commented Sep 17, 2015

Uh oh!

Uh oh!

Uh oh!

Distplot #275

Distplot #275

Uh oh!

Conversation

cldougl commented Aug 5, 2015

Uh oh!

cldougl commented Aug 5, 2015

Uh oh!

chriddyp commented Aug 6, 2015

Uh oh!

cldougl commented Aug 6, 2015

Uh oh!

theengineear Aug 7, 2015

Choose a reason for hiding this comment

Uh oh!

theengineear Aug 24, 2015

Choose a reason for hiding this comment

Uh oh!

theengineear Aug 24, 2015

Choose a reason for hiding this comment

Uh oh!

theengineear commented Aug 24, 2015

Uh oh!

chriddyp Aug 28, 2015

Choose a reason for hiding this comment

Uh oh!

chriddyp Aug 28, 2015

Choose a reason for hiding this comment

Uh oh!

chriddyp commented Aug 28, 2015

Uh oh!

cldougl commented Sep 14, 2015

Uh oh!

chriddyp commented Sep 14, 2015

Uh oh!

chriddyp commented Sep 17, 2015

Uh oh!

cldougl commented Sep 17, 2015

Uh oh!

Uh oh!