Skip to content

Commit 3c31121

Browse files
Updates
1 parent 93ef8ed commit 3c31121

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/OptimizationAuglag/src/OptimizationAuglag.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module OptimizationAuglag
22

33
using OptimizationBase.SciMLBase, Optimization
4+
using OptimizationBase.SciMLBase: OptimizationProblem, OptimizationFunction, OptimizationStats
45
using OptimizationBase.LinearAlgebra: norm
56

67
@kwdef struct AugLag
@@ -20,7 +21,7 @@ SciMLBase.requiresgradient(::AugLag) = true
2021
SciMLBase.allowsconstraints(::AugLag) = true
2122
SciMLBase.requiresconsjac(::AugLag) = true
2223

23-
function __map_optimizer_args(cache::Optimization.OptimizationCache, opt::AugLag;
24+
function __map_optimizer_args(cache::OptimizationBase.OptimizationCache, opt::AugLag;
2425
callback = nothing,
2526
maxiters::Union{Number, Nothing} = nothing,
2627
maxtime::Union{Number, Nothing} = nothing,
@@ -110,7 +111,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
110111
cache.f.cons(cons_tmp, θ)
111112
cons_tmp[eq_inds] .= cons_tmp[eq_inds] - cache.lcons[eq_inds]
112113
cons_tmp[ineq_inds] .= cons_tmp[ineq_inds] .- cache.ucons[ineq_inds]
113-
opt_state = Optimization.OptimizationState(u = θ, objective = x[1], p = p)
114+
opt_state = Optimization.OptimizationState(u = θ, objective = x[1])
114115
if cache.callback(opt_state, x...)
115116
error("Optimization halted by callback.")
116117
end
@@ -177,7 +178,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
177178
break
178179
end
179180
end
180-
stats = Optimization.OptimizationStats(; iterations = maxiters,
181+
stats = OptimizationStats(; iterations = maxiters,
181182
time = 0.0, fevals = maxiters, gevals = maxiters)
182183
return SciMLBase.build_solution(
183184
cache, cache.opt, θ, x,

0 commit comments

Comments
 (0)