@@ -21,7 +21,6 @@ mutable struct R2Solver{
2121 Fobj_hist:: Vector{R}
2222 Hobj_hist:: Vector{R}
2323 Complex_hist:: Vector{Int}
24- Time_hist:: Vector{R}
2524end
2625
2726function R2Solver (
@@ -47,7 +46,6 @@ function R2Solver(
4746 end
4847 Fobj_hist = zeros (R, maxIter + 2 )
4948 Hobj_hist = zeros (R, maxIter + 2 )
50- Time_hist = zeros (R, maxIter + 2 )
5149 Complex_hist = zeros (Int, maxIter + 2 )
5250 return R2Solver (
5351 xk,
@@ -64,7 +62,6 @@ function R2Solver(
6462 Fobj_hist,
6563 Hobj_hist,
6664 Complex_hist,
67- Time_hist,
6865 )
6966end
7067
@@ -90,7 +87,6 @@ function R2Solver(reg_nlp::AbstractRegularizedNLPModel{T, V}; max_iter::Int = 10
9087 end
9188 Fobj_hist = zeros (T, max_iter + 2 )
9289 Hobj_hist = zeros (T, max_iter + 2 )
93- Time_hist = zeros (T, max_iter + 2 )
9490 Complex_hist = zeros (Int, max_iter + 2 )
9591
9692 ψ =
@@ -111,7 +107,6 @@ function R2Solver(reg_nlp::AbstractRegularizedNLPModel{T, V}; max_iter::Int = 10
111107 Fobj_hist,
112108 Hobj_hist,
113109 Complex_hist,
114- Time_hist,
115110 )
116111end
117112
@@ -206,7 +201,6 @@ function R2(
206201 ν = options. ν,
207202 γ = options. γ,
208203 )
209- return stats
210204end
211205
212206function R2 (
@@ -238,7 +232,6 @@ function R2(
238232 outdict = Dict (
239233 :Fhist => stats. solver_specific[:Fhist ],
240234 :Hhist => stats. solver_specific[:Hhist ],
241- :Time_hist => stats. solver_specific[:Time_hist ],
242235 :Chist => stats. solver_specific[:SubsolverCounter ],
243236 :NonSmooth => h,
244237 :status => stats. status,
@@ -281,7 +274,6 @@ function R2(
281274 outdict = Dict (
282275 :Fhist => stats. solver_specific[:Fhist ],
283276 :Hhist => stats. solver_specific[:Hhist ],
284- :Time_hist => stats. solver_specific[:Time_hist ],
285277 :Chist => stats. solver_specific[:SubsolverCounter ],
286278 :NonSmooth => h,
287279 :status => stats. status,
@@ -303,12 +295,10 @@ function R2(reg_nlp::AbstractRegularizedNLPModel; kwargs...)
303295 solver. Fobj_hist[stats. iter + 1 ] = stats. solver_specific[:smooth_obj ]
304296 solver. Hobj_hist[stats. iter + 1 ] = stats. solver_specific[:nonsmooth_obj ]
305297 solver. Complex_hist[stats. iter + 1 ] += 1
306- solver. Time_hist[stats. iter + 1 ] = stats. elapsed_time
307298 end
308299 solve! (solver, reg_nlp, stats; callback = cb, max_iter = max_iter, kwargs... )
309300 set_solver_specific! (stats, :Fhist , solver. Fobj_hist[1 : (stats. iter + 1 )])
310301 set_solver_specific! (stats, :Hhist , solver. Hobj_hist[1 : (stats. iter + 1 )])
311- set_solver_specific! (stats, :Time_hist , solver. Time_hist[1 : (stats. iter + 1 )])
312302 set_solver_specific! (stats, :SubsolverCounter , solver. Complex_hist[1 : (stats. iter + 1 )])
313303 return stats
314304end
@@ -570,4 +560,4 @@ function get_status(
570560 else
571561 :unknown
572562 end
573- end
563+ end
0 commit comments