Skip to content

Commit 2f81e2b

Browse files
committed
Revert "debug: Julia nightly Hermitian constructor with Bool vectors (fromI(n))"
This reverts commit a9da68a.
1 parent a9da68a commit 2f81e2b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/estimator/kalman.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ struct KalmanFilter{NT<:Real, SM<:LinModel} <: StateEstimator{NT}
287287
validate_kfcov(nym, nx̂, Q̂, R̂, P̂_0)
288288
lastu0 = zeros(NT, nu)
289289
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
290-
P̂_0 = Hermitian(NT.(P̂_0), :L)
291-
Q̂, R̂ = Hermitian(NT.(Q̂), :L), Hermitian(NT.(R̂), :L)
290+
Q̂, R̂ = Hermitian(Q̂, :L), Hermitian(R̂, :L)
291+
P̂_0 = Hermitian(P̂_0, :L)
292292
= copy(P̂_0)
293293
K̂, M̂ = zeros(NT, nx̂, nym), zeros(NT, nx̂, nym)
294294
corrected = [false]
@@ -478,8 +478,8 @@ struct UnscentedKalmanFilter{NT<:Real, SM<:SimModel} <: StateEstimator{NT}
478478
nσ, γ, m̂, Ŝ = init_ukf(model, nx̂, α, β, κ)
479479
lastu0 = zeros(NT, nu)
480480
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
481-
P̂_0 = Hermitian(NT.(P̂_0), :L)
482-
Q̂, R̂ = Hermitian(NT.(Q̂), :L), Hermitian(NT.(R̂), :L)
481+
Q̂, R̂ = Hermitian(Q̂, :L), Hermitian(R̂, :L)
482+
P̂_0 = Hermitian(P̂_0, :L)
483483
= copy(P̂_0)
484484
= zeros(NT, nx̂, nym)
485485
= Hermitian(zeros(NT, nym, nym), :L)
@@ -797,8 +797,9 @@ struct ExtendedKalmanFilter{NT<:Real, SM<:SimModel} <: StateEstimator{NT}
797797
validate_kfcov(nym, nx̂, Q̂, R̂, P̂_0)
798798
lastu0 = zeros(NT, nu)
799799
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
800-
P̂_0 = Hermitian(NT.(P̂_0), :L)
801-
Q̂, R̂ = Hermitian(NT.(Q̂), :L), Hermitian(NT.(R̂), :L)
800+
P̂_0 = Hermitian(P̂_0, :L)
801+
= Hermitian(Q̂, :L)
802+
= Hermitian(R̂, :L)
802803
= copy(P̂_0)
803804
K̂, M̂ = zeros(NT, nx̂, nym), zeros(NT, nx̂, nym)
804805
F̂_û, Ĥ = zeros(NT, nx̂+nu, nx̂), zeros(NT, ny, nx̂)

src/estimator/mhe/construct.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ struct MovingHorizonEstimator{
120120
validate_kfcov(nym, nx̂, Q̂, R̂, P̂_0)
121121
lastu0 = zeros(NT, nu)
122122
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
123-
P̂_0 = Hermitian(NT.(P̂_0), :L)
124-
Q̂, R̂ = Hermitian(NT.(Q̂), :L), Hermitian(NT.(R̂), :L)
123+
P̂_0 = Hermitian(P̂_0, :L)
124+
Q̂, R̂ = Hermitian(, :L), Hermitian(, :L)
125125
invP̄ = Hermitian(inv(P̂_0), :L)
126126
invQ̂_He = Hermitian(repeatdiag(inv(Q̂), He), :L)
127127
invR̂_He = Hermitian(repeatdiag(inv(R̂), He), :L)

0 commit comments

Comments
 (0)