Sync materials with tutorials

bzaczynski · bzaczynski · commit 56a57cd7b9d0 · 2021-11-19T19:49:01.000+01:00
diff --git a/mandelbrot-set-python/02_bw_plot.py b/mandelbrot-set-python/02_bw_plot.py
@@ -22,7 +22,7 @@ def get_members(c, num_iterations):
 
 
 if __name__ == "__main__":
-    c = complex_matrix(-2, 0.5, -1.5, 1.5, pixel_density=1280)
+    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.gca().set_aspect("equal")
diff --git a/mandelbrot-set-python/04_grayscale.py b/mandelbrot-set-python/04_grayscale.py
@@ -15,7 +15,7 @@
         for x in range(width):
             re = scale * (x - width / 2)
             im = scale * (height / 2 - y)
-            probability = 1 - mandelbrot_set.probability(complex(re, im))
-            image.putpixel((x, y), int(probability * 255))
+            stability = 1 - mandelbrot_set.stability(complex(re, im))
+            image.putpixel((x, y), int(stability * 255))
 
     image.show()
diff --git a/mandelbrot-set-python/05_grayscale_smooth.py b/mandelbrot-set-python/05_grayscale_smooth.py
@@ -16,7 +16,7 @@
             re = scale * (x - width / 2)
             im = scale * (height / 2 - y)
             c = complex(re, im)
-            probability = 1 - mandelbrot_set.probability(c, smooth=True)
-            image.putpixel((x, y), max(0, min(int(probability * 255), 255)))
+            stability = 1 - mandelbrot_set.stability(c, smooth=True)
+            image.putpixel((x, y), int(stability * 255))
 
     image.show()
diff --git a/mandelbrot-set-python/06_viewport_aspect.py b/mandelbrot-set-python/06_viewport_aspect.py
diff --git a/mandelbrot-set-python/06_viewport_pixel.py b/mandelbrot-set-python/06_viewport_pixel.py
@@ -2,7 +2,7 @@
 from PIL import ImageEnhance
 
 from mandelbrot_03 import MandelbrotSet
-from viewport_02 import Viewport
+from viewport import Viewport
 
 if __name__ == "__main__":
     print("This might take a while...")
@@ -12,8 +12,8 @@
     image = Image.new(mode="L", size=(512, 512))
     for pixel in Viewport(image, center=-0.7435 + 0.1314j, width=0.002):
         c = complex(pixel)
-        probability = 1 - mandelbrot_set.probability(c, smooth=True)
-        pixel.color = max(0, min(int(probability * 255), 255))
+        stability = 1 - mandelbrot_set.stability(c, smooth=True)
+        pixel.color = int(stability * 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
@@ -2,13 +2,13 @@
 from PIL import Image
 
 from mandelbrot_03 import MandelbrotSet
-from viewport_02 import Viewport
+from viewport import Viewport
 
 
 def paint(mandelbrot_set, viewport, palette, smooth):
     for pixel in viewport:
-        probability = mandelbrot_set.probability(complex(pixel), smooth)
-        index = int(min(probability * len(palette), len(palette) - 1))
+        stability = mandelbrot_set.stability(complex(pixel), smooth)
+        index = int(min(stability * len(palette), len(palette) - 1))
         pixel.color = palette[index % len(palette)]
 
 
diff --git a/mandelbrot-set-python/08_color_palette_custom.py b/mandelbrot-set-python/08_color_palette_custom.py
@@ -1,13 +1,13 @@
 from PIL import Image
 
 from mandelbrot_03 import MandelbrotSet
-from viewport_02 import Viewport
+from viewport import Viewport
 
 
 def paint(mandelbrot_set, viewport, palette, smooth):
     for pixel in viewport:
-        probability = mandelbrot_set.probability(complex(pixel), smooth)
-        index = int(min(probability * len(palette), len(palette) - 1))
+        stability = mandelbrot_set.stability(complex(pixel), smooth)
+        index = int(min(stability * len(palette), len(palette) - 1))
         pixel.color = palette[index % len(palette)]
 
 
diff --git a/mandelbrot-set-python/09_color_gradient.py b/mandelbrot-set-python/09_color_gradient.py
@@ -3,13 +3,13 @@
 from scipy.interpolate import interp1d
 
 from mandelbrot_03 import MandelbrotSet
-from viewport_02 import Viewport
+from viewport import Viewport
 
 
 def paint(mandelbrot_set, viewport, palette, smooth):
     for pixel in viewport:
-        probability = mandelbrot_set.probability(complex(pixel), smooth)
-        index = int(min(probability * len(palette), len(palette) - 1))
+        stability = mandelbrot_set.stability(complex(pixel), smooth)
+        index = int(min(stability * len(palette), len(palette) - 1))
         pixel.color = palette[index % len(palette)]
 
 
diff --git a/mandelbrot-set-python/10_color_hsb.py b/mandelbrot-set-python/10_color_hsb.py
@@ -2,7 +2,7 @@
 from PIL.ImageColor import getrgb
 
 from mandelbrot_03 import MandelbrotSet
-from viewport_02 import Viewport
+from viewport import Viewport
 
 
 def hsb(hue_degrees: int, saturation: float, brightness: float):
@@ -19,14 +19,13 @@ def hsb(hue_degrees: int, saturation: float, brightness: float):
     mandelbrot_set = MandelbrotSet(max_iterations=25)
     image = Image.new(mode="RGB", size=(512, 512))
     for pixel in Viewport(image, center=-0.75, width=3.5):
-        p = mandelbrot_set.probability(complex(pixel), smooth=True)
-        probability = max(0, min(p, 1))
+        stability = mandelbrot_set.stability(complex(pixel), smooth=True)
         pixel.color = (
             (0, 0, 0)
-            if probability == 1
+            if stability == 1
             else hsb(
-                hue_degrees=int(probability * 360),
-                saturation=probability,
+                hue_degrees=int(stability * 360),
+                saturation=stability,
                 brightness=1,
             )
         )
diff --git a/mandelbrot-set-python/README.md b/mandelbrot-set-python/README.md
@@ -14,7 +14,7 @@ This code requires the following libraries:
 To install them, activate your [virtual environment](https://realpython.com/python-virtual-environments-a-primer/), and type the following command:
 
 ```
-$ python -m pip install -r requirements.txt
+$ python3 -m pip install -r requirements.txt
 ```
 
 ## Usage
diff --git a/mandelbrot-set-python/mandelbrot_01.py b/mandelbrot-set-python/mandelbrot_01.py
@@ -1,9 +1,10 @@
 # mandelbrot_01.py
 
-from typing import NamedTuple
+from dataclasses import dataclass
 
 
-class MandelbrotSet(NamedTuple):
+@dataclass
+class MandelbrotSet:
     max_iterations: int
 
     def __contains__(self, c: complex) -> bool:
diff --git a/mandelbrot-set-python/mandelbrot_02.py b/mandelbrot-set-python/mandelbrot_02.py
@@ -1,15 +1,16 @@
 # mandelbrot_02.py
 
-from typing import NamedTuple
+from dataclasses import dataclass
 
 
-class MandelbrotSet(NamedTuple):
+@dataclass
+class MandelbrotSet:
     max_iterations: int
 
     def __contains__(self, c: complex) -> bool:
-        return self.probability(c) == 1
+        return self.stability(c) == 1
 
-    def probability(self, c: complex) -> float:
+    def stability(self, c: complex) -> float:
         return self.escape_count(c) / self.max_iterations
 
     def escape_count(self, c: complex) -> int:
diff --git a/mandelbrot-set-python/mandelbrot_03.py b/mandelbrot-set-python/mandelbrot_03.py
@@ -1,19 +1,21 @@
 # mandelbrot_03.py
 
+from dataclasses import dataclass
 from math import log
-from typing import NamedTuple
 
 
-class MandelbrotSet(NamedTuple):
+@dataclass
+class MandelbrotSet:
     max_iterations: int
 
     def __contains__(self, c: complex) -> bool:
-        return self.probability(c) == 1
+        return self.stability(c) == 1
 
-    def probability(self, c: complex, smooth: bool = False) -> float:
-        return self.escape_count(c, smooth) / self.max_iterations
+    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: bool = False) -> int:
+    def escape_count(self, c: complex, smooth=False) -> int:
         z = 0
         for i in range(self.max_iterations):
             z = z ** 2 + c
diff --git a/mandelbrot-set-python/requirements.txt b/mandelbrot-set-python/requirements.txt
@@ -1,9 +1,13 @@
-cycler==0.10.0
+cycler==0.11.0
+fonttools==4.28.1
 kiwisolver==1.3.2
-matplotlib==3.4.3
-numpy==1.21.2
-Pillow==8.3.2
-pyparsing==2.4.7
+matplotlib==3.5.0
+numpy==1.21.4
+packaging==21.3
+Pillow==8.4.0
+pyparsing==3.0.6
 python-dateutil==2.8.2
-scipy==1.7.1
+scipy==1.7.2
+setuptools-scm==6.3.2
 six==1.16.0
+tomli==1.2.2
diff --git a/mandelbrot-set-python/viewport.py b/mandelbrot-set-python/viewport.py
@@ -1,11 +1,11 @@
-# viewport_02.py
-
-from typing import NamedTuple
+# viewport.py
 
+from dataclasses import dataclass
 from PIL import Image
 
 
-class Viewport(NamedTuple):
+@dataclass
+class Viewport:
     image: Image.Image
     center: complex
     width: float
@@ -28,7 +28,8 @@ def __iter__(self):
                 yield Pixel(self, x, y)
 
 
-class Pixel(NamedTuple):
+@dataclass
+class Pixel:
     viewport: Viewport
     x: int
     y: int
diff --git a/mandelbrot-set-python/viewport_01.py b/mandelbrot-set-python/viewport_01.py
