Apply the low-level TR feedback

bzaczynski · bzaczynski · commit 3ca5a41c8cef · 2021-12-14T11:39:20.000+01:00
diff --git a/mandelbrot-set-python/01_scatter_plot.py b/mandelbrot-set-python/01_scatter_plot.py
@@ -7,18 +7,19 @@
 def complex_matrix(xmin, xmax, ymin, ymax, pixel_density):
     re = np.linspace(xmin, xmax, int((xmax - xmin) * pixel_density))
     im = np.linspace(ymin, ymax, int((ymax - ymin) * pixel_density))
-    return re[:, None] + im[None, :] * 1j
+    return re[np.newaxis, :] + im[:, np.newaxis] * 1j
 
 
 def is_stable(c, num_iterations):
     z = 0
     for _ in range(num_iterations):
         z = z ** 2 + c
-    return abs(z) < 2
+    return abs(z) <= 2
 
 
 def get_members(c, num_iterations):
-    return c[is_stable(c, num_iterations)]
+    mask = is_stable(c, num_iterations)
+    return c[mask]
 
 
 if __name__ == "__main__":
diff --git a/mandelbrot-set-python/02_bw_plot.py b/mandelbrot-set-python/02_bw_plot.py
@@ -7,24 +7,25 @@
 def complex_matrix(xmin, xmax, ymin, ymax, pixel_density):
     re = np.linspace(xmin, xmax, int((xmax - xmin) * pixel_density))
     im = np.linspace(ymin, ymax, int((ymax - ymin) * pixel_density))
-    return re[:, None] + im[None, :] * 1j
+    return re[np.newaxis, :] + im[:, np.newaxis] * 1j
 
 
 def is_stable(c, num_iterations):
     z = 0
     for _ in range(num_iterations):
         z = z ** 2 + c
-    return abs(z) < 2
+    return abs(z) <= 2
 
 
 def get_members(c, num_iterations):
-    return c[is_stable(c, num_iterations)]
+    mask = is_stable(c, num_iterations)
+    return c[mask]
 
 
 if __name__ == "__main__":
     c = complex_matrix(-2, 0.5, -1.5, 1.5, pixel_density=512)
 
-    plt.imshow(is_stable(c, num_iterations=20).T, cmap="binary")
+    plt.imshow(is_stable(c, num_iterations=20), cmap="binary")
     plt.gca().set_aspect("equal")
     plt.axis("off")
     plt.tight_layout()
diff --git a/mandelbrot-set-python/03_bw.py b/mandelbrot-set-python/03_bw.py
@@ -8,13 +8,12 @@
 
     width, height = 512, 512
     scale = 0.0075
-    black_and_white = "1"
+    BLACK_AND_WHITE = "1"
 
-    image = Image.new(mode=black_and_white, size=(width, height))
+    image = Image.new(mode=BLACK_AND_WHITE, size=(width, height))
     for y in range(height):
         for x in range(width):
-            re = scale * (x - width / 2)
-            im = scale * (height / 2 - y)
-            image.putpixel((x, y), complex(re, im) not in mandelbrot_set)
+            c = scale * complex(x - width / 2, height / 2 - y)
+            image.putpixel((x, y), c not in mandelbrot_set)
 
     image.show()
diff --git a/mandelbrot-set-python/04_grayscale.py b/mandelbrot-set-python/04_grayscale.py
@@ -8,14 +8,13 @@
 
     width, height = 512, 512
     scale = 0.0075
-    grayscale = "L"
+    GRAYSCALE = "L"
 
-    image = Image.new(mode=grayscale, size=(width, height))
+    image = Image.new(mode=GRAYSCALE, size=(width, height))
     for y in range(height):
         for x in range(width):
-            re = scale * (x - width / 2)
-            im = scale * (height / 2 - y)
-            stability = 1 - mandelbrot_set.stability(complex(re, im))
-            image.putpixel((x, y), int(stability * 255))
+            c = scale * complex(x - width / 2, height / 2 - y)
+            instability = 1 - mandelbrot_set.stability(c)
+            image.putpixel((x, y), int(instability * 255))
 
     image.show()
diff --git a/mandelbrot-set-python/05_grayscale_smooth.py b/mandelbrot-set-python/05_grayscale_smooth.py
@@ -4,19 +4,19 @@
 
 if __name__ == "__main__":
 
-    mandelbrot_set = MandelbrotSet(max_iterations=20)
+    mandelbrot_set = MandelbrotSet(max_iterations=20, escape_radius=1000)
 
     width, height = 512, 512
     scale = 0.0075
-    grayscale = "L"
+    GRAYSCALE = "L"
 
-    image = Image.new(mode=grayscale, size=(width, height))
+    image = Image.new(mode=GRAYSCALE, size=(width, height))
     for y in range(height):
         for x in range(width):
             re = scale * (x - width / 2)
             im = scale * (height / 2 - y)
             c = complex(re, im)
-            stability = 1 - mandelbrot_set.stability(c, smooth=True)
-            image.putpixel((x, y), int(stability * 255))
+            instability = 1 - mandelbrot_set.stability(c, smooth=True)
+            image.putpixel((x, y), int(instability * 255))
 
     image.show()
diff --git a/mandelbrot-set-python/06_viewport_pixel.py b/mandelbrot-set-python/06_viewport_pixel.py
@@ -7,13 +7,13 @@
 if __name__ == "__main__":
     print("This might take a while...")
 
-    mandelbrot_set = MandelbrotSet(max_iterations=256)
+    mandelbrot_set = MandelbrotSet(max_iterations=256, escape_radius=1000)
 
     image = Image.new(mode="L", size=(512, 512))
     for pixel in Viewport(image, center=-0.7435 + 0.1314j, width=0.002):
         c = complex(pixel)
-        stability = 1 - mandelbrot_set.stability(c, smooth=True)
-        pixel.color = int(stability * 255)
+        instability = 1 - mandelbrot_set.stability(c, smooth=True)
+        pixel.color = int(instability * 255)
 
     enhancer = ImageEnhance.Brightness(image)
     enhancer.enhance(1.25).show()
diff --git a/mandelbrot-set-python/07_color_palette_matplotlib.py b/mandelbrot-set-python/07_color_palette_matplotlib.py
@@ -24,7 +24,7 @@ def denormalize(palette):
     colormap = matplotlib.cm.get_cmap("twilight").colors
     palette = denormalize(colormap)
 
-    mandelbrot_set = MandelbrotSet(max_iterations=512)
+    mandelbrot_set = MandelbrotSet(max_iterations=512, escape_radius=1000)
     image = Image.new(mode="RGB", size=(512, 512))
     viewport = Viewport(image, center=-0.7435 + 0.1314j, width=0.002)
     paint(mandelbrot_set, viewport, palette, smooth=True)
diff --git a/mandelbrot-set-python/08_color_palette_custom.py b/mandelbrot-set-python/08_color_palette_custom.py
@@ -25,7 +25,7 @@ def denormalize(palette):
     gray_area = [(1 - i / 44,) * 3 for i in range(45)]
     palette = denormalize(exterior + gray_area + interior)
 
-    mandelbrot_set = MandelbrotSet(max_iterations=20)
+    mandelbrot_set = MandelbrotSet(max_iterations=20, escape_radius=1000)
     image = Image.new(mode="RGB", size=(512, 512))
     viewport = Viewport(image, center=-0.75, width=3.5)
     paint(mandelbrot_set, viewport, palette, smooth=True)
diff --git a/mandelbrot-set-python/09_color_gradient.py b/mandelbrot-set-python/09_color_gradient.py
@@ -43,7 +43,7 @@ def make_gradient(colors, interpolation="linear"):
         [gradient(i / num_colors) for i in range(num_colors)]
     )
 
-    mandelbrot_set = MandelbrotSet(max_iterations=25)
+    mandelbrot_set = MandelbrotSet(max_iterations=20, escape_radius=1000)
     image = Image.new(mode="RGB", size=(512, 512))
     viewport = Viewport(image, center=-0.75, width=3.5)
     paint(mandelbrot_set, viewport, palette, smooth=True)
diff --git a/mandelbrot-set-python/10_color_hsb.py b/mandelbrot-set-python/10_color_hsb.py
@@ -16,7 +16,7 @@ def hsb(hue_degrees: int, saturation: float, brightness: float):
 if __name__ == "__main__":
     print("This might take a while...")
 
-    mandelbrot_set = MandelbrotSet(max_iterations=25)
+    mandelbrot_set = MandelbrotSet(max_iterations=20, escape_radius=1000)
     image = Image.new(mode="RGB", size=(512, 512))
     for pixel in Viewport(image, center=-0.75, width=3.5):
         stability = mandelbrot_set.stability(complex(pixel), smooth=True)
diff --git a/mandelbrot-set-python/README.md b/mandelbrot-set-python/README.md
@@ -8,8 +8,8 @@ This code requires the following libraries:
 
 - Matplotlib
 - NumPy
-- SciPy
 - Pillow
+- SciPy
 
 To install them, activate your [virtual environment](https://realpython.com/python-virtual-environments-a-primer/), and type the following command:
 
diff --git a/mandelbrot-set-python/mandelbrot_01.py b/mandelbrot-set-python/mandelbrot_01.py
@@ -11,6 +11,6 @@ def __contains__(self, c: complex) -> bool:
         z = 0
         for _ in range(self.max_iterations):
             z = z ** 2 + c
-            if abs(z) >= 2:
+            if abs(z) > 2:
                 return False
         return True
diff --git a/mandelbrot-set-python/mandelbrot_02.py b/mandelbrot-set-python/mandelbrot_02.py
@@ -15,8 +15,8 @@ def stability(self, c: complex) -> float:
 
     def escape_count(self, c: complex) -> int:
         z = 0
-        for i in range(self.max_iterations):
+        for iteration in range(self.max_iterations):
             z = z ** 2 + c
-            if abs(z) >= 2:
-                return i
+            if abs(z) > 2:
+                return iteration
         return self.max_iterations
diff --git a/mandelbrot-set-python/mandelbrot_03.py b/mandelbrot-set-python/mandelbrot_03.py
@@ -7,6 +7,7 @@
 @dataclass
 class MandelbrotSet:
     max_iterations: int
+    escape_radius: float = 2.0
 
     def __contains__(self, c: complex) -> bool:
         return self.stability(c) == 1
@@ -15,10 +16,12 @@ def stability(self, c: complex, smooth=False, clamp=True) -> float:
         value = self.escape_count(c, smooth) / self.max_iterations
         return max(0.0, min(value, 1.0)) if clamp else value
 
-    def escape_count(self, c: complex, smooth=False) -> int:
+    def escape_count(self, c: complex, smooth=False) -> int | float:
         z = 0
-        for i in range(self.max_iterations):
+        for iteration in range(self.max_iterations):
             z = z ** 2 + c
-            if abs(z) >= 2:
-                return i + 1 - log(log(abs(z))) / log(2) if smooth else i
+            if abs(z) > self.escape_radius:
+                if smooth:
+                    return iteration + 1 - log(log(abs(z))) / log(2)
+                return iteration
         return self.max_iterations
diff --git a/mandelbrot-set-python/requirements.txt b/mandelbrot-set-python/requirements.txt
@@ -1,13 +1,11 @@
 cycler==0.11.0
-fonttools==4.28.1
+fonttools==4.28.3
 kiwisolver==1.3.2
-matplotlib==3.5.0
+matplotlib==3.5.1
 numpy==1.21.4
 packaging==21.3
 Pillow==8.4.0
 pyparsing==3.0.6
 python-dateutil==2.8.2
-scipy==1.7.2
-setuptools-scm==6.3.2
+scipy==1.7.3
 six==1.16.0
-tomli==1.2.2

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ def make_gradient(colors, interpolation="linear"):`
`43`	`43`	`[gradient(i / num_colors) for i in range(num_colors)]`
`44`	`44`	`)`
`45`	`45`
`46`		`- mandelbrot_set = MandelbrotSet(max_iterations=25)`
	`46`	`+ mandelbrot_set = MandelbrotSet(max_iterations=20, escape_radius=1000)`
`47`	`47`	`image = Image.new(mode="RGB", size=(512, 512))`
`48`	`48`	`viewport = Viewport(image, center=-0.75, width=3.5)`
`49`	`49`	`paint(mandelbrot_set, viewport, palette, smooth=True)`