Skip to content

Commit 944a98a

Browse files
authored
Merge pull request #100 from JuliaControl/nighlty_debug
debug: make it work on Julia nightly
2 parents f233474 + afda349 commit 944a98a

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/estimator/kalman.jl

+4-5
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ struct KalmanFilter{NT<:Real, SM<:LinModel} <: StateEstimator{NT}
316316
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
317317
Q̂, R̂ = Hermitian(Q̂, :L), Hermitian(R̂, :L)
318318
P̂_0 = Hermitian(P̂_0, :L)
319-
= copy(P̂_0)
319+
= Hermitian(copy(P̂_0.data), :L) # copy on P̂_0.data necessary for Julia Nightly
320320
= zeros(NT, nx̂, nym)
321321
corrected = [false]
322322
buffer = StateEstimatorBuffer{NT}(nu, nx̂, nym, ny, nd)
@@ -539,7 +539,7 @@ struct UnscentedKalmanFilter{NT<:Real, SM<:SimModel} <: StateEstimator{NT}
539539
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
540540
Q̂, R̂ = Hermitian(Q̂, :L), Hermitian(R̂, :L)
541541
P̂_0 = Hermitian(P̂_0, :L)
542-
= copy(P̂_0)
542+
= Hermitian(copy(P̂_0.data), :L) # copy on P̂_0.data necessary for Julia Nightly
543543
= zeros(NT, nx̂, nym)
544544
= Hermitian(zeros(NT, nym, nym), :L)
545545
X̂0, X̄0 = zeros(NT, nx̂, nσ), zeros(NT, nx̂, nσ)
@@ -910,10 +910,9 @@ struct ExtendedKalmanFilter{NT<:Real, SM<:SimModel} <: StateEstimator{NT}
910910
validate_kfcov(nym, nx̂, Q̂, R̂, P̂_0)
911911
lastu0 = zeros(NT, nu)
912912
x̂0 = [zeros(NT, model.nx); zeros(NT, nxs)]
913+
Q̂, R̂ = Hermitian(Q̂, :L), Hermitian(R̂, :L)
913914
P̂_0 = Hermitian(P̂_0, :L)
914-
= Hermitian(Q̂, :L)
915-
= Hermitian(R̂, :L)
916-
= copy(P̂_0)
915+
= Hermitian(copy(P̂_0.data), :L) # copy on P̂_0.data necessary for Julia Nightly
917916
= zeros(NT, nx̂, nym)
918917
F̂_û, F̂ = zeros(NT, nx̂+nu, nx̂), zeros(NT, nx̂, nx̂)
919918
Ĥ, Ĥm = zeros(NT, ny, nx̂), zeros(NT, nym, nx̂)

0 commit comments

Comments
 (0)