fix logging

Author: MaxenceGollier

src/R2DH.jl

@@ -294,7 +294,7 @@ function SolverCore.solve!(
         :fx => "f(x)",
         :hx => "h(x)",
         :xi => "√(ξ/ν)",
-        :normsdnu => "‖sₖ‖/ν",
+        :normsdnu => "‖s‖/ν",
         :normx => "‖x‖",
         :norms => "‖s‖",
         :arrow => "R2DH",
@@ -479,7 +479,7 @@ function SolverCore.solve!(
 
   if verbose > 0 && stats.status == :first_order
     @info log_row(Any[stats.iter, fk, hk, sqrt_ξ_νInv, norm_sdν, ρk, σk, norm(xk), norm_s, ""], colsep = 1)
-    @info "R2DH: terminating with √(ξ/ν) = $(sqrt_ξ_νInv) and ‖sₖ‖/ν = $(norm_sdν)"
+    @info "R2DH: terminating with √(ξ/ν) = $(sqrt_ξ_νInv) and ‖s‖/ν = $(norm_sdν)"
   end
 
   set_solution!(stats, xk)

src/R2N.jl

@@ -284,7 +284,7 @@ function SolverCore.solve!(
         :fx => "f(x)",
         :hx => "h(x)",
         :xi => "√(ξ1/ν)",
-        :norms1dnu => "‖sₖ₁‖/ν",
+        :norms1dnu => "‖s₁‖/ν",
         :normx => "‖x‖",
         :norms => "‖s‖",
         :normB => "‖B‖",
@@ -532,7 +532,7 @@ function SolverCore.solve!(
       Any[stats.iter, 0, fk, hk, sqrt_ξ1_νInv, norm_s_cauchydν, ρk, σk, norm(xk), norm(s), λmax, ""],
       colsep = 1,
     )
-    @info "R2N: terminating with √(ξ1/ν) = $(sqrt_ξ1_νInv) and ‖sₖ₁‖/ν = $(norm_s_cauchydν)"
+    @info "R2N: terminating with √(ξ1/ν) = $(sqrt_ξ1_νInv) and ‖s₁‖/ν = $(norm_s_cauchydν)"
   end
 
   set_solution!(stats, xk)

src/TRDH_alg.jl

@@ -306,12 +306,13 @@ function SolverCore.solve!(
 
   if verbose > 0
     @info log_header(
-      [:iter, :fx, :hx, :xi, :ρ, :Δ, :normx, :norms, :normD, :arrow],
-      [Int, T, T, T, T, T, T, T, T, Char],
+      [:iter, :fx, :hx, :xi, :normsdnu, :ρ, :Δ, :normx, :norms, :normD, :arrow],
+      [Int, T, T, T, T, T, T, T, T, T, Char],
       hdr_override = Dict{Symbol, String}(   # TODO: Add this as constant dict elsewhere
         :fx => "f(x)",
         :hx => "h(x)",
         :xi => "√(ξ/ν)",
+        :normsdnu => "‖s‖/ν",
         :normx => "‖x‖",
         :norms => "‖s‖",
         :normD => "‖D‖",
@@ -539,7 +540,7 @@ function SolverCore.solve!(
       Any[stats.iter, fk, hk, sqrt_ξ_νInv, norm_sdν, ρk, Δk, χ(xk), sNorm, norm(D.d), ""],
       colsep = 1,
     )
-    @info "TRDH: terminating with √(ξ/ν) = $(sqrt_ξ_νInv) and ‖sₖ‖/ν = $(norm_sdν)"
+    @info "TRDH: terminating with √(ξ/ν) = $(sqrt_ξ_νInv) and ‖s‖/ν = $(norm_sdν)"
   end
 
   set_solution!(stats, xk)

src/TR_alg.jl

@@ -544,7 +544,7 @@ function SolverCore.solve!(
       Any[stats.iter, solver.substats.iter, fk, hk, sqrt_ξ1_νInv, norm_s_cauchydν, ρk, Δk, χ(xk), χ(s), λmax, ""],
       colsep = 1,
     )
-    @info "TR: terminating with √(ξ1/ν) = $(sqrt_ξ1_νInv) and ‖sₖ₁‖/ν = $(norm_s_cauchydν)"
+    @info "TR: terminating with √(ξ1/ν) = $(sqrt_ξ1_νInv) and ‖s₁‖/ν = $(norm_s_cauchydν)"
   end
 
   set_solution!(stats, xk)