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

Add Quiver and Streamline Functions #222

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

Closed
cldougl wants to merge 34 commits into plotly:master from cldougl:master
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
1b1b7f6
Add Quiver and Streamline Functions
cldougl May 25, 2015
67f8254
Quiver and Streamline Edits
cldougl May 27, 2015
0b73695
quiver and streamline tests
cldougl May 27, 2015
e77ca80
Quiver and Streamline edits
cldougl May 28, 2015
bfbc83e
Quiver Test
cldougl May 28, 2015
aef86ba
Quiver Test
cldougl May 28, 2015
c28e1a3
Quiver Test
cldougl May 28, 2015
0af88c5
Quiv test
cldougl May 28, 2015
9544265
Quiver Test
cldougl May 28, 2015
f12ac2d
streamline test
cldougl May 28, 2015
850a5c7
change x,y from array to list
cldougl May 28, 2015
dc8092b
test one arrow assertion
cldougl May 28, 2015
2c74747
change from arrays to lists
cldougl May 28, 2015
da055a4
fix assertion error
cldougl May 28, 2015
fff3a1f
update to quiver tests
cldougl May 29, 2015
3fc00ea
fix quiver test
cldougl May 29, 2015
dc55e05
fix quiv test
cldougl May 29, 2015
76ec94f
quiver test
cldougl May 29, 2015
72a3b43
test quiv
cldougl May 29, 2015
f4d0973
test quiv
cldougl May 29, 2015
59e9ca0
test quiv
cldougl May 29, 2015
ca33267
test quiver
cldougl May 29, 2015
302f77f
quiver test
cldougl May 29, 2015
6245375
test
cldougl May 29, 2015
70d78f6
test spacing
cldougl May 29, 2015
f6d043d
Quiver edits
cldougl Jun 4, 2015
427d499
Quiver edits
cldougl Jun 9, 2015
573dd6e
update quiver test
cldougl Jun 10, 2015
b7a6a8a
Quiver edits based on feedback
cldougl Jun 12, 2015
943b762
Adding Streamline class and core test
cldougl Jun 16, 2015
c3c52af
TraceFactory update
cldougl Jun 23, 2015
136a249
TraceFactory tests
cldougl Jun 23, 2015
50d7dd1
Update TraceFactory and examples
cldougl Jun 25, 2015
3addb46
renaming streamline
cldougl Jun 26, 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
112 changes: 112 additions & 0 deletions plotly/tests/test_core/test_tools/test_TraceFactory.py
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
from unittest import TestCase
from plotly.graph_objs import graph_objs, Scatter, Data, Marker, Line, Trace
from plotly.exceptions import PlotlyError

import plotly.plotly as py
import plotly.tools as tls
import math
from nose.tools import raises


@raises(PlotlyError)
Copy link
Contributor

@theengineear theengineear Jun 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐄 you can just stick these in your test case:

def TestQuiver(TestCase):
 def test_unequal_xy_length():
 kwargs = {'x': [1], 'y': [1], 'u': [1, 2], 'v': [1, 2]}
 self.assertRaises(PlotlyError, tls.TraceFactory.create_quiver, **kwargs)

def test_unequal_xy_length():
data = tls.TraceFactory.create_quiver(x=[1, 2], y=[1], u=[1, 2], v=[1, 2])


@raises(ValueError)
def test_wrong_scale():
data = tls.TraceFactory.create_quiver(x=[1], y=[1], u=[1], v=[1],
scale=0)


@raises(ValueError)
def test_wrong_arrow_scale():
data = tls.TraceFactory.create_quiver(x=[1], y=[1], u=[1], v=[1],
arrow_scale=-1)


class TestQuiver(TestCase):

def test_one_arrow(self):
self.assertAlmostEqual(tls.TraceFactory.create_quiver(x=[1], y=[1],
Copy link
Contributor

@theengineear theengineear Jun 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐄 This seems like more work that it's worth, but trust me : D

Try and make tests as clear as possible this is one of the places that we'll look at with a lot of scrutiny for code review and this is what keeps stuff working as expected! It's trivial to you now, but this is super helpful to future debuggers (which could be you!).

How about:

 def test_one_arrow(self):
 # we should be able to create a single arrow using create_quiver
 quiver = tls.TraceFactory.create_quiver(x=[1], y=[1], u=[1], v=[1], scale=1)
 expected_quiver = {
 'y': [1, 2, None, 1.615486170766527, 2, 1.820698256761928, None],
 'x': [1, 2, None, 1.820698256761928, 2, 1.615486170766527, None],
 'type': 'scatter',
 'mode': 'lines'
 }
 self.assertEqual(quiver, expected_quiver)

u=[1], v=[1],
scale=1),
{'y': [1, 2, None, 1.615486170766527, 2,
1.820698256761928, None], 'x': [1, 2, None,
1.820698256761928, 2, 1.615486170766527, None],
'type': 'scatter', 'mode': 'lines'})

def test_more_kwargs(self):
self.assertAlmostEqual(tls.TraceFactory.create_quiver(x=[1, 2],
y=[1, 2],
u=[math.cos(1),
math.cos(2)],
v=[math.sin(1),
math.sin(2)],
arrow_scale=.4,
angle=math.pi/6,
line=Line(
color='purple',
width=3)),
{'y': [1, 1.0841470984807897, None, 2,
2.0909297426825684, None,
1.044191642387781, 1.0841470984807897,
1.0658037346225067, None,
2.0677536925644366, 2.0909297426825684,
2.051107819102551, None],
'x': [1, 1.0540302305868139, None, 2,
1.9583853163452858, None,
1.052143029378767, 1.0540302305868139,
1.0184841899864512, None,
1.9909870141679737, 1.9583853163452858,
1.9546151170949464, None],
'line': {'color': 'purple', 'width': 3},
'type': 'scatter', 'mode': 'lines', })


@raises(ValueError)
def test_wrong_arrow_scale():
stream = tls.TraceFactory.create_streamline(x=[0, 2], y=[0, 2],
u=[[-1, -5], [-1, -5]],
v=[[1, 1], [-3, -3]],
arrow_scale=0)


@raises(ValueError)
def test_wrong_density():
stream = tls.TraceFactory.create_streamline(x=[0, 2], y=[0, 2],
u=[[-1, -5], [-1, -5]],
v=[[1, 1], [-3, -3]],
density=-1)


@raises(PlotlyError)
def test_uneven_x():
stream = tls.TraceFactory.create_streamline(x=[0, 2, 7, 9], y=[0, 2, 4, 6],
u=[[-1, -5], [-1, -5]],
v=[[1, 1], [-3, -3]])


@raises(PlotlyError)
def test_uneven_y():
stream = tls.TraceFactory.create_streamline(x=[0, 2, 4], y=[0, 2, 6],
u=[[-1, -5], [-1, -5]],
v=[[1, 1], [-3, -3]])


class TestStreamline(TestCase):

def test_simple(self):
self.assertEqual((tls.TraceFactory.create_streamline(x=[0, 2],
y=[0, 2],
u=[[-1, -5],
[-1, -5]],
v=[[1, 1],
[-3, -3]],
density=2,
arrow_scale=.4,
angle=math.pi/6,
line=Line(
color='purple',
width=3))).keys(),
(['y', 'x', 'line', 'type', 'mode']))
Copy link
Contributor

@theengineear theengineear Jun 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐅 this doesn't really test that create_streamline works. Mind adding a few more tests? These should really include bad param tests to make sure we're not blindly returning garbage out when there's garbage in.

Loading

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