Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/controller/execute.jl
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,15 @@ end
"""
addinfo!(info, mpc::PredictiveController) -> info

By default, add the custom linear inrquality vector `W` and the solution summary `:sol` that
By default, add the custom linear inequality vector `W` and the solution summary `:sol` that
can be printed to `info`.
"""
function addinfo!(info, mpc::PredictiveController{NT}) where NT<:Real
nW = mpc.con.nw*(mpc.Hp+1)
W = Vector{NT}(undef, nW)
W .= mul!(W, mpc.con.Ẽw, mpc.Z̃) .+ mpc.con.Fw
info[:W] = W
info[:sol] = JuMP.solution_summary(mpc.optim, verbose=true)
info[:sol] = JuMP.solution_summary(mpc.optim) # verbose: redundant information
return info
end

Expand Down
2 changes: 1 addition & 1 deletion src/controller/nonlinmpc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ function addinfo!(info, mpc::NonLinMPC{NT}) where NT<:Real
mpc.con.gc!(gc_opt, Ue, Ŷe, D̂e, mpc.p, ϵ)
info[:JE] = JE_opt
info[:gc] = gc_opt
info[:sol] = JuMP.solution_summary(mpc.optim, verbose=true)
info[:sol] = JuMP.solution_summary(mpc.optim) # verbose: redundant information
# --- objective derivatives ---
model, optim, con = mpc.estim.model, mpc.optim, mpc.con
hess = mpc.hessian
Expand Down
2 changes: 1 addition & 1 deletion src/estimator/mhe/execute.jl
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ function getinfo(estim::MovingHorizonEstimator{NT}) where NT<:Real
info[:Ym] = Ym
info[:U] = U
info[:D] = D
info[:sol] = JuMP.solution_summary(estim.optim, verbose=true)
info[:sol] = JuMP.solution_summary(estim.optim) # verbose: redundant information
# --- non-Unicode fields ---
info[:What] = info[:Ŵ]
info[:xhatarr] = info[:x̂arr]
Expand Down
2 changes: 1 addition & 1 deletion src/model/nonlinmodeldae.jl
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ function getinfo(model::NonLinModelDAE{NT}) where NT<:Real
info[:u] = u
info[:d] = d
if JuMP.termination_status(model.optim_state) ≠ JuMP.OPTIMIZE_NOT_CALLED
info[:sol_state] = JuMP.solution_summary(model.optim_state, verbose=true)
info[:sol_state] = JuMP.solution_summary(model.optim_state, verbose=true)
end
if JuMP.termination_status(model.optim_output) ≠ JuMP.OPTIMIZE_NOT_CALLED
info[:sol_output] = JuMP.solution_summary(model.optim_output, verbose=true)
Expand Down
Loading