Modified LSQR, CRAIG and CRAIGMR for damping factor settings.

PythonOptimizers · Oct 5, 2015 · bcb4046 · bcb4046
1 parent f4fdad8
commit bcb4046
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/pykrylov/lls/craig.py b/pykrylov/lls/craig.py
@@ -180,10 +180,7 @@ def solve(self, rhs, itnlim=0, damp=0.0, M=None, N=None, atol=1.0e-9,
         else:
             var = None
 
-        if N is not None:
-            damp = dampsq = 1.0
-        else:
-            dampsq = damp*damp;
+        dampsq = damp*damp;
 
         itn = istop = 0
         ctol = 0.0

diff --git a/pykrylov/lls/craigmr.py b/pykrylov/lls/craigmr.py
@@ -70,8 +70,6 @@ def solve(self, b, damp=0.0, atol=1e-9, btol=1e-9, conlim=1e8,
 
         if itnlim is None: itnlim = minDim
 
-        if N is not None: damp = 1.0
-
         # Initialize the Golub-Kahan bidiagonalization process.
 
         Mu = b.copy()  # Don't want to change input vector.

diff --git a/pykrylov/lls/lsqr.py b/pykrylov/lls/lsqr.py
@@ -156,10 +156,7 @@ def solve(self, rhs, itnlim=0, damp=0.0, M=None, N=None, atol=1.0e-9,
         else:
             var = None
 
-        if N is not None:
-            damp = dampsq = 1.0
-        else:
-            dampsq = damp*damp;
+        dampsq = damp*damp;
 
         itn = istop = 0
         ctol = 0.0