Skip to content

Commit 815cb25

Browse files
committed
Merge branch 'debug_mhe' into bench_cont_2
2 parents 0eb0f0e + 8da356f commit 815cb25

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/estimator/mhe/execute.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ function set_warmstart_mhe!(V̂, X̂0, estim::MovingHorizonEstimator{NT}, Z̃var
472472
# will be inevitably different at the following time step.
473473
Z̃s[nx̃+Nk*nŵ+1:end] .= 1
474474
JuMP.set_start_value.(Z̃var, Z̃s)
475+
return Z̃s
475476
end
476477

477478
"Correct the covariance estimate at arrival using `covestim` [`StateEstimator`](@ref)."

src/general.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ function limit_solve_time(optim::GenericModel, Ts)
4949
JuMP.set_time_limit_sec(optim, Ts)
5050
catch err
5151
if isa(err, MOI.UnsupportedAttribute{MOI.TimeLimitSec})
52-
@warn "Solving time limit is not supported by the optimizer."
52+
@warn "Solving time limit is not supported by the $(JuMP.solver_name(optim)) "*
53+
"optimizer."
5354
else
5455
rethrow()
5556
end

test/3_test_predictive_control.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@test mpc6.weights.L_Hp Diagonal(diagm(repeat(Float64[0, 1], 15)))
2020
@test mpc6.weights.L_Hp isa Hermitian{Float64, Diagonal{Float64, Vector{Float64}}}
2121
mpc7 = @test_logs(
22-
(:warn, "Solving time limit is not supported by the optimizer."),
22+
(:warn, "Solving time limit is not supported by the DAQP optimizer."),
2323
LinMPC(model, optim=JuMP.Model(DAQP.Optimizer))
2424
)
2525
@test solver_name(mpc7.optim) == "DAQP"

0 commit comments

Comments
 (0)