diff --git a/src/R2DH.jl b/src/R2DH.jl index 417229e6..1edb81eb 100644 --- a/src/R2DH.jl +++ b/src/R2DH.jl @@ -326,6 +326,8 @@ function SolverCore.solve!( set_objective!(stats, fk + hk) set_solver_specific!(stats, :smooth_obj, fk) set_solver_specific!(stats, :nonsmooth_obj, hk) + set_solver_specific!(stats, :sigma, σk) + set_solver_specific!(stats, :sigma_cauchy, 1/ν₁) m_monotone > 1 && (m_fh_hist[(stats.iter) % (m_monotone - 1) + 1] = fk + hk) φ(d) = begin @@ -424,6 +426,8 @@ function SolverCore.solve!( set_objective!(stats, fk + hk) set_solver_specific!(stats, :smooth_obj, fk) set_solver_specific!(stats, :nonsmooth_obj, hk) + set_solver_specific!(stats, :sigma, σk) + set_solver_specific!(stats, :sigma_cauchy, 1/ν₁) set_iter!(stats, stats.iter + 1) set_time!(stats, time() - start_time) diff --git a/src/R2N.jl b/src/R2N.jl index 2bd5bfc8..92f97125 100644 --- a/src/R2N.jl +++ b/src/R2N.jl @@ -304,6 +304,8 @@ function SolverCore.solve!( set_objective!(stats, fk + hk) set_solver_specific!(stats, :smooth_obj, fk) set_solver_specific!(stats, :nonsmooth_obj, hk) + set_solver_specific!(stats, :sigma, σk) + set_solver_specific!(stats, :sigma_cauchy, 1/ν₁) m_monotone > 1 && (m_fh_hist[stats.iter % (m_monotone - 1) + 1] = fk + hk) φ1 = let ∇fk = ∇fk @@ -439,6 +441,8 @@ function SolverCore.solve!( set_objective!(stats, fk + hk) set_solver_specific!(stats, :smooth_obj, fk) set_solver_specific!(stats, :nonsmooth_obj, hk) + set_solver_specific!(stats, :sigma, σk) + set_solver_specific!(stats, :sigma_cauchy, 1/ν₁) set_iter!(stats, stats.iter + 1) set_time!(stats, time() - start_time) diff --git a/src/utils.jl b/src/utils.jl index 991b8537..2f5d40bf 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -112,6 +112,7 @@ function RegularizedExecutionStats(reg_nlp::AbstractRegularizedNLPModel{T, V}) w set_solver_specific!(stats, :smooth_obj, T(Inf)) set_solver_specific!(stats, :nonsmooth_obj, T(Inf)) set_solver_specific!(stats, :sigma, T(Inf)) + set_solver_specific!(stats, :sigma_cauchy, T(Inf)) set_solver_specific!(stats, :radius, T(Inf)) return stats end