Skip to content

Commit

Permalink
Remove the changes in R2_alg.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
MohamedLaghdafHABIBOULLAH committed Oct 21, 2024
1 parent 1500d76 commit 3245e55
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions src/R2_alg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ mutable struct R2Solver{
Fobj_hist::Vector{R}
Hobj_hist::Vector{R}
Complex_hist::Vector{Int}
Time_hist::Vector{R}
end

function R2Solver(
Expand All @@ -47,7 +46,6 @@ function R2Solver(
end
Fobj_hist = zeros(R, maxIter + 2)
Hobj_hist = zeros(R, maxIter + 2)
Time_hist = zeros(R, maxIter + 2)
Complex_hist = zeros(Int, maxIter + 2)
return R2Solver(
xk,
Expand All @@ -64,7 +62,6 @@ function R2Solver(
Fobj_hist,
Hobj_hist,
Complex_hist,
Time_hist,
)
end

Expand All @@ -90,7 +87,6 @@ function R2Solver(reg_nlp::AbstractRegularizedNLPModel{T, V}; max_iter::Int = 10
end
Fobj_hist = zeros(T, max_iter + 2)
Hobj_hist = zeros(T, max_iter + 2)
Time_hist = zeros(T, max_iter + 2)
Complex_hist = zeros(Int, max_iter + 2)

ψ =
Expand All @@ -111,7 +107,6 @@ function R2Solver(reg_nlp::AbstractRegularizedNLPModel{T, V}; max_iter::Int = 10
Fobj_hist,
Hobj_hist,
Complex_hist,
Time_hist,
)
end

Expand Down Expand Up @@ -206,7 +201,6 @@ function R2(
ν = options.ν,
γ = options.γ,
)
return stats
end

function R2(
Expand Down Expand Up @@ -238,7 +232,6 @@ function R2(
outdict = Dict(
:Fhist => stats.solver_specific[:Fhist],
:Hhist => stats.solver_specific[:Hhist],
:Time_hist => stats.solver_specific[:Time_hist],
:Chist => stats.solver_specific[:SubsolverCounter],
:NonSmooth => h,
:status => stats.status,
Expand Down Expand Up @@ -281,7 +274,6 @@ function R2(
outdict = Dict(
:Fhist => stats.solver_specific[:Fhist],
:Hhist => stats.solver_specific[:Hhist],
:Time_hist => stats.solver_specific[:Time_hist],
:Chist => stats.solver_specific[:SubsolverCounter],
:NonSmooth => h,
:status => stats.status,
Expand All @@ -303,12 +295,10 @@ function R2(reg_nlp::AbstractRegularizedNLPModel; kwargs...)
solver.Fobj_hist[stats.iter + 1] = stats.solver_specific[:smooth_obj]
solver.Hobj_hist[stats.iter + 1] = stats.solver_specific[:nonsmooth_obj]
solver.Complex_hist[stats.iter + 1] += 1
solver.Time_hist[stats.iter + 1] = stats.elapsed_time
end
solve!(solver, reg_nlp, stats; callback = cb, max_iter = max_iter, kwargs...)
set_solver_specific!(stats, :Fhist, solver.Fobj_hist[1:(stats.iter + 1)])
set_solver_specific!(stats, :Hhist, solver.Hobj_hist[1:(stats.iter + 1)])
set_solver_specific!(stats, :Time_hist, solver.Time_hist[1:(stats.iter + 1)])
set_solver_specific!(stats, :SubsolverCounter, solver.Complex_hist[1:(stats.iter + 1)])
return stats
end
Expand Down

0 comments on commit 3245e55

Please sign in to comment.