executable-engineering 0.1.36__tar.gz → 0.1.39__tar.gz

{executable_engineering-0.1.36 → executable_engineering-0.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: executable_engineering
-Version: 0.1.36
+Version: 0.1.39
 Summary: Demonstrative tools for the Executable Engineering textbook
 Home-page: https://github.com/themintlab/ExecutableEngineering/tree/main/executable_engineering
 Author: Michael Welland

{executable_engineering-0.1.36 → executable_engineering-0.1.39}/executable_engineering/__init__.py

@@ -5,9 +5,11 @@ from .closedoptimization_module import OptimizerClosed
 from .openoptimization_module import OptimizerOpen
 from .gradientoptimization_module import OptimizerGrad
 from .numerical_error_module import python_internal_binary, decimal_to_binary
-from .linearsystems_module import visual_solve_2d, visualize_conditioning, visualize_matrix_norms, jacobi_step, gauss_seidel_step, sor_step, visualize_convergence_2d, create_diagonally_dominant_matrix, iter_solve, steepest_descent, conjugate_gradient, IterationTracker
+from .linearsystems_module import visual_solve_2d, visualize_conditioning, visualize_matrix_norms, jacobi_step, gauss_seidel_step, sor_step, visualize_convergence_2d, create_diagonally_dominant_matrix, iter_solve, steepest_descent, conjugate_gradient, IterationTracker, discretise_poisson, spai
 
 __all__ = [
+  "discretise_poisson",
+  "spai",
   "visual_solve_2d",
   "visualize_conditioning",
   "visualize_matrix_norms",

{executable_engineering-0.1.36 → executable_engineering-0.1.39}/executable_engineering/linearsystems_module.py

@@ -471,3 +471,64 @@ class IterationTracker:
                 if self.print_residual:
                     guess_str = np.array2string(x, precision=4, separator=', ', suppress_small=True)
                     print(f"Step {self.step}: Guess = {guess_str}, Residual = {res:.4e}")
+
+
+def discretise_poisson(N, Q):
+    """Generate the matrix and rhs associated with the discrete Poisson operator."""
+    import numpy as np
+    from scipy.sparse import coo_matrix
+
+    nelements = 5 * N**2 - 16 * N + 16
+
+    row_ind = np.empty(nelements, dtype=np.float64)
+    col_ind = np.empty(nelements, dtype=np.float64)
+    data = np.empty(nelements, dtype=np.float64)
+
+    f = np.empty(N * N, dtype=np.float64)
+
+    count = 0
+    for j in range(N):
+        for i in range(N):
+            if i == 0 or i == N - 1 or j == 0 or j == N - 1:
+                row_ind[count] = col_ind[count] = j * N + i
+                data[count] =  1
+                f[j * N + i] = 0
+                count += 1
+
+            else:
+                row_ind[count : count + 5] = j * N + i
+                col_ind[count] = j * N + i
+                col_ind[count + 1] = j * N + i + 1
+                col_ind[count + 2] = j * N + i - 1
+                col_ind[count + 3] = (j + 1) * N + i
+                col_ind[count + 4] = (j - 1) * N + i
+
+                data[count] = 4 * (N - 1)**2
+                data[count + 1 : count + 5] = - (N - 1)**2
+                f[j * N + i] = Q
+
+                count += 5
+
+    return coo_matrix((data, (row_ind, col_ind)), shape=(N**2, N**2)).tocsr(), f
+
+def spai(A, m):
+    """Perform m step of the SPAI iteration."""
+    import numpy as np
+    from scipy.sparse import identity
+    from scipy.sparse.linalg import onenormest
+
+    n = A.shape[0]
+
+    ident = identity(n, format='csr')
+    alpha = 2 / onenormest(A @ A.T)
+    M = alpha * A
+
+    for index in range(m):
+        C = A @ M
+        G = ident - C
+        AG = A @ G
+        trace = (G.T @ AG).diagonal().sum()
+        alpha = trace / np.linalg.norm(AG.data)**2
+        M = M + alpha * G
+
+    return M

{executable_engineering-0.1.36 → executable_engineering-0.1.39}/executable_engineering/openrootfinder_module.py

@@ -138,20 +138,26 @@ class RootFinderOpen:
         return HTML(anim.to_jshtml())
 
     def show_toggle_open(self, interval_ms=750):
-        newton_anim_html = self._make_animation_open('Newton', interval_ms)
-        secant_anim_html = self._make_animation_open('Secant', interval_ms)
+            newton_anim_html = self._make_animation_open('Newton', interval_ms)
+            secant_anim_html = self._make_animation_open('Secant', interval_ms)
 
-        if newton_anim_html is None or secant_anim_html is None:
-            print("Cannot create animations. Check function definition or initial points (x0, x1).")
-            return
+            if newton_anim_html is None or secant_anim_html is None:
+                print("Cannot create animations. Check function definition or initial points (x0, x1).")
+                return
 
-        newton_content = widgets.HTML(value=newton_anim_html.data)
-        secant_content = widgets.HTML(value=secant_anim_html.data)
+            newton_out = widgets.Output()
+            secant_out = widgets.Output()
 
-        tab_container = widgets.Tab()
-        tab_container.children = [newton_content, secant_content]
+            with newton_out:
+                display(newton_anim_html)
+                
+            with secant_out:
+                display(secant_anim_html)
 
-        tab_container.set_title(0, 'Newton')
-        tab_container.set_title(1, 'Secant')
+            tab_container = widgets.Tab()
+            tab_container.children = [newton_out, secant_out]
 
-        display(tab_container)
+            tab_container.set_title(0, 'Newton')
+            tab_container.set_title(1, 'Secant')
+
+            display(tab_container)

{executable_engineering-0.1.36 → executable_engineering-0.1.39}/executable_engineering.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: executable_engineering
-Version: 0.1.36
+Version: 0.1.39
 Summary: Demonstrative tools for the Executable Engineering textbook
 Home-page: https://github.com/themintlab/ExecutableEngineering/tree/main/executable_engineering
 Author: Michael Welland

{executable_engineering-0.1.36 → executable_engineering-0.1.39}/setup.py

@@ -6,7 +6,7 @@ long_description = (this_directory / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="executable_engineering",
-    version="0.1.36",
+    version="0.1.39",
     description="Demonstrative tools for the Executable Engineering textbook",
     long_description=long_description,
     long_description_content_type="text/markdown",