Skip to content

Commit 0af0bae

Browse files
authored
R2: pass kwargs through
1 parent 050d75e commit 0af0bae

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/R2_alg.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ function R2(
199199
η1 = options.η1,
200200
η2 = options.η2,
201201
ν = options.ν,
202-
γ = options.γ,
202+
γ = options.γ;
203+
kwargs_dict...
203204
)
204205
end
205206

@@ -227,7 +228,8 @@ function R2(
227228
η1 = options.η1,
228229
η2 = options.η2,
229230
ν = options.ν,
230-
γ = options.γ,
231+
γ = options.γ;
232+
kwargs...
231233
)
232234
outdict = Dict(
233235
:Fhist => stats.solver_specific[:Fhist],
@@ -291,12 +293,13 @@ function R2(reg_nlp::AbstractRegularizedNLPModel; kwargs...)
291293
max_iter = pop!(kwargs_dict, :max_iter, 10000)
292294
solver = R2Solver(reg_nlp, max_iter = max_iter)
293295
stats = GenericExecutionStats(reg_nlp.model)
294-
cb =
296+
cb = pop!(kwargs_dict, :callback,
295297
(nlp, solver, stats) -> begin
296298
solver.Fobj_hist[stats.iter + 1] = stats.solver_specific[:smooth_obj]
297299
solver.Hobj_hist[stats.iter + 1] = stats.solver_specific[:nonsmooth_obj]
298300
solver.Complex_hist[stats.iter + 1] += 1
299301
end
302+
)
300303
solve!(solver, reg_nlp, stats; callback = cb, max_iter = max_iter, kwargs...)
301304
set_solver_specific!(stats, :Fhist, solver.Fobj_hist[1:(stats.iter + 1)])
302305
set_solver_specific!(stats, :Hhist, solver.Hobj_hist[1:(stats.iter + 1)])

0 commit comments

Comments
 (0)