hypot / **2 instead of x * x

anntzer · anntzer · commit f24cbcaf4be9 · 2016-12-04T20:31:18.000-08:00
diff --git a/examples/animation/unchained.py b/examples/animation/unchained.py
@@ -25,7 +25,7 @@
 # Generate random data
 data = np.random.uniform(0, 1, (64, 75))
 X = np.linspace(-1, 1, data.shape[-1])
-G = 1.5 * np.exp(-4 * X * X)
+G = 1.5 * np.exp(-4 * X ** 2)
 
 # Generate line plots
 lines = []
diff --git a/examples/api/custom_projection_example.py b/examples/api/custom_projection_example.py
@@ -440,8 +440,8 @@ def transform_non_affine(self, xy):
 
             quarter_x = 0.25 * x
             half_y = 0.5 * y
-            z = np.sqrt(1.0 - quarter_x*quarter_x - half_y*half_y)
-            longitude = 2 * np.arctan((z*x) / (2.0 * (2.0*z*z - 1.0)))
+            z = np.sqrt(1 - quarter_x * quarter_x - half_y * half_y)
+            longitude = 2 * np.arctan((z * x) / (2 * (2 * z ** 2 - 1)))
             latitude = np.arcsin(y*z)
             return np.concatenate((longitude, latitude), 1)
         transform_non_affine.__doc__ = Transform.transform_non_affine.__doc__
diff --git a/examples/api/scatter_piecharts.py b/examples/api/scatter_piecharts.py
@@ -7,7 +7,7 @@
 
 Thanks to Manuel Metz for the example
 """
-import math
+
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -16,35 +16,33 @@
 r2 = r1 + 0.4  # 40%
 
 # define some sizes of the scatter marker
-sizes = [60, 80, 120]
+sizes = np.array([60, 80, 120])
 
 # calculate the points of the first pie marker
 #
 # these are just the origin (0,0) +
 # some points on a circle cos,sin
-x = [0] + np.cos(np.linspace(0, 2*math.pi*r1, 10)).tolist()
-y = [0] + np.sin(np.linspace(0, 2*math.pi*r1, 10)).tolist()
-
+x = [0] + np.cos(np.linspace(0, 2 * np.pi * r1, 10)).tolist()
+y = [0] + np.sin(np.linspace(0, 2 * np.pi * r1, 10)).tolist()
 xy1 = list(zip(x, y))
-s1 = max(max(x), max(y))
+s1 = np.max(xy1)
 
-# ...
-x = [0] + np.cos(np.linspace(2*math.pi*r1, 2*math.pi*r2, 10)).tolist()
-y = [0] + np.sin(np.linspace(2*math.pi*r1, 2*math.pi*r2, 10)).tolist()
+x = [0] + np.cos(np.linspace(2 * np.pi * r1, 2 * np.pi * r2, 10)).tolist()
+y = [0] + np.sin(np.linspace(2 * np.pi * r1, 2 * np.pi * r2, 10)).tolist()
 xy2 = list(zip(x, y))
-s2 = max(max(x), max(y))
+s2 = np.max(xy2)
 
-x = [0] + np.cos(np.linspace(2*math.pi*r2, 2*math.pi, 10)).tolist()
-y = [0] + np.sin(np.linspace(2*math.pi*r2, 2*math.pi, 10)).tolist()
+x = [0] + np.cos(np.linspace(2 * np.pi * r2, 2 * np.pi, 10)).tolist()
+y = [0] + np.sin(np.linspace(2 * np.pi * r2, 2 * np.pi, 10)).tolist()
 xy3 = list(zip(x, y))
-s3 = max(max(x), max(y))
+s3 = np.max(xy3)
 
 fig, ax = plt.subplots()
-ax.scatter(np.arange(3), np.arange(3), marker=(xy1, 0),
-           s=[s1*s1*_ for _ in sizes], facecolor='blue')
-ax.scatter(np.arange(3), np.arange(3), marker=(xy2, 0),
-           s=[s2*s2*_ for _ in sizes], facecolor='green')
-ax.scatter(np.arange(3), np.arange(3), marker=(xy3, 0),
-           s=[s3*s3*_ for _ in sizes], facecolor='red')
+ax.scatter(range(3), range(3), marker=(xy1, 0),
+           s=s1 ** 2 * sizes, facecolor='blue')
+ax.scatter(range(3), range(3), marker=(xy2, 0),
+           s=s2 ** 2 * sizes, facecolor='green')
+ax.scatter(range(3), range(3), marker=(xy3, 0),
+           s=s3 ** 2 * sizes, facecolor='red')
 
 plt.show()
diff --git a/examples/event_handling/timers.py b/examples/event_handling/timers.py
@@ -12,7 +12,7 @@ def update_title(axes):
 fig, ax = plt.subplots()
 
 x = np.linspace(-3, 3)
-ax.plot(x, x*x)
+ax.plot(x, x ** 2)
 
 # Create a new timer object. Set the interval to 100 milliseconds
 # (1000 is default) and tell the timer what function should be called.
diff --git a/examples/event_handling/trifinder_event_demo.py b/examples/event_handling/trifinder_event_demo.py
@@ -35,16 +35,15 @@ def motion_notify(event):
 n_radii = 5
 min_radius = 0.25
 radii = np.linspace(min_radius, 0.95, n_radii)
-angles = np.linspace(0, 2*math.pi, n_angles, endpoint=False)
+angles = np.linspace(0, 2 * math.pi, n_angles, endpoint=False)
 angles = np.repeat(angles[..., np.newaxis], n_radii, axis=1)
 angles[:, 1::2] += math.pi / n_angles
-x = (radii*np.cos(angles)).flatten()
-y = (radii*np.sin(angles)).flatten()
+x = (radii * np.cos(angles)).flatten()
+y = (radii * np.sin(angles)).flatten()
 triangulation = Triangulation(x, y)
-xmid = x[triangulation.triangles].mean(axis=1)
-ymid = y[triangulation.triangles].mean(axis=1)
-mask = np.where(xmid*xmid + ymid*ymid < min_radius*min_radius, 1, 0)
-triangulation.set_mask(mask)
+triang.set_mask(np.hypot(x[triang.triangles].mean(axis=1),
+                         y[triang.triangles].mean(axis=1))
+                < min_radius)
 
 # Use the triangulation's default TriFinder object.
 trifinder = triangulation.get_trifinder()
diff --git a/examples/mplot3d/tricontour3d_demo.py b/examples/mplot3d/tricontour3d_demo.py
@@ -20,22 +20,21 @@
 
 # Create the mesh in polar coordinates and compute x, y, z.
 radii = np.linspace(min_radius, 0.95, n_radii)
-angles = np.linspace(0, 2*np.pi, n_angles, endpoint=False)
+angles = np.linspace(0, 2 * np.pi, n_angles, endpoint=False)
 angles = np.repeat(angles[..., np.newaxis], n_radii, axis=1)
-angles[:, 1::2] += np.pi/n_angles
+angles[:, 1::2] += np.pi / n_angles
 
-x = (radii*np.cos(angles)).flatten()
-y = (radii*np.sin(angles)).flatten()
-z = (np.cos(radii)*np.cos(angles*3.0)).flatten()
+x = (radii * np.cos(angles)).flatten()
+y = (radii * np.sin(angles)).flatten()
+z = (np.cos(radii) * np.cos(3 * angles)).flatten()
 
 # Create a custom triangulation.
 triang = tri.Triangulation(x, y)
 
 # Mask off unwanted triangles.
-xmid = x[triang.triangles].mean(axis=1)
-ymid = y[triang.triangles].mean(axis=1)
-mask = np.where(xmid*xmid + ymid*ymid < min_radius*min_radius, 1, 0)
-triang.set_mask(mask)
+triang.set_mask(np.hypot(x[triang.triangles].mean(axis=1),
+                         y[triang.triangles].mean(axis=1))
+                < min_radius)
 
 fig = plt.figure()
 ax = fig.gca(projection='3d')
diff --git a/examples/mplot3d/tricontourf3d_demo.py b/examples/mplot3d/tricontourf3d_demo.py
@@ -21,22 +21,21 @@
 
 # Create the mesh in polar coordinates and compute x, y, z.
 radii = np.linspace(min_radius, 0.95, n_radii)
-angles = np.linspace(0, 2*np.pi, n_angles, endpoint=False)
+angles = np.linspace(0, 2 * np.pi, n_angles, endpoint=False)
 angles = np.repeat(angles[..., np.newaxis], n_radii, axis=1)
-angles[:, 1::2] += np.pi/n_angles
+angles[:, 1::2] += np.pi / n_angles
 
-x = (radii*np.cos(angles)).flatten()
-y = (radii*np.sin(angles)).flatten()
-z = (np.cos(radii)*np.cos(angles*3.0)).flatten()
+x = (radii * np.cos(angles)).flatten()
+y = (radii * np.sin(angles)).flatten()
+z = (np.cos(radii) * np.cos(3 * angles)).flatten()
 
 # Create a custom triangulation.
 triang = tri.Triangulation(x, y)
 
 # Mask off unwanted triangles.
-xmid = x[triang.triangles].mean(axis=1)
-ymid = y[triang.triangles].mean(axis=1)
-mask = np.where(xmid*xmid + ymid*ymid < min_radius*min_radius, 1, 0)
-triang.set_mask(mask)
+triang.set_mask(np.hypot(x[triang.triangles].mean(axis=1),
+                         y[triang.triangles].mean(axis=1))
+                < min_radius)
 
 fig = plt.figure()
 ax = fig.gca(projection='3d')
diff --git a/examples/mplot3d/trisurf3d_demo.py b/examples/mplot3d/trisurf3d_demo.py
@@ -16,19 +16,19 @@
 
 # Make radii and angles spaces (radius r=0 omitted to eliminate duplication).
 radii = np.linspace(0.125, 1.0, n_radii)
-angles = np.linspace(0, 2*np.pi, n_angles, endpoint=False)
+angles = np.linspace(0, 2 * np.pi, n_angles, endpoint=False)
 
 # Repeat all angles for each radius.
 angles = np.repeat(angles[..., np.newaxis], n_radii, axis=1)
 
 # Convert polar (radii, angles) coords to cartesian (x, y) coords.
 # (0, 0) is manually added at this stage,  so there will be no duplicate
 # points in the (x, y) plane.
-x = np.append(0, (radii*np.cos(angles)).flatten())
-y = np.append(0, (radii*np.sin(angles)).flatten())
+x = np.append(0, (radii * np.cos(angles)).flatten())
+y = np.append(0, (radii * np.sin(angles)).flatten())
 
 # Compute z to make the pringle surface.
-z = np.sin(-x*y)
+z = np.sin(-x * y)
 
 fig = plt.figure()
 ax = fig.gca(projection='3d')
diff --git a/examples/mplot3d/trisurf3d_demo2.py b/examples/mplot3d/trisurf3d_demo2.py
@@ -54,14 +54,14 @@
 min_radius = 0.25
 radii = np.linspace(min_radius, 0.95, n_radii)
 
-angles = np.linspace(0, 2*np.pi, n_angles, endpoint=False)
+angles = np.linspace(0, 2 * np.pi, n_angles, endpoint=False)
 angles = np.repeat(angles[..., np.newaxis], n_radii, axis=1)
 angles[:, 1::2] += np.pi/n_angles
 
 # Map radius, angle pairs to x, y, z points.
-x = (radii*np.cos(angles)).flatten()
-y = (radii*np.sin(angles)).flatten()
-z = (np.cos(radii)*np.cos(angles*3.0)).flatten()
+x = (radii * np.cos(angles)).flatten()
+y = (radii * np.sin(angles)).flatten()
+z = (np.cos(radii) * np.cos(3 * angles)).flatten()
 
 # Create the Triangulation; no triangles so Delaunay triangulation created.
 triang = mtri.Triangulation(x, y)
diff --git a/examples/pylab_examples/annotation_demo.py b/examples/pylab_examples/annotation_demo.py
@@ -91,7 +91,7 @@
 fig = plt.figure()
 ax = fig.add_subplot(111, projection='polar')
 r = np.arange(0, 1, 0.001)
-theta = 2*2*np.pi*r
+theta = 4 * np.pi * r
 line, = ax.plot(theta, r)
 
 ind = 800
diff --git a/examples/pylab_examples/cursor_demo.py b/examples/pylab_examples/cursor_demo.py
@@ -74,7 +74,7 @@ def mouse_move(self, event):
         plt.draw()
 
 t = np.arange(0.0, 1.0, 0.01)
-s = np.sin(2*2*np.pi*t)
+s = np.sin(4 * np.pi * t)
 fig, ax = plt.subplots()
 
 #cursor = Cursor(ax)
diff --git a/examples/pylab_examples/date_demo_convert.py b/examples/pylab_examples/date_demo_convert.py
@@ -1,17 +1,17 @@
 import datetime
 import matplotlib.pyplot as plt
 from matplotlib.dates import DayLocator, HourLocator, DateFormatter, drange
-from numpy import arange
+import numpy as np
 
 date1 = datetime.datetime(2000, 3, 2)
 date2 = datetime.datetime(2000, 3, 6)
 delta = datetime.timedelta(hours=6)
 dates = drange(date1, date2, delta)
 
-y = arange(len(dates)*1.0)
+y = np.arange(len(dates))
 
 fig, ax = plt.subplots()
-ax.plot_date(dates, y*y)
+ax.plot_date(dates, y ** 2)
 
 # this is superfluous, since the autoscaler should get it right, but
 # use date2num and num2date to convert between dates and floats if
@@ -22,7 +22,7 @@
 # tick, not the base multiple
 
 ax.xaxis.set_major_locator(DayLocator())
-ax.xaxis.set_minor_locator(HourLocator(arange(0, 25, 6)))
+ax.xaxis.set_minor_locator(HourLocator(range(0, 25, 6)))
 ax.xaxis.set_major_formatter(DateFormatter('%Y-%m-%d'))
 
 ax.fmt_xdata = DateFormatter('%Y-%m-%d %H:%M:%S')
diff --git a/examples/pylab_examples/equal_aspect_ratio.py b/examples/pylab_examples/equal_aspect_ratio.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 t = np.arange(0.0, 1.0 + 0.01, 0.01)
-s = np.cos(2*2*np.pi*t)
+s = np.cos(4 * np.pi * t)
 plt.plot(t, s, '-', lw=2)
 
 plt.xlabel('time (s)')
@@ -16,5 +16,4 @@
 
 plt.axes().set_aspect('equal', 'datalim')
 
-
 plt.show()
diff --git a/examples/pylab_examples/multipage_pdf.py b/examples/pylab_examples/multipage_pdf.py
@@ -31,7 +31,7 @@
 
     plt.rc('text', usetex=False)
     fig = plt.figure(figsize=(4, 5))
-    plt.plot(x, x*x, 'ko')
+    plt.plot(x, x ** 2, 'ko')
     plt.title('Page Three')
     pdf.savefig(fig)  # or you can pass a Figure object to pdf.savefig
     plt.close()
diff --git a/examples/pylab_examples/nan_test.py b/examples/pylab_examples/nan_test.py
@@ -5,7 +5,7 @@
 import matplotlib.pyplot as plt
 
 t = np.arange(0.0, 1.0 + 0.01, 0.01)
-s = np.cos(2 * 2 * np.pi * t)
+s = np.cos(4 * np.pi * t)
 t[41:60] = np.nan
 
 plt.subplot(2, 1, 1)
diff --git a/examples/pylab_examples/pythonic_matplotlib.py b/examples/pylab_examples/pythonic_matplotlib.py
@@ -71,7 +71,7 @@
 
 
 ax2 = fig.add_subplot(212)
-ax2.plot(t, sin(2*2*pi*t))
+ax2.plot(t, sin(4 * pi * t))
 ax2.grid(True)
 ax2.set_ylim((-2, 2))
 l = ax2.set_xlabel('Hi mom')
diff --git a/examples/pylab_examples/scatter_masked.py b/examples/pylab_examples/scatter_masked.py
@@ -7,17 +7,17 @@
 
 N = 100
 r0 = 0.6
-x = 0.9*np.random.rand(N)
-y = 0.9*np.random.rand(N)
-area = np.pi*(10 * np.random.rand(N))**2  # 0 to 10 point radiuses
+x = 0.9 * np.random.rand(N)
+y = 0.9 * np.random.rand(N)
+area = np.pi * (10 * np.random.rand(N)) ** 2  # 0 to 10 point radiuses
 c = np.sqrt(area)
-r = np.sqrt(x*x + y*y)
+r = np.sqrt(x * x + y * y)
 area1 = np.ma.masked_where(r < r0, area)
 area2 = np.ma.masked_where(r >= r0, area)
 plt.scatter(x, y, s=area1, marker='^', c=c)
 plt.scatter(x, y, s=area2, marker='o', c=c)
 # Show the boundary between the regions:
-theta = np.arange(0, np.pi/2, 0.01)
-plt.plot(r0*np.cos(theta), r0*np.sin(theta))
+theta = np.arange(0, np.pi / 2, 0.01)
+plt.plot(r0 * np.cos(theta), r0 * np.sin(theta))
 
 plt.show()
diff --git a/examples/pylab_examples/stackplot_demo2.py b/examples/pylab_examples/stackplot_demo2.py
@@ -15,7 +15,7 @@ def bump(a):
         z = 10 / (.1 + np.random.random())
         for i in range(m):
             w = (i / float(m) - y) * z
-            a[i] += x * np.exp(-w * w)
+            a[i] += x * np.exp(-w ** 2)
     a = np.zeros((m, n))
     for i in range(n):
         for j in range(5):
diff --git a/examples/pylab_examples/tex_unicode_demo.py b/examples/pylab_examples/tex_unicode_demo.py
@@ -14,7 +14,7 @@
 plt.figure(1, figsize=(6, 4))
 ax = plt.axes([0.1, 0.1, 0.8, 0.7])
 t = np.arange(0.0, 1.0 + 0.01, 0.01)
-s = np.cos(2*2*np.pi*t) + 2
+s = np.cos(4 * np.pi * t) + 2
 plt.plot(t, s)
 
 plt.xlabel(r'\textbf{time (s)}')
diff --git a/examples/pylab_examples/tricontour_demo.py b/examples/pylab_examples/tricontour_demo.py
@@ -15,22 +15,21 @@
 min_radius = 0.25
 radii = np.linspace(min_radius, 0.95, n_radii)
 
-angles = np.linspace(0, 2*math.pi, n_angles, endpoint=False)
+angles = np.linspace(0, 2 * math.pi, n_angles, endpoint=False)
 angles = np.repeat(angles[..., np.newaxis], n_radii, axis=1)
-angles[:, 1::2] += math.pi/n_angles
+angles[:, 1::2] += math.pi / n_angles
 
-x = (radii*np.cos(angles)).flatten()
-y = (radii*np.sin(angles)).flatten()
-z = (np.cos(radii)*np.cos(angles*3.0)).flatten()
+x = (radii * np.cos(angles)).flatten()
+y = (radii * np.sin(angles)).flatten()
+z = (np.cos(radii) * np.cos(3 * angles)).flatten()
 
 # Create the Triangulation; no triangles so Delaunay triangulation created.
 triang = tri.Triangulation(x, y)
 
 # Mask off unwanted triangles.
-xmid = x[triang.triangles].mean(axis=1)
-ymid = y[triang.triangles].mean(axis=1)
-mask = np.where(xmid*xmid + ymid*ymid < min_radius*min_radius, 1, 0)
-triang.set_mask(mask)
+triang.set_mask(np.hypot(x[triang.triangles].mean(axis=1),
+                         y[triang.triangles].mean(axis=1))
+                < min_radius)
 
 # pcolor plot.
 plt.figure()
diff --git a/examples/pylab_examples/tricontour_smooth_user.py b/examples/pylab_examples/tricontour_smooth_user.py
diff --git a/examples/pylab_examples/trigradient_demo.py b/examples/pylab_examples/trigradient_demo.py
diff --git a/examples/pylab_examples/tripcolor_demo.py b/examples/pylab_examples/tripcolor_demo.py
diff --git a/examples/pylab_examples/triplot_demo.py b/examples/pylab_examples/triplot_demo.py
diff --git a/examples/pyplots/annotation_polar.py b/examples/pyplots/annotation_polar.py
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
