Simplify unstructured data generation

timhoffm · timhoffm · commit 9dd1441ed36d · 2021-09-23T01:08:45.000+02:00
There is no need to generate a regular grid and statistically choose
points from that. Instead, we can immediately choose random points.
diff --git a/plot_types/unstructured/tricontour.py b/plot_types/unstructured/tricontour.py
@@ -10,18 +10,12 @@
 
 plt.style.use('_mpl-gallery-nogrid')
 
-# make structured data
-X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
-Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
-levels = np.linspace(Z.min(), Z.max(), 7)
-
-# sample it to make unstructured x, y, z
+# make data:
 np.random.seed(1)
-ysamp = np.random.randint(0, 256, size=250)
-xsamp = np.random.randint(0, 256, size=250)
-y = Y[:, 0][ysamp]
-x = X[0, :][xsamp]
-z = Z[ysamp, xsamp]
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
+levels = np.linspace(z.min(), z.max(), 7)
 
 # plot:
 fig, ax = plt.subplots()
diff --git a/plot_types/unstructured/tricontourf.py b/plot_types/unstructured/tricontourf.py
@@ -10,18 +10,12 @@
 
 plt.style.use('_mpl-gallery-nogrid')
 
-# make structured data
-X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
-Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
-levels = np.linspace(np.min(Z), np.max(Z), 7)
-
-# sample it to make unstructured x, y, z
+# make data:
 np.random.seed(1)
-ysamp = np.random.randint(0, 256, size=250)
-xsamp = np.random.randint(0, 256, size=250)
-y = Y[:, 0][ysamp]
-x = X[0, :][xsamp]
-z = Z[ysamp, xsamp]
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
+levels = np.linspace(z.min(), z.max(), 7)
 
 # plot:
 fig, ax = plt.subplots()
diff --git a/plot_types/unstructured/tripcolor.py b/plot_types/unstructured/tripcolor.py
@@ -10,17 +10,11 @@
 
 plt.style.use('_mpl-gallery-nogrid')
 
-# make structured data
-X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
-Z = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
-
-# sample it to make unstructured x, y, z
+# make data:
 np.random.seed(1)
-ysamp = np.random.randint(0, 256, size=250)
-xsamp = np.random.randint(0, 256, size=250)
-y = Y[:, 0][ysamp]
-x = X[0, :][xsamp]
-z = Z[ysamp, xsamp]
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
 
 # plot:
 fig, ax = plt.subplots()
diff --git a/plot_types/unstructured/triplot.py b/plot_types/unstructured/triplot.py
@@ -10,15 +10,11 @@
 
 plt.style.use('_mpl-gallery-nogrid')
 
-# make structured data
-X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
-
-# sample it to make x, y, z
+# make data:
 np.random.seed(1)
-ysamp = np.random.randint(0, 256, size=250)
-xsamp = np.random.randint(0, 256, size=250)
-y = Y[:, 0][ysamp]
-x = X[0, :][xsamp]
+x = np.random.uniform(-3, 3, 256)
+y = np.random.uniform(-3, 3, 256)
+z = (1 - x/2 + x**5 + y**3) * np.exp(-x**2 - y**2)
 
 # plot:
 fig, ax = plt.subplots()
