Skip to content

Commit 710a6e3

Browse files
committed
debug: InternalModel with SingleShooting now work
ALso improve coverage of `InternalModel`
1 parent 6966f88 commit 710a6e3

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

‎src/estimator/internal_model.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,15 @@ function f̂!(
186186
x̂0next, _ , _ , k̄, ûi, di,
187187
estim::InternalModel, model::SimModel, x̂0, u0, d0, u0next, d0next
188188
)
189-
f!(x̂0next, k̄, ûi, di, model, x̂0, u0, d0, u0, d0, u0next, d0next)
189+
f!(x̂0next, k̄, ûi, di, model, x̂0, u0, d0, u0next, d0next)
190190
x̂0next .+= estim.f̂op .- estim.x̂op
191191
return nothing
192192
end
193193
function f̂!(
194194
x̂0next, _ , _ , k̄, ûi, di,
195195
estim::InternalModel, model::LinModel, x̂0, u0, d0, u0next, d0next
196196
)
197-
f!(x̂0next, k̄, ûi, di, model, x̂0, u0, d0, u0, d0, u0next, d0next)
197+
f!(x̂0next, k̄, ûi, di, model, x̂0, u0, d0, u0next, d0next)
198198
x̂0next .+= estim.f̂op .- estim.x̂op
199199
return nothing
200200
end

‎test/2_test_state_estim.jl‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,26 @@ end
548548
updatestate!(internalmodel5, [0], [6], [0])
549549
@test internalmodel5.x̂d ≈ [0]
550550
@test internalmodel5.x̂s ≈ [6]
551+
buffer = internalmodel5.buffer
552+
x̂0next, k̄, ûi, di = buffer.x̂, buffer.k̄, buffer.ûi, buffer.di
553+
û0, û0next = buffer.û, buffer.ûnext
554+
@test_nowarn ModelPredictiveControl.f̂!(
555+
x̂0next, û0, û0next, k̄, ûi, di, internalmodel5, dae, [0], [0], [0], [0], [0]
556+
) # for coverage
557+
558+
internalmodel6 = InternalModel(linmodel, i_ym=[1])
559+
preparestate!(internalmodel6, [57])
560+
updatestate!(internalmodel6, [10, 50], [57])
561+
@test internalmodel6.x̂d ≈ [0, 0]
562+
@test internalmodel6.x̂s ≈ [7]
563+
buffer = internalmodel6.buffer
564+
x̂0next, k̄, ûi, di = buffer.x̂, buffer.k̄, buffer.ûi, buffer.di
565+
û0, û0next = buffer.û, buffer.ûnext
566+
@test_nowarn ModelPredictiveControl.f̂!(
567+
x̂0next, û0, û0next, k̄, ûi, di,
568+
internalmodel6, linmodel, [0, 0], [10, 50], Float64[], [10, 50], Float64[]
569+
) # for coverage
570+
551571
end
552572

553573
@testitem "IM set model" setup=[SetupMPCtests] begin

0 commit comments

Comments
 (0)