Skip to content

Commit fc18685

Browse files
authored
Merge pull request #493 from JuliaControl/getinfo_verbose
changed: `verbose=false` for `getinfo` with MPC/MHE
2 parents 55ed356 + 697d08b commit fc18685

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎src/controller/execute.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,15 @@ end
213213
"""
214214
addinfo!(info, mpc::PredictiveController) -> info
215215
216-
By default, add the custom linear inrquality vector `W` and the solution summary `:sol` that
216+
By default, add the custom linear inequality vector `W` and the solution summary `:sol` that
217217
can be printed to `info`.
218218
"""
219219
function addinfo!(info, mpc::PredictiveController{NT}) where NT<:Real
220220
nW = mpc.con.nw*(mpc.Hp+1)
221221
W = Vector{NT}(undef, nW)
222222
W .= mul!(W, mpc.con.Ẽw, mpc.Z̃) .+ mpc.con.Fw
223223
info[:W] = W
224-
info[:sol] = JuMP.solution_summary(mpc.optim, verbose=true)
224+
info[:sol] = JuMP.solution_summary(mpc.optim) # verbose: redundant information
225225
return info
226226
end
227227

‎src/controller/nonlinmpc.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ function addinfo!(info, mpc::NonLinMPC{NT}) where NT<:Real
587587
mpc.con.gc!(gc_opt, Ue, Ŷe, D̂e, mpc.p, ϵ)
588588
info[:JE] = JE_opt
589589
info[:gc] = gc_opt
590-
info[:sol] = JuMP.solution_summary(mpc.optim, verbose=true)
590+
info[:sol] = JuMP.solution_summary(mpc.optim) # verbose: redundant information
591591
# --- objective derivatives ---
592592
model, optim, con = mpc.estim.model, mpc.optim, mpc.con
593593
hess = mpc.hessian

‎src/estimator/mhe/execute.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function getinfo(estim::MovingHorizonEstimator{NT}) where NT<:Real
191191
info[:Ym] = Ym
192192
info[:U] = U
193193
info[:D] = D
194-
info[:sol] = JuMP.solution_summary(estim.optim, verbose=true)
194+
info[:sol] = JuMP.solution_summary(estim.optim) # verbose: redundant information
195195
# --- non-Unicode fields ---
196196
info[:What] = info[:Ŵ]
197197
info[:xhatarr] = info[:x̂arr]

‎src/model/nonlinmodeldae.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ function getinfo(model::NonLinModelDAE{NT}) where NT<:Real
934934
info[:u] = u
935935
info[:d] = d
936936
if JuMP.termination_status(model.optim_state) ≠ JuMP.OPTIMIZE_NOT_CALLED
937-
info[:sol_state] = JuMP.solution_summary(model.optim_state, verbose=true)
937+
info[:sol_state] = JuMP.solution_summary(model.optim_state, verbose=true)
938938
end
939939
if JuMP.termination_status(model.optim_output) ≠ JuMP.OPTIMIZE_NOT_CALLED
940940
info[:sol_output] = JuMP.solution_summary(model.optim_output, verbose=true)

0 commit comments

Comments
 (0)