[examples/] use np.radians/np.degrees where appropriate

twmr · twmr · commit 7bcca510cde8 · 2014-07-03T19:54:14.000+02:00
diff --git a/examples/animation/double_pendulum_animated.py b/examples/animation/double_pendulum_animated.py
@@ -47,10 +47,8 @@ def derivs(state, t):
 th2 = -10.0
 w2 = 0.0
 
-rad = pi / 180
-
 # initial state
-state = np.array([th1, w1, th2, w2]) * pi / 180.
+state = np.radians([th1, w1, th2, w2])
 
 # integrate your ODE using scipy.integrate.
 y = integrate.odeint(derivs, state, t)
diff --git a/examples/pylab_examples/tricontour_demo.py b/examples/pylab_examples/tricontour_demo.py
@@ -45,7 +45,7 @@
 # the three points that make up the triangle, ordered in either a clockwise or
 # anticlockwise manner.
 
-xy = np.asarray([
+xy = np.degrees([
     [-0.101, 0.872], [-0.080, 0.883], [-0.069, 0.888], [-0.054, 0.890],
     [-0.045, 0.897], [-0.057, 0.895], [-0.073, 0.900], [-0.087, 0.898],
     [-0.090, 0.904], [-0.069, 0.907], [-0.069, 0.921], [-0.080, 0.919],
@@ -65,8 +65,6 @@
     [-0.057, 0.881], [-0.062, 0.876], [-0.078, 0.876], [-0.087, 0.872],
     [-0.030, 0.907], [-0.007, 0.905], [-0.057, 0.916], [-0.025, 0.933],
     [-0.077, 0.990], [-0.059, 0.993]])
-x = xy[:, 0]*180/3.14159
-y = xy[:, 1]*180/3.14159
 x0 = -5
 y0 = 52
 z = np.exp(-0.01*((x-x0)*(x-x0) + (y-y0)*(y-y0)))
diff --git a/examples/pylab_examples/tripcolor_demo.py b/examples/pylab_examples/tripcolor_demo.py
@@ -52,7 +52,7 @@
 # the three points that make up the triangle, ordered in either a clockwise or
 # anticlockwise manner.
 
-xy = np.asarray([
+xy = np.degrees([
     [-0.101, 0.872], [-0.080, 0.883], [-0.069, 0.888], [-0.054, 0.890],
     [-0.045, 0.897], [-0.057, 0.895], [-0.073, 0.900], [-0.087, 0.898],
     [-0.090, 0.904], [-0.069, 0.907], [-0.069, 0.921], [-0.080, 0.919],
@@ -72,8 +72,6 @@
     [-0.057, 0.881], [-0.062, 0.876], [-0.078, 0.876], [-0.087, 0.872],
     [-0.030, 0.907], [-0.007, 0.905], [-0.057, 0.916], [-0.025, 0.933],
     [-0.077, 0.990], [-0.059, 0.993]])
-x = xy[:, 0]*180/3.14159
-y = xy[:, 1]*180/3.14159
 
 triangles = np.asarray([
     [67, 66,  1], [65,  2, 66], [ 1, 66,  2], [64,  2, 65], [63,  3, 64],
diff --git a/examples/pylab_examples/triplot_demo.py b/examples/pylab_examples/triplot_demo.py
@@ -43,7 +43,7 @@
 # the three points that make up the triangle, ordered in either a clockwise or
 # anticlockwise manner.
 
-xy = np.asarray([
+xy = np.degrees([
     [-0.101, 0.872], [-0.080, 0.883], [-0.069, 0.888], [-0.054, 0.890],
     [-0.045, 0.897], [-0.057, 0.895], [-0.073, 0.900], [-0.087, 0.898],
     [-0.090, 0.904], [-0.069, 0.907], [-0.069, 0.921], [-0.080, 0.919],
@@ -63,8 +63,6 @@
     [-0.057, 0.881], [-0.062, 0.876], [-0.078, 0.876], [-0.087, 0.872],
     [-0.030, 0.907], [-0.007, 0.905], [-0.057, 0.916], [-0.025, 0.933],
     [-0.077, 0.990], [-0.059, 0.993]])
-x = xy[:, 0]*180/3.14159
-y = xy[:, 1]*180/3.14159
 
 triangles = np.asarray([
     [67, 66,  1], [65,  2, 66], [ 1, 66,  2], [64,  2, 65], [63,  3, 64],
diff --git a/examples/units/ellipse_with_units.py b/examples/units/ellipse_with_units.py
@@ -12,11 +12,11 @@
 width, height = 1e-1*cm, 3e-1*cm
 angle = -30
 
-theta = np.arange(0.0, 360.0, 1.0)*np.pi/180.0
+theta = np.radians(np.arange(0.0, 360.0, 1.0))
 x = 0.5 * width * np.cos(theta)
 y = 0.5 * height * np.sin(theta)
 
-rtheta = angle*np.pi/180.
+rtheta = np.radians(angle)
 R = np.array([
     [np.cos(rtheta),  -np.sin(rtheta)],
     [np.sin(rtheta), np.cos(rtheta)],
