Skip to content

Commit a772c68

Browse files
add progress = false es
1 parent 454c87d commit a772c68

File tree

1 file changed

+35
-10
lines changed

1 file changed

+35
-10
lines changed

src/solve.jl

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ macro withprogress(progress, exprs...)
6565

6666
function __solve(prob::OptimizationProblem, opt, data = DEFAULT_DATA;
6767
cb = (args...) -> (false), maxiters::Number = 1000,
68-
progress = true, save_best = true, kwargs...)
68+
progress = false, save_best = true, kwargs...)
6969

7070
if maxiters <= 0.0
7171
error("The number of maxiters has to be a non-negative and non-zero number.")
@@ -158,7 +158,10 @@ end
158158
decompose_trace(trace::Optim.OptimizationTrace) = last(trace)
159159
decompose_trace(trace) = trace
160160

161-
function __solve(prob::OptimizationProblem, opt::Optim.AbstractOptimizer, data = DEFAULT_DATA;cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
161+
function __solve(prob::OptimizationProblem, opt::Optim.AbstractOptimizer,
162+
data = DEFAULT_DATA;cb = (args...) -> (false),
163+
progress = false,
164+
maxiters::Number = 1000, kwargs...)
162165
local x, cur, state
163166

164167
if data != DEFAULT_DATA
@@ -207,7 +210,11 @@ function __solve(prob::OptimizationProblem, opt::Optim.AbstractOptimizer, data =
207210
Optim.optimize(optim_f, prob.u0, opt, Optim.Options(;extended_trace = true, callback = _cb, iterations = maxiters, kwargs...))
208211
end
209212

210-
function __solve(prob::OptimizationProblem, opt::Union{Optim.Fminbox,Optim.SAMIN}, data = DEFAULT_DATA;cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
213+
function __solve(prob::OptimizationProblem, opt::Union{Optim.Fminbox,Optim.SAMIN},
214+
data = DEFAULT_DATA;cb = (args...) -> (false),
215+
progress = false,
216+
maxiters::Number = 1000, kwargs...)
217+
211218
local x, cur, state
212219

213220
if data != DEFAULT_DATA
@@ -252,7 +259,11 @@ function __solve(prob::OptimizationProblem, opt::Union{Optim.Fminbox,Optim.SAMIN
252259
end
253260

254261

255-
function __solve(prob::OptimizationProblem, opt::Optim.ConstrainedOptimizer, data = DEFAULT_DATA;cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
262+
function __solve(prob::OptimizationProblem, opt::Optim.ConstrainedOptimizer,
263+
data = DEFAULT_DATA;cb = (args...) -> (false),
264+
progress = false,
265+
maxiters::Number = 1000, kwargs...)
266+
256267
local x, cur, state
257268

258269
if data != DEFAULT_DATA
@@ -326,7 +337,10 @@ function __init__()
326337
BBO() = BBO(:adaptive_de_rand_1_bin_radiuslimited) # the recommended optimizer as default
327338

328339

329-
function __solve(prob::OptimizationProblem, opt::BBO, data = DEFAULT_DATA; cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
340+
function __solve(prob::OptimizationProblem, opt::BBO, data = DEFAULT_DATA;
341+
cb = (args...) -> (false), maxiters::Number = 1000,
342+
progress = false, kwargs...)
343+
330344
local x, cur, state
331345

332346
if data != DEFAULT_DATA
@@ -393,7 +407,10 @@ function __init__()
393407
end
394408

395409
@require NLopt="76087f3c-5699-56af-9a33-bf431cd00edd" begin
396-
function __solve(prob::OptimizationProblem, opt::NLopt.Opt; maxiters::Number = 1000, nstart = 1, local_method = nothing, kwargs...)
410+
function __solve(prob::OptimizationProblem, opt::NLopt.Opt;
411+
maxiters::Number = 1000, nstart = 1,
412+
local_method = nothing,
413+
progress = false, kwargs...)
397414
local x
398415

399416
if maxiters <= 0.0
@@ -469,7 +486,9 @@ function __init__()
469486
end
470487

471488
@require MultistartOptimization = "3933049c-43be-478e-a8bb-6e0f7fd53575" begin
472-
function __solve(prob::OptimizationProblem, opt::MultistartOptimization.TikTak; local_method, local_maxiters::Number = 1000, kwargs...)
489+
function __solve(prob::OptimizationProblem, opt::MultistartOptimization.TikTak;
490+
local_method, local_maxiters::Number = 1000,
491+
progress = false, kwargs...)
473492
local x, _loss
474493

475494
if local_maxiters <= 0.0
@@ -529,7 +548,9 @@ function __init__()
529548
struct QuadDirect
530549
end
531550

532-
function __solve(prob::OptimizationProblem, opt::QuadDirect; splits, maxiters::Number = 1000, kwargs...)
551+
function __solve(prob::OptimizationProblem, opt::QuadDirect; splits,
552+
maxiters::Number = 1000,
553+
progress = false, kwargs...)
533554
local x, _loss
534555

535556
if maxiters <= 0.0
@@ -587,7 +608,9 @@ function __init__()
587608
record["x"] = population
588609
end
589610

590-
function __solve(prob::OptimizationProblem, opt::Evolutionary.AbstractOptimizer, data = DEFAULT_DATA; cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
611+
function __solve(prob::OptimizationProblem, opt::Evolutionary.AbstractOptimizer, data = DEFAULT_DATA;
612+
cb = (args...) -> (false), maxiters::Number = 1000,
613+
progress = false, kwargs...)
591614
local x, cur, state
592615

593616
if data != DEFAULT_DATA
@@ -623,7 +646,9 @@ function __init__()
623646

624647
struct CMAEvolutionStrategyOpt end
625648

626-
function __solve(prob::OptimizationProblem, opt::CMAEvolutionStrategyOpt, data = DEFAULT_DATA; cb = (args...) -> (false), maxiters::Number = 1000, kwargs...)
649+
function __solve(prob::OptimizationProblem, opt::CMAEvolutionStrategyOpt, data = DEFAULT_DATA;
650+
cb = (args...) -> (false), maxiters::Number = 1000,
651+
progress = false, kwargs...)
627652
local x, cur, state
628653

629654
if data != DEFAULT_DATA

0 commit comments

Comments
 (0)