Skip to content

Commit 85f89ff

Browse files
committed
debug: resolve ambiguous methods
1 parent 424b7c3 commit 85f89ff

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docs/src/internals/predictive_control.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ModelPredictiveControl.init_nonlincon!
3030

3131
```@docs
3232
ModelPredictiveControl.initpred!(::PredictiveController, ::LinModel, ::Any, ::Any, ::Any, ::Any)
33-
ModelPredictiveControl.linconstraint!(::PredictiveController, ::LinModel)
33+
ModelPredictiveControl.linconstraint!(::PredictiveController, ::LinModel, ::TranscriptionMethod)
3434
ModelPredictiveControl.linconstrainteq!
3535
```
3636

src/ModelPredictiveControl.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export SteadyKalmanFilter, KalmanFilter, UnscentedKalmanFilter, ExtendedKalmanFi
3232
export MovingHorizonEstimator
3333
export default_nint, initstate!
3434
export PredictiveController, ExplicitMPC, LinMPC, NonLinMPC, setconstraint!, moveinput!
35-
export SingleShooting, MultipleShooting
35+
export TranscriptionMethod, SingleShooting, MultipleShooting
3636
export SimResult, getinfo, sim!
3737

3838
include("general.jl")

src/controller/transcription.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -776,10 +776,10 @@ end
776776
"""
777777
set_nonlincon!(mpc::PredictiveController, ::NonLinModel, ::MultipleShooting, optim)
778778
779-
Also set output prediction `Ŷ` constraints for `NonLinModel` and `MultipleShooting`.
779+
Also set output prediction `Ŷ` constraints for `NonLinModel` and non-`SingleShooting`.
780780
"""
781781
function set_nonlincon!(
782-
mpc::PredictiveController, ::SimModel, ::MultipleShooting, ::JuMP.GenericModel{JNT}
782+
mpc::PredictiveController, ::NonLinModel, ::TranscriptionMethod, ::JuMP.GenericModel{JNT}
783783
) where JNT<:Real
784784
optim = mpc.optim
785785
Z̃var = optim[:Z̃var]

0 commit comments

Comments
 (0)