Skip to content

Commit e703c69

Browse files
committed
debug: fix method ambiguities for defect matrices
1 parent 20f8634 commit e703c69

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/controller/transcription.jl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ end
709709

710710
@doc raw"""
711711
init_defectmat(
712-
model::SimModel, ::StateEstimator, ::TranscriptionMethod, Hp, Hc, _
712+
model::SimModel, estim::StateEstimator, ::TranscriptionMethod, Hp, Hc, _
713713
) -> ES, GS, JS, KS, VS, BS
714714
715715
Init the matrices for computing the defects of the stochastic states only.
@@ -751,7 +751,8 @@ The matrices ``\mathbf{E_S}`` and ``\mathbf{K_S}`` are defined in the Extended H
751751
- else ``\mathbf{E_S} = [\begin{smallmatrix} \mathbf{E_{S}^{Δu}} & \mathbf{E_{S}^{x̂}} \end{smallmatrix}]``
752752
"""
753753
function init_defectmat(
754-
model::SimModel, estim::StateEstimator{NT}, transcription::TranscriptionMethod, Hp, Hc, _
754+
model::SimModel, estim::StateEstimator{NT}, transcription::TranscriptionMethod,
755+
Hp, Hc, _
755756
) where {NT<:Real}
756757
nu, nx, nd, nx̂, nxs = model.nu, model.nx, model.nd, estim.nx̂, estim.nxs
757758
nZ = get_nZ(estim, transcription, Hp, Hc)
@@ -780,20 +781,20 @@ end
780781

781782
"""
782783
init_defectmat(
783-
model::SimModel, estim::InternalModel, ::TranscriptionMethod, Hp, Hc, _
784+
model::NonLinModel, estim::InternalModel, ::TranscriptionMethod, Hp, Hc, _
784785
) -> ES, GS, JS, KS, VS, BS
785786
786787
Return empty matrices for [`InternalModel`](@ref) (the state vector is not augmented).
787788
"""
788789
function init_defectmat(
789-
::SimModel, estim::InternalModel, transcription::TranscriptionMethod, Hp, Hc, _
790+
::NonLinModel, estim::InternalModel, transcription::TranscriptionMethod, Hp, Hc, _
790791
)
791792
return init_defectmat_empty(estim, transcription, Hp, Hc)
792793
end
793794

794795
"""
795796
init_defectmat(
796-
model::SimModel, estim::StateEstimator, ::TranscriptionMethod, Hp, Hc, nb
797+
model::SimModel, estim::StateEstimator, transcription::SingleShooting, Hp, Hc, _
797798
) -> ES, GS, JS, KS, VS, BS
798799
799800
Return empty matrices for [`SingleShooting`](@ref) transcription (N/A).
@@ -805,11 +806,12 @@ function init_defectmat(
805806
end
806807

807808
function init_defectmat(
808-
::SimModel, estim::InternalModel, transcription::SingleShooting, Hp, Hc, _
809+
::NonLinModel, estim::InternalModel, transcription::SingleShooting, Hp, Hc, _
809810
)
810811
return init_defectmat_empty(estim, transcription, Hp, Hc)
811812
end
812813

814+
813815
function init_defectmat_empty(
814816
estim::StateEstimator{NT}, transcription::TranscriptionMethod, Hp, Hc
815817
) where {NT<:Real}

0 commit comments

Comments
 (0)