Skip to content

Commit 266fa1c

Browse files
fix(WIP): testing of OptimizationBBO with max sense
1 parent a8f4df2 commit 266fa1c

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

lib/OptimizationBBO/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "0.4.1"
66
[deps]
77
BlackBoxOptim = "a134a8b2-14d6-55f6-9291-3336d3ab0209"
88
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
9+
OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
910
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1011

1112
[compat]

lib/OptimizationBBO/src/OptimizationBBO.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
176176
fevals = opt_res.f_calls)
177177
SciMLBase.build_solution(cache, cache.opt,
178178
BlackBoxOptim.best_candidate(opt_res),
179-
BlackBoxOptim.best_fitness(opt_res);
179+
cache.sense === Optimization.MaxSense ?
180+
-BlackBoxOptim.best_fitness(opt_res) : BlackBoxOptim.best_fitness(opt_res);
180181
original = opt_res,
181182
retcode = opt_ret,
182183
stats = stats)

lib/OptimizationBBO/test/runtests.jl

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,14 @@ using Test
157157
@test sol_3.objective[2]0.477079 atol=1e-3
158158
end
159159
end
160-
end
161160

162-
# Max sense test
163-
J(x,p) = x[1]
164-
165-
F = OptimizationFunction(J)
166-
prob = Optimization.OptimizationProblem(F, [0.0]; lb = [-10], ub =[10], sense = MaxSense)
167-
sol = solve(prob, BBO_adaptive_de_rand_1_bin_radiuslimited())
168-
169-
@test sol.objective == 10.0
161+
@testset "Max sense test" begin
162+
J(x,p) = x[1]
163+
164+
F = OptimizationFunction(J)
165+
prob = Optimization.OptimizationProblem(F, [0.0]; lb = [-10], ub =[10], sense = MaxSense)
166+
sol = solve(prob, BBO_adaptive_de_rand_1_bin_radiuslimited())
167+
168+
@test sol.objective == 10.0
169+
end
170+
end

test/sense.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
using Optimization
2+

0 commit comments

Comments
 (0)