Skip to content

Commit f25732e

Browse files
tmigottmigot
authored
reset! (#291)
1 parent 1638f1d commit f25732e

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

‎src/fomo.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ function SolverCore.reset!(solver::FomoSolver{T}) where {T}
264264
solver
265265
end
266266

267-
SolverCore.reset!(solver::FomoSolver, ::AbstractNLPModel) = reset!(solver)
267+
SolverCore.reset!(solver::FomoSolver, ::AbstractNLPModel) = SolverCore.reset!(solver)
268268

269269
"""
270270
fo(nlp; kwargs...)
@@ -407,7 +407,7 @@ function SolverCore.reset!(solver::FoSolver{T}) where {T}
407407
solver
408408
end
409409

410-
SolverCore.reset!(solver::FoSolver, ::AbstractNLPModel) = reset!(solver)
410+
SolverCore.reset!(solver::FoSolver, ::AbstractNLPModel) = SolverCore.reset!(solver)
411411

412412
function SolverCore.solve!(
413413
solver::Union{FoSolver, FomoSolver},
@@ -440,7 +440,7 @@ function SolverCore.solve!(
440440
use_momentum = typeof(solver) <: FomoSolver
441441
is_r2 = typeof(step_backend) <: r2_step
442442

443-
reset!(stats)
443+
SolverCore.reset!(stats)
444444
start_time = time()
445445
set_time!(stats, 0.0)
446446

‎src/lbfgs.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ function LBFGSSolver(nlp::M; kwargs...) where {T, V, M <: AbstractNLPModel{T, V}
127127
end
128128

129129
function SolverCore.reset!(solver::LBFGSSolver)
130-
reset!(solver.H)
130+
LinearOperators.reset!(solver.H)
131131
end
132132

133133
function SolverCore.reset!(solver::LBFGSSolver, nlp::AbstractNLPModel)
134-
reset!(solver.H)
134+
LinearOperators.reset!(solver.H)
135135
solver.h = LineModel(nlp, solver.x, solver.d)
136136
solver
137137
end
@@ -169,7 +169,7 @@ function SolverCore.solve!(
169169
error("lbfgs should only be called for unconstrained problems. Try tron instead")
170170
end
171171

172-
reset!(stats)
172+
SolverCore.reset!(stats)
173173
start_time = time()
174174
set_time!(stats, 0.0)
175175

@@ -187,7 +187,7 @@ function SolverCore.solve!(
187187
d = solver.d
188188
h = solver.h
189189
H = solver.H
190-
reset!(H)
190+
LinearOperators.reset!(H)
191191

192192
f, ∇f = objgrad!(nlp, x, ∇f)
193193

‎src/tron.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ function SolverCore.solve!(
259259
μ₁ = value(solver.params.μ₁)
260260
σ = value(solver.params.σ)
261261

262-
reset!(stats)
262+
SolverCore.reset!(stats)
263263
ℓ = nlp.meta.lvar
264264
u = nlp.meta.uvar
265265
n = nlp.meta.nvar

‎src/tronls.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ end
224224
function SolverCore.reset!(solver::TronSolverNLS, nlp::AbstractNLPModel)
225225
solver.A = jac_op_residual!(nlp, solver.xc, solver.Av, solver.Atv)
226226
solver.AZ = solver.A * solver.ls_op
227-
reset!(solver)
227+
SolverCore.reset!(solver)
228228
solver
229229
end
230230

@@ -285,7 +285,7 @@ function SolverCore.solve!(
285285
μ₁ = value(solver.params.μ₁)
286286
σ = value(solver.params.σ)
287287

288-
reset!(stats)
288+
SolverCore.reset!(stats)
289289
ℓ = nlp.meta.lvar
290290
u = nlp.meta.uvar
291291
n = nlp.meta.nvar

‎src/trunk.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ function SolverCore.solve!(
207207
monotone = value(solver.params.monotone)
208208
nm_itmax = value(solver.params.nm_itmax)
209209

210-
reset!(stats)
210+
SolverCore.reset!(stats)
211211
start_time = time()
212212
set_time!(stats, 0.0)
213213

‎src/trunkls.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function SolverCore.solve!(
241241
monotone = value(solver.params.monotone)
242242
nm_itmax = value(solver.params.nm_itmax)
243243

244-
reset!(stats)
244+
SolverCore.reset!(stats)
245245
start_time = time()
246246
set_time!(stats, 0.0)
247247

‎test/allocs.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ if Sys.isunix()
4848
end
4949
with_logger(NullLogger()) do
5050
SolverCore.solve!(solver, nlp, stats)
51-
reset!(solver)
52-
reset!(nlp)
51+
SolverCore.reset!(solver)
52+
NLPModels.reset!(nlp)
5353
al = @wrappedallocs SolverCore.solve!(solver, nlp, stats)
5454
@test al == 0
5555
end
@@ -65,8 +65,8 @@ if Sys.isunix()
6565
stats = GenericExecutionStats(nlp)
6666
with_logger(NullLogger()) do
6767
SolverCore.solve!(solver, nlp, stats)
68-
reset!(solver)
69-
reset!(nlp)
68+
SolverCore.reset!(solver)
69+
NLPModels.reset!(nlp)
7070
al = @wrappedallocs SolverCore.solve!(solver, nlp, stats)
7171
@test al == 0
7272
end

‎test/consistency.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ function consistency()
1212

1313
@testset "NLP with $mtd" for mtd in [trunk, lbfgs, tron, R2, fomo]
1414
with_logger(NullLogger()) do
15-
reset!(unlp)
15+
NLPModels.reset!(unlp)
1616
stats = mtd(unlp; args...)
1717
@test stats isa GenericExecutionStats
1818
@test stats.status == :first_order
19-
reset!(unlp)
19+
NLPModels.reset!(unlp)
2020
stats = mtd(unlp; max_eval = 1)
2121
@test stats.status == :max_eval
2222
slow_nlp = ADNLPModel(x -> begin
@@ -30,7 +30,7 @@ function consistency()
3030

3131
@testset "Quasi-Newton NLP with $mtd" for mtd in [trunk, lbfgs, tron, R2, fomo]
3232
with_logger(NullLogger()) do
33-
reset!(qnlp)
33+
NLPModels.reset!(qnlp)
3434
stats = mtd(qnlp; args...)
3535
@test stats isa GenericExecutionStats
3636
@test stats.status == :first_order
@@ -42,7 +42,7 @@ function consistency()
4242
stats = mtd(unls; args...)
4343
@test stats isa GenericExecutionStats
4444
@test stats.status == :first_order
45-
reset!(unls)
45+
NLPModels.reset!(unls)
4646
stats = mtd(unls; max_eval = 1)
4747
@test stats.status == :max_eval
4848
slow_nls = ADNLSModel(x -> begin

‎test/solvers/tronls.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@test isapprox(stats.objective, 0, atol = 1e-6)
1212
@test neval_jac_residual(model) == 0
1313
stline = statsline(stats, [:objective, :dual_feas, :elapsed_time, :iter, :status])
14-
reset!(model)
14+
NLPModels.reset!(model)
1515
end
1616

1717
@test_throws ErrorException tron(model, subsolver = :minres)
@@ -33,6 +33,6 @@ end
3333
@test isapprox(stats.objective, 0, atol = 1e-6)
3434
@test neval_jac_residual(model) == 0
3535
stline = statsline(stats, [:objective, :dual_feas, :elapsed_time, :iter, :status])
36-
reset!(model)
36+
NLPModels.reset!(model)
3737
end
3838
end

‎test/solvers/trunkls.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@test isapprox(stats.objective, 0, atol = 1e-6)
1414
@test neval_jac_residual(model) == 0
1515
stline = statsline(stats, [:objective, :dual_feas, :elapsed_time, :iter, :status])
16-
reset!(model)
16+
NLPModels.reset!(model)
1717
end
1818

1919
@test_throws ErrorException trunk(model, subsolver_type = MinresSolver)
@@ -35,6 +35,6 @@ end
3535
@test isapprox(stats.objective, 0, atol = 1e-6)
3636
@test neval_jac_residual(model) == 0
3737
stline = statsline(stats, [:objective, :dual_feas, :elapsed_time, :iter, :status])
38-
reset!(model)
38+
NLPModels.reset!(model)
3939
end
4040
end

0 commit comments

Comments
 (0)