Skip to content

Commit 99e77b3

Browse files
Reorder Optim tests and relax bounds requirement in SpeedMapping
1 parent 4d93739 commit 99e77b3

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

lib/OptimizationOptimJL/test/runtests.jl

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ using Test
77
x0 = zeros(2)
88
_p = [1.0, 100.0]
99
l1 = rosenbrock(x0, _p)
10-
f = OptimizationFunction(rosenbrock, Optimization.AutoForwardDiff())
11-
prob = OptimizationProblem(f, x0, _p)
12-
Random.seed!(1234)
13-
sol = solve(prob, SimulatedAnnealing())
14-
@test 10 * sol.minimum < l1
15-
16-
Random.seed!(1234)
17-
prob = OptimizationProblem(f, x0, _p, lb = [-1.0, -1.0], ub = [0.8, 0.8])
18-
sol = solve(prob, SAMIN())
19-
@test 10 * sol.minimum < l1
2010

2111
prob = OptimizationProblem(rosenbrock, x0, _p)
2212
sol = solve(prob,
@@ -25,12 +15,17 @@ using Test
2515
b = 0.5)))
2616
@test 10 * sol.minimum < l1
2717

28-
cons = (res, x, p) -> res .= [x[1]^2 + x[2]^2]
29-
optprob = OptimizationFunction(rosenbrock, Optimization.AutoForwardDiff(); cons = cons)
30-
optprob = OptimizationFunction(rosenbrock, Optimization.AutoModelingToolkit();
31-
cons = cons)
18+
f = OptimizationFunction(rosenbrock, Optimization.AutoForwardDiff())
3219

33-
prob = OptimizationProblem(optprob, x0, _p)
20+
Random.seed!(1234)
21+
prob = OptimizationProblem(f, x0, _p, lb = [-1.0, -1.0], ub = [0.8, 0.8])
22+
sol = solve(prob, SAMIN())
23+
@test 10 * sol.minimum < l1
24+
25+
prob = OptimizationProblem(f, x0, _p)
26+
Random.seed!(1234)
27+
sol = solve(prob, SimulatedAnnealing())
28+
@test 10 * sol.minimum < l1
3429

3530
sol = solve(prob, Optim.BFGS())
3631
@test 10 * sol.minimum < l1
@@ -41,6 +36,10 @@ using Test
4136
sol = solve(prob, Optim.KrylovTrustRegion())
4237
@test 10 * sol.minimum < l1
4338

39+
cons = (res, x, p) -> res .= [x[1]^2 + x[2]^2]
40+
optprob = OptimizationFunction(rosenbrock, Optimization.AutoModelingToolkit();
41+
cons = cons)
42+
4443
prob = OptimizationProblem(optprob, x0, _p, lcons = [-Inf], ucons = [Inf])
4544
sol = solve(prob, IPNewton())
4645
@test 10 * sol.minimum < l1

lib/OptimizationPolyalgorithms/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ version = "0.1.0"
77
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
88
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
99
OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
10+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1011

1112
[compat]
1213
Optimization = "3"
1314
OptimizationOptimJL = "0.1"
1415
OptimizationOptimisers = "0.1"
16+
Reexport = "1.2"
1517
julia = "1.6"
1618

1719
[extras]

lib/OptimizationSpeedMapping/src/OptimizationSpeedMapping.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export SpeedMappingOpt
99
struct SpeedMappingOpt end
1010

1111
SciMLBase.allowsbounds(::SpeedMappingOpt) = true
12-
SciMLBase.requiresbounds(::SpeedMappingOpt) = true
1312
SciMLBase.allowscallback(::SpeedMappingOpt) = false
1413

1514
function __map_optimizer_args(prob::OptimizationProblem, opt::SpeedMappingOpt;

0 commit comments

Comments
 (0)