Skip to content

Commit bcbee9e

Browse files
ChrisRackauckasChrisRackauckas
committed
finish refactor
1 parent 32ab5b5 commit bcbee9e

File tree

16 files changed

+74
-74
lines changed

16 files changed

+74
-74
lines changed

‎lib/OptimizationAuglag/src/OptimizationAuglag.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
8383
P,
8484
C
8585
}
86-
maxiters = Optimization._check_and_convert_maxiters(cache.solver_args.maxiters)
86+
maxiters = OptimizationBase._check_and_convert_maxiters(cache.solver_args.maxiters)
8787

8888
local x
8989

@@ -115,7 +115,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
115115
cache.f.cons(cons_tmp, θ)
116116
cons_tmp[eq_inds] .= cons_tmp[eq_inds] - cache.lcons[eq_inds]
117117
cons_tmp[ineq_inds] .= cons_tmp[ineq_inds] .- cache.ucons[ineq_inds]
118-
opt_state = Optimization.OptimizationState(u = θ, objective = x[1])
118+
opt_state = OptimizationBase.OptimizationState(u = θ, objective = x[1])
119119
if cache.callback(opt_state, x...)
120120
error("Optimization halted by callback.")
121121
end

‎lib/OptimizationBase/src/augmented_lagrangian.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function generate_auglag(θ)
44
cache.f.cons(cons_tmp, θ)
55
cons_tmp[eq_inds] .= cons_tmp[eq_inds] - cache.lcons[eq_inds]
66
cons_tmp[ineq_inds] .= cons_tmp[ineq_inds] .- cache.ucons[ineq_inds]
7-
opt_state = Optimization.OptimizationState(u = θ, objective = x[1])
7+
opt_state = OptimizationBase.OptimizationState(u = θ, objective = x[1])
88
if cache.callback(opt_state, x...)
99
error("Optimization halted by callback.")
1010
end

‎lib/OptimizationGCMAES/src/OptimizationGCMAES.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
110110
maxtime = maxtime)
111111

112112
t0 = time()
113-
if cache.sense === Optimization.MaxSense
113+
if cache.sense === OptimizationBase.MaxSense
114114
opt_xmin, opt_fmin,
115115
opt_ret = GCMAES.maximize(
116116
isnothing(cache.f.grad) ? _loss :

‎lib/OptimizationIpopt/src/cache.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ function IpoptCache(prob, opt;
8080
num_cons = prob.ucons === nothing ? 0 : length(prob.ucons)
8181
if prob.f.adtype isa ADTypes.AutoSymbolics || (prob.f.adtype isa ADTypes.AutoSparse &&
8282
prob.f.adtype.dense_ad isa ADTypes.AutoSymbolics)
83-
f = Optimization.instantiate_function(
83+
f = OptimizationBase.instantiate_function(
8484
prob.f, reinit_cache, prob.f.adtype, num_cons;
8585
g = true, h = true, cons_j = true, cons_h = true)
8686
else
87-
f = Optimization.instantiate_function(
87+
f = OptimizationBase.instantiate_function(
8888
prob.f, reinit_cache, prob.f.adtype, num_cons;
8989
g = true, h = true, cons_j = true, cons_vjp = true, lag_h = true)
9090
end
@@ -150,7 +150,7 @@ end
150150
function eval_objective(cache::IpoptCache, x)
151151
l = cache.f(x, cache.p)
152152
cache.f_calls += 1
153-
return cache.sense === Optimization.MaxSense ? -l : l
153+
return cache.sense === OptimizationBase.MaxSense ? -l : l
154154
end
155155

156156
function eval_constraint(cache::IpoptCache, g, x)
@@ -167,7 +167,7 @@ function eval_objective_gradient(cache::IpoptCache, G, x)
167167
cache.f.grad(G, x)
168168
cache.f_grad_calls += 1
169169

170-
if cache.sense === Optimization.MaxSense
170+
if cache.sense === OptimizationBase.MaxSense
171171
G .*= -one(eltype(G))
172172
end
173173

@@ -256,7 +256,7 @@ function eval_hessian_lagrangian(cache::IpoptCache{T},
256256
if cache.f.lag_h !== nothing
257257
cache.f.lag_h(h, x, σ, Vector(μ))
258258

259-
if cache.sense === Optimization.MaxSense
259+
if cache.sense === OptimizationBase.MaxSense
260260
h .*= -one(eltype(h))
261261
end
262262

@@ -320,7 +320,7 @@ function eval_hessian_lagrangian(cache::IpoptCache{T},
320320
end
321321
end
322322

323-
if cache.sense === Optimization.MaxSense
323+
if cache.sense === OptimizationBase.MaxSense
324324
h .*= -one(eltype(h))
325325
end
326326

‎lib/OptimizationMOI/src/moi.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ end
1414

1515
function MOIOptimizationCache(prob::OptimizationProblem, opt; kwargs...)
1616
f = prob.f
17-
reinit_cache = Optimization.ReInitCache(prob.u0, prob.p)
17+
reinit_cache = OptimizationBase.ReInitCache(prob.u0, prob.p)
1818
if isnothing(f.sys)
19-
if f.adtype isa Optimization.AutoModelingToolkit
19+
if f.adtype isa OptimizationBase.AutoModelingToolkit
2020
num_cons = prob.ucons === nothing ? 0 : length(prob.ucons)
21-
f = Optimization.instantiate_function(prob.f,
21+
f = OptimizationBase.instantiate_function(prob.f,
2222
reinit_cache,
2323
prob.f.adtype,
2424
num_cons)
@@ -120,7 +120,7 @@ function SciMLBase.__solve(cache::MOIOptimizationCache)
120120
Theta = _add_moi_variables!(opt_setup, cache)
121121
MOI.set(opt_setup,
122122
MOI.ObjectiveSense(),
123-
cache.sense === Optimization.MaxSense ? MOI.MAX_SENSE : MOI.MIN_SENSE)
123+
cache.sense === OptimizationBase.MaxSense ? MOI.MAX_SENSE : MOI.MIN_SENSE)
124124

125125
if !isnothing(cache.cons_expr)
126126
for cons_expr in cache.cons_expr

‎lib/OptimizationMOI/src/nlp.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ function MOIOptimizationNLPCache(prob::OptimizationProblem,
113113
num_cons = prob.ucons === nothing ? 0 : length(prob.ucons)
114114
if prob.f.adtype isa ADTypes.AutoSymbolics || (prob.f.adtype isa ADTypes.AutoSparse &&
115115
prob.f.adtype.dense_ad isa ADTypes.AutoSymbolics)
116-
f = Optimization.instantiate_function(
116+
f = OptimizationBase.instantiate_function(
117117
prob.f, reinit_cache, prob.f.adtype, num_cons;
118118
g = true, h = true, cons_j = true, cons_h = true)
119119
else
120-
f = Optimization.instantiate_function(
120+
f = OptimizationBase.instantiate_function(
121121
prob.f, reinit_cache, prob.f.adtype, num_cons;
122122
g = true, h = true, cons_j = true, cons_vjp = true, lag_h = true)
123123
end
@@ -534,7 +534,7 @@ function SciMLBase.__solve(cache::MOIOptimizationNLPCache)
534534
θ = _add_moi_variables!(opt_setup, cache.evaluator)
535535
MOI.set(opt_setup,
536536
MOI.ObjectiveSense(),
537-
cache.evaluator.sense === Optimization.MaxSense ? MOI.MAX_SENSE : MOI.MIN_SENSE)
537+
cache.evaluator.sense === OptimizationBase.MaxSense ? MOI.MAX_SENSE : MOI.MIN_SENSE)
538538
xor(isnothing(cache.evaluator.lcons), isnothing(cache.evaluator.ucons)) &&
539539
throw(ArgumentError("Expected `cache.evaluator.lcons` and `cache.evaluator.lcons` to be supplied both or none."))
540540
if isnothing(cache.evaluator.lcons) && isnothing(cache.evaluator.ucons)

‎lib/OptimizationManopt/src/OptimizationManopt.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ function build_loss(f::OptimizationFunction, prob, cb)
251251
x = f.f(θ, prob.p)
252252
cb(x, θ)
253253
__x = first(x)
254-
return prob.sense === Optimization.MaxSense ? -__x : __x
254+
return prob.sense === OptimizationBase.MaxSense ? -__x : __x
255255
end
256256
end
257257

@@ -367,7 +367,7 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
367367
return SciMLBase.build_solution(cache,
368368
cache.opt,
369369
opt_res.minimizer,
370-
cache.sense === Optimization.MaxSense ?
370+
cache.sense === OptimizationBase.MaxSense ?
371371
-opt_res.minimum : opt_res.minimum;
372372
original = opt_res.options,
373373
retcode = opt_ret)

‎lib/OptimizationMultistartOptimization/src/OptimizationMultistartOptimization.jl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ using Reexport
44
@reexport using MultistartOptimization, OptimizationBase
55
using SciMLBase
66

7-
SciMLBase.requiresbounds(opt::MultistartOptimization.TikTak) = true
8-
SciMLBase.allowsbounds(opt::MultistartOptimization.TikTak) = true
9-
SciMLBase.allowscallback(opt::MultistartOptimization.TikTak) = false
7+
SciMLBase.requiresbounds(opt::MultistartOptimizationBase.TikTak) = true
8+
SciMLBase.allowsbounds(opt::MultistartOptimizationBase.TikTak) = true
9+
SciMLBase.allowscallback(opt::MultistartOptimizationBase.TikTak) = false
1010
@static if isdefined(SciMLBase, :supports_opt_cache_interface)
11-
SciMLBase.supports_opt_cache_interface(opt::MultistartOptimization.TikTak) = true
11+
SciMLBase.supports_opt_cache_interface(opt::MultistartOptimizationBase.TikTak) = true
1212
end
1313
@static if isdefined(OptimizationBase, :supports_opt_cache_interface)
14-
OptimizationBase.supports_opt_cache_interface(opt::MultistartOptimization.TikTak) = true
14+
OptimizationBase.supports_opt_cache_interface(opt::MultistartOptimizationBase.TikTak) = true
1515
end
1616

1717
function SciMLBase.__init(prob::SciMLBase.OptimizationProblem,
18-
opt::MultistartOptimization.TikTak,
18+
opt::MultistartOptimizationBase.TikTak,
1919
local_opt;
2020
use_threads = true,
2121
kwargs...)
@@ -45,7 +45,7 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
4545
UC,
4646
S,
4747
O <:
48-
MultistartOptimization.TikTak,
48+
MultistartOptimizationBase.TikTak,
4949
D,
5050
P,
5151
C
@@ -57,7 +57,7 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
5757
return first(x)
5858
end
5959

60-
opt_setup = MultistartOptimization.MinimizationProblem(_loss, cache.lb, cache.ub)
60+
opt_setup = MultistartOptimizationBase.MinimizationProblem(_loss, cache.lb, cache.ub)
6161

6262
_local_optimiser = function (pb, θ0, prob)
6363
prob_tmp = remake(prob, u0 = θ0)

‎lib/OptimizationNLPModels/src/OptimizationNLPModels.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ function SciMLBase.OptimizationProblem(nlpmodel::AbstractNLPModel,
5151
else
5252
(nothing, nothing)
5353
end
54-
sense = nlpmodel.meta.minimize ? Optimization.MinSense : Optimization.MaxSense
54+
sense = nlpmodel.meta.minimize ? OptimizationBase.MinSense : OptimizationBase.MaxSense
5555

5656
# The number of variables, geometry of u0, etc.. are valid and were checked when the
5757
# nlpmodel was created.
5858

59-
return Optimization.OptimizationProblem(
59+
return OptimizationBase.OptimizationProblem(
6060
f, u0; lb = lb, ub = ub, lcons = lcons, ucons = ucons, sense = sense, kwargs...)
6161
end
6262

‎lib/OptimizationNLopt/src/OptimizationNLopt.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function SciMLBase.__solve(cache::OptimizationBase.OptimizationCache{
192192
NLopt.Opt(cache.opt, length(cache.u0))
193193
end
194194

195-
if cache.sense === Optimization.MaxSense
195+
if cache.sense === OptimizationBase.MaxSense
196196
NLopt.max_objective!(opt_setup, fg!)
197197
else
198198
NLopt.min_objective!(opt_setup, fg!)

0 commit comments

Comments
 (0)