Skip to content

Commit 1c3cf3d

Browse files
committed
debug: D0 window 1 add. sample in initpred!
1 parent a3ab09c commit 1c3cf3d

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

src/estimator/mhe/execute.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,6 @@ function add_data_windows!(estim::MovingHorizonEstimator, y0m, d0, u0=estim.last
374374
estim.X̂0_old[(1 + nx̂*(Nk-1)):(nx̂*Nk)] .= x̂0_old
375375
end
376376
estim.x̂0arr_old .= @views estim.X̂0_old[1:nx̂]
377-
#@show estim.X̂0_old
378-
#@show estim.x̂0arr_old
379377
return ismoving
380378
end
381379

@@ -411,7 +409,7 @@ function initpred!(estim::MovingHorizonEstimator, model::LinModel)
411409
invP̄, invQ̂_He, invR̂_He = estim.cov.invP̄, estim.cov.invQ̂_He, estim.cov.invR̂_He
412410
F, C, optim = estim.F, estim.C, estim.optim
413411
nx̂, nŵ, nym, nε, Nk = estim.nx̂, estim.nx̂, estim.nym, estim.nε, estim.Nk[]
414-
nU, nYm, nD, nŴ = model.nu*Nk, estim.nym*Nk, model.nd*Nk, nŵ*Nk
412+
nU, nYm, nŴ, nD = model.nu*Nk, estim.nym*Nk, nŵ*Nk, model.nd*(Nk+1)
415413
nZ̃ =+ nx̂ + nŴ
416414
# --- truncate vector and matrices if necessary ---
417415
if Nk < estim.He
@@ -455,8 +453,6 @@ function initpred!(estim::MovingHorizonEstimator, model::LinModel)
455453
H̃_data .= Ñ_Nk
456454
mul!(H̃_data, ẼZ̃', M_Nk_ẼZ̃, 1, 1)
457455
lmul!(2, H̃_data)
458-
display(estim.q̃)
459-
display(estim.H̃)
460456
JuMP.set_objective_function(optim, obj_quadprog(Z̃var, H̃, q̃))
461457
return nothing
462458
end

0 commit comments

Comments
 (0)