good results experiment 1 (wip)

pmgbergen · Sep 8, 2023 · 5068df7 · 5068df7
1 parent 0386f46
commit 5068df7
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 61 deletions.
diff --git a/examples/1/results_poro.ipynb b/examples/1/results_poro.ipynb
diff --git a/examples/1/results_thermal.ipynb b/examples/1/results_thermal.ipynb
diff --git a/examples/1/run.bash b/examples/1/run.bash
@@ -9,14 +9,14 @@ fi
 num_repeats=$1
 
 targets=(
-    # "poro_l0.py"
-    # "poro_l1.py"
-    # "poro_ldynamic.py"
-    # "poro_lrandom.py"
+    "poro_l0.py"
+    "poro_l1.py"
+    "poro_ldynamic.py"
+    "poro_lrandom.py"
     "thermal_dynamic.py"
-    # "thermal_random.py"
+    "thermal_random.py"
     "thermal_cpr.py"
-    # "thermal_schur.py"
+    "thermal_schur.py"
 )
 
 for target in ${targets[@]}; do

diff --git a/src/solver_selector/data_structures.py b/src/solver_selector/data_structures.py
@@ -25,6 +25,7 @@ class NonlinearSolverStats:
 
     is_converged: bool
     is_diverged: bool
+    num_nonlinear_iterations: int  # about to remove
     nonlinear_error: Sequence[float]
     iterations: Sequence[NonlinearIterationStats]
 

diff --git a/src/solver_selector/solver_space.py b/src/solver_selector/solver_space.py
@@ -11,8 +11,8 @@
 
 @dataclass(kw_only=True, slots=True, frozen=True)
 class NumericalParameter:
-    bounds: tuple[float, float]
-    default: float
+    bounds: tuple[number, number]
+    default: number
     scale: Literal["linear", "log10"] = "linear"
     dtype: Literal["float", "int"] = "float"
     is_optimized: bool = True
@@ -506,7 +506,7 @@ def __init__(
             if isinstance(param, int | float):
                 param = NumericalParameter(
                     bounds=(param, param),
-                    default=float(param),
+                    default=param,
                     is_optimized=False,
                 )
             tmp[param_name] = param