deactivated QR, switched to lsmr

enzbus · Sep 10, 2024 · 7168e08 · 7168e08
1 parent 9b9eab9
commit 7168e08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/project_euromir/direction_calculator.py b/project_euromir/direction_calculator.py
@@ -370,7 +370,7 @@ class LSMRLevenbergMarquardt(LSQRLevenbergMarquardt):
 
     def _inner_function(self, derivative_residual, residual, current_gradient):
         """Just the call to the iterative solver."""
-        breakpoint()
+        # breakpoint()
         result = sp.sparse.linalg.lsmr(
             derivative_residual, -residual, x0=self._x0, damp=1e-06, # seems
             # that up to about 1e-6 performance is not affected

diff --git a/project_euromir/solver_new.py b/project_euromir/solver_new.py
@@ -41,7 +41,7 @@
 
 logger = logging.getLogger(__name__)
 
-QR_PRESOLVE = True
+QR_PRESOLVE = False
 
 def solve(matrix, b, c, zero, nonneg,
         # xy = None, # need to import logic for equilibration
@@ -181,11 +181,11 @@ def _local_derivative_residual(xy):
     #     )
 
     # LSMR seems better than LSQR and CG, however need to count matrix evals
-    # direction_calculator = LSMRLevenbergMarquardt(
-    #     residual_function=_local_residual,
-    #     derivative_residual_function=_local_derivative_residual,
-    #     # warm_start=True, # also doesn't work with warm start
-    #     )
+    direction_calculator = LSMRLevenbergMarquardt(
+        residual_function=_local_residual,
+        derivative_residual_function=_local_derivative_residual,
+        # warm_start=True, # also doesn't work with warm start
+        )
 
     # direction_calculator = DenseNewton( #WarmStartedCGNewton(
     #     hessian_function=_local_hessian,