executable-engineering 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

executable_engineering/__init__.py

@@ -13,7 +13,13 @@ __all__ = [
   "visualize_matrix_norms",
   "jacobi_step",
   "gauss_seidel_step",
-  "sor_step, visualize_convergence_2d, create_diagonally_dominant_matrix, iter_solve, steepest_descent, conjugate_gradient, IterationTracker",
+  "sor_step",
+  "visualize_convergence_2d",
+  "create_diagonally_dominant_matrix",
+  "iter_solve",
+  "steepest_descent",
+  "conjugate_gradient",
+  "IterationTracker",
   "init_weights",
   "tanh",
   "tanh_derivative",

executable_engineering/linearsystems_module.py

@@ -430,13 +430,44 @@ class IterationTracker:
     """
     A clean callback tracker for native SciPy solvers (cg, gmres, etc.).
     """
-    def __init__(self, x0=None):
+    def __init__(self, x0=None, A=None, b=None, print_residual=False):
         import numpy as np
         if x0 is not None:
             self.iterations = [np.array(x0).copy()]
         else:
             self.iterations = []
+            
+        self.residuals = []
+        self.A = A
+        self.b = b
+        self.print_residual = print_residual
+        self.step = 0
+        
+        if A is not None and b is not None and x0 is not None:
+            x_arr = np.array(x0)
+            res = np.linalg.norm(A @ x_arr - b)
+            self.residuals.append(res)
+            if self.print_residual:
+                guess_str = np.array2string(x_arr, precision=4, separator=', ', suppress_small=True)
+                print(f"Step {self.step}: Guess = {guess_str}, Residual = {res:.4e}")
 
     def __call__(self, xk):
         import numpy as np
-        self.iterations.append(np.array(xk).copy())
+        self.step += 1
+        
+        # Check if xk is a scalar (i.e. callback_type='pr_norm' in GMRES)
+        if np.isscalar(xk) or (isinstance(xk, np.ndarray) and xk.size == 1):
+            res = float(np.squeeze(xk))
+            self.residuals.append(res)
+            if self.print_residual:
+                print(f"Step {self.step}: Residual = {res:.4e} (Guess vector xk not computed by SciPy GMRES)")
+        else:
+            # xk is a vector (i.e. from CG)
+            x = np.array(xk).copy()
+            self.iterations.append(x)
+            if self.A is not None and self.b is not None:
+                res = np.linalg.norm(self.A @ x - self.b)
+                self.residuals.append(res)
+                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}")

{executable_engineering-0.1.34.dist-info → executable_engineering-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: executable_engineering
-Version: 0.1.34
+Version: 0.1.36
 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.34.dist-info → executable_engineering-0.1.36.dist-info}/RECORD

@@ -1,14 +1,14 @@
-executable_engineering/__init__.py,sha256=2DTTPvFi5e9Si0wGobfvaL5khJHAoCjrFYAr2q_h1DQ,1572
+executable_engineering/__init__.py,sha256=GiYYijxAfiee44SRLXjMsFCa3xOPWtUx0tnlWm4G6TM,1596
 executable_engineering/closedoptimization_module.py,sha256=i9KkdulyCZmriYKlx0CuUetjoMmxJm9ADWgStU3w85w,9273
 executable_engineering/closedrootfinder_module.py,sha256=ozccVABOrTiqcdkkqwAWRNo04MsDC0Z_f_tfukl3q20,5706
 executable_engineering/gradientoptimization_module.py,sha256=-2fErE9cemSEPeV9PlWOf4cF7Tr6DjilEw_NxvE-JYw,6601
-executable_engineering/linearsystems_module.py,sha256=4fJyuFGUdm2FKiydDD-_vAh1O9XEH8f0puBKWkGtlqM,15101
+executable_engineering/linearsystems_module.py,sha256=cFP8_q9_aBBekx-JtemDVgkUAqR8DIYSnljLYYkYe4c,16579
 executable_engineering/neuralnet_module.py,sha256=Hu9QFoMyODg4RCEpHmT9zTwzjcVFYM8ZLYtbB3CbrsA,10102
 executable_engineering/numerical_error_module.py,sha256=wxfYP8u29c19I2D6MxpQV3zDMV0DpS1QUqFpp3f6eGE,1204
 executable_engineering/openoptimization_module.py,sha256=OCPyrynkTo1It50RoT7irnL72aQn6FexE_R1SfFYxlg,8590
 executable_engineering/openrootfinder_module.py,sha256=rmXDi0XdrDYdLZdPFgYCihMg_4NF1D71i6kh8Kx-V2w,5802
-executable_engineering-0.1.34.dist-info/licenses/LICENSE,sha256=Tg4nrt8rFhgpkPbIA8SWoCR3MlGLw0NufB8AE6-TH_o,1074
-executable_engineering-0.1.34.dist-info/METADATA,sha256=ABgLWLdM0FnHXlY2BkYbVJer6d9Mb4H6nrE9VoiHkc8,1648
-executable_engineering-0.1.34.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-executable_engineering-0.1.34.dist-info/top_level.txt,sha256=0U5ATV5WGTLvN9rRSjQ54TyL-ztTyXaN3FzZ_QMq4HM,23
-executable_engineering-0.1.34.dist-info/RECORD,,
+executable_engineering-0.1.36.dist-info/licenses/LICENSE,sha256=Tg4nrt8rFhgpkPbIA8SWoCR3MlGLw0NufB8AE6-TH_o,1074
+executable_engineering-0.1.36.dist-info/METADATA,sha256=NLcOtA7ZxkdcBez1vQWAWA0p8nM01yux2n-nIq6CwWA,1648
+executable_engineering-0.1.36.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+executable_engineering-0.1.36.dist-info/top_level.txt,sha256=0U5ATV5WGTLvN9rRSjQ54TyL-ztTyXaN3FzZ_QMq4HM,23
+executable_engineering-0.1.36.dist-info/RECORD,,