Skip to content

Commit eb4dff7

Browse files
Update tests to LBFGSB
1 parent 320cf9e commit eb4dff7

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

lib/OptimizationBase/test/cvxtest.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Optimization, OptimizationBase, ForwardDiff, SymbolicAnalysis, LinearAlgebra,
2-
Manifolds, OptimizationManopt
2+
Manifolds, OptimizationManopt, OptimizationLBFGSB
33

44
function f(x, p = nothing)
55
return exp(x[1]) + x[1]^2
@@ -8,7 +8,7 @@ end
88
optf = OptimizationFunction(f, Optimization.AutoForwardDiff())
99
prob = OptimizationProblem(optf, [0.4], structural_analysis = true)
1010

11-
@time sol = solve(prob, Optimization.LBFGS(), maxiters = 1000)
11+
@time sol = solve(prob, OptimizationLBFGSB.LBFGSB(), maxiters = 1000)
1212
@test sol.cache.analysis_results.objective.curvature == SymbolicAnalysis.Convex
1313
@test sol.cache.analysis_results.constraints === nothing
1414

@@ -18,7 +18,7 @@ l1 = rosenbrock(x0)
1818

1919
optf = OptimizationFunction(rosenbrock, AutoEnzyme())
2020
prob = OptimizationProblem(optf, x0, structural_analysis = true)
21-
@time res = solve(prob, Optimization.LBFGS(), maxiters = 100)
21+
@time res = solve(prob, OptimizationLBFGSB.LBFGSB(), maxiters = 100)
2222
@test res.cache.analysis_results.objective.curvature == SymbolicAnalysis.UnknownCurvature
2323

2424
function con2_c(res, x, p)
@@ -28,7 +28,7 @@ end
2828
optf = OptimizationFunction(rosenbrock, AutoZygote(), cons = con2_c)
2929
prob = OptimizationProblem(optf, x0, lcons = [1.0, -Inf], ucons = [1.0, 0.0],
3030
lb = [-1.0, -1.0], ub = [1.0, 1.0], structural_analysis = true)
31-
@time res = solve(prob, Optimization.LBFGS(), maxiters = 100)
31+
@time res = solve(prob, OptimizationLBFGSB.LBFGSB(), maxiters = 100)
3232
@test res.cache.analysis_results.objective.curvature == SymbolicAnalysis.UnknownCurvature
3333
@test res.cache.analysis_results.constraints[1].curvature == SymbolicAnalysis.Convex
3434
@test res.cache.analysis_results.constraints[2].curvature ==

lib/OptimizationNLPModels/test/runtests.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using OptimizationNLPModels, Optimization, NLPModelsTest, Ipopt, OptimizationMOI, Zygote,
2-
ReverseDiff,
3-
OptimizationOptimJL
2+
ReverseDiff, OptimizationLBFGSB, OptimizationOptimJL
43
using Test
54

65
@testset "NLPModels" begin
@@ -18,8 +17,8 @@ using Test
1817
nlpmo = NLPModelsTest.HS5()
1918
converted = OptimizationNLPModels.OptimizationProblem(nlpmo, Optimization.AutoZygote())
2019

21-
sol_native = solve(oprob, Optimization.LBFGS(), maxiters = 1000)
22-
sol_converted = solve(converted, Optimization.LBFGS(), maxiters = 1000)
20+
sol_native = solve(oprob, OptimizationLBFGSB.LBFGSB(), maxiters = 1000)
21+
sol_converted = solve(converted, OptimizationLBFGSB.LBFGSB(), maxiters = 1000)
2322

2423
@test sol_converted.retcode == sol_native.retcode
2524
@test sol_converted.u sol_native.u

0 commit comments

Comments
 (0)