Improve verbose mode for SYMMLQ and MINRES

JuliaSmoothOptimizers · Aug 2, 2020 · 9933722 · 9933722
1 parent d6c9bf4
commit 9933722
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/minres.jl b/src/minres.jl
@@ -102,8 +102,8 @@ function minres(A, b :: AbstractVector{T};
   err_lbnd = zero(T)
   err_vec = zeros(T, window)
 
-  verbose && @printf("%5s  %7s  %7s  %7s  %8s  %8s  %7s  %7s\n",
-                     "Aprod", "‖r‖", "‖Aᵀr‖", "β", "cos", "sin", "‖A‖", "κ(A)")
+  verbose && @printf("%5s  %7s  %7s  %7s  %8s  %8s  %7s  %7s  %7s  %7s\n",
+                     "Aprod", "‖r‖", "‖Aᵀr‖", "β", "cos", "sin", "‖A‖", "κ(A)", "test1", "test2")
   verbose && @printf("%5d  %7.1e  %7.1e  %7.1e  %8.1e  %8.1e  %7.1e  %7.1e\n",
                      0, rNorm, ArNorm, β, cs, sn, ANorm, Acond)
 
@@ -207,8 +207,8 @@ function minres(A, b :: AbstractVector{T};
 
     Acond = γmax / γmin
 
-    verbose && @printf("%5d  %7.1e  %7.1e  %7.1e  %8.1e  %8.1e  %7.1e  %7.1e\n",
-                       iter, test1, test2, β, cs, sn, ANorm, Acond)
+    verbose && @printf("%5d  %7.1e  %7.1e  %7.1e  %8.1e  %8.1e  %7.1e  %7.1e  %7.1e  %7.1e\n",
+                       iter, rNorm, ArNorm, β, cs, sn, ANorm, Acond, test1, test2)
 
     if iter == 1
       # Aᵀb = 0 so x = 0 is a minimum least-squares solution

diff --git a/src/symmlq.jl b/src/symmlq.jl
@@ -130,8 +130,8 @@ function symmlq(A, b :: AbstractVector{T};
     end
   end
 
-  verbose && @printf("%5s  %7s  %7s  %8s  %8s  %7s  %7s\n",
-                     "Aprod", "‖r‖", "β", "cos", "sin", "‖A‖", "κ(A)")
+  verbose && @printf("%5s  %7s  %7s  %8s  %8s  %7s  %7s  %7s\n",
+                     "Aprod", "‖r‖", "β", "cos", "sin", "‖A‖", "κ(A)", "test1")
   verbose && @printf("%5d  %7.1e  %7.1e  %8.1e  %8.1e  %7.1e  %7.1e\n",
                      0, rNorm, β, cold, sold, ANorm, Acond)
 
@@ -264,8 +264,8 @@ function symmlq(A, b :: AbstractVector{T};
     ANorm = sqrt(ANorm²)
     test1 = rNorm/(ANorm * xNorm)
 
-    verbose && @printf("%5d  %7.1e  %7.1e  %8.1e  %8.1e  %7.1e  %7.1e\n",
-                       iter, test1, β, c, s, ANorm, Acond)
+    verbose && @printf("%5d  %7.1e  %7.1e  %8.1e  %8.1e  %7.1e  %7.1e  %7.1e\n",
+                       iter, rNorm, β, c, s, ANorm, Acond, test1)
 
     # Reset variables
     ϵold = ϵ