Skip to content

Commit 06ee582

Browse files
committed
Update solve.jl
Removed the method parameter and added the user-defined method directly to the BBO struct.
1 parent a3e4397 commit 06ee582

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/solve.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,13 @@ function __init__()
321321

322322
struct BBO
323323
method::Symbol
324+
BBO(method) = new(method)
324325
end
325326

326327
BBO() = BBO(:adaptive_de_rand_1_bin_radiuslimited) # the recommended optimizer as default
327328

328-
function __solve(prob::OptimizationProblem, opt::BBO, data = DEFAULT_DATA; cb = (args...) -> (false), maxiters::Number = 1000, method = nothing, kwargs...)
329+
330+
function __solve(prob::OptimizationProblem, opt::BBO, data = DEFAULT_DATA; cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
329331
local x, cur, state
330332

331333
if data != DEFAULT_DATA
@@ -357,13 +359,10 @@ function __init__()
357359
return first(x)
358360
end
359361

360-
if method !== nothing
361-
bboptre = BlackBoxOptim.bboptimize(_loss;Method = method, SearchRange = [(prob.lb[i], prob.ub[i]) for i in 1:length(prob.lb)], MaxSteps = maxiters, CallbackFunction = _cb, CallbackInterval = 0.0, kwargs...)
362-
else
363-
bboptre = BlackBoxOptim.bboptimize(_loss;Method = opt.method, SearchRange = [(prob.lb[i], prob.ub[i]) for i in 1:length(prob.lb)], MaxSteps = maxiters, CallbackFunction = _cb, CallbackInterval = 0.0, kwargs...)
364-
end
362+
bboptre = BlackBoxOptim.bboptimize(_loss;Method = opt.method, SearchRange = [(prob.lb[i], prob.ub[i]) for i in 1:length(prob.lb)], MaxSteps = maxiters, CallbackFunction = _cb, CallbackInterval = 0.0, kwargs...)
363+
365364

366-
Optim.MultivariateOptimizationResults(bboptre.method,
365+
Optim.MultivariateOptimizationResults(opt.method,
367366
[NaN],# initial_x,
368367
BlackBoxOptim.best_candidate(bboptre), #pick_best_x(f_incr_pick, state),
369368
BlackBoxOptim.best_fitness(bboptre), # pick_best_f(f_incr_pick, state, d),

0 commit comments

Comments
 (0)