Skip to content

Commit fcc1333

Browse files
committed
debug: correct argument order for set_nonlincon!
1 parent d0c71e3 commit fcc1333

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/controller/construct.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ function setconstraint!(
386386
JuMP.delete(optim, optim[:linconstraint])
387387
JuMP.unregister(optim, :linconstraint)
388388
@constraint(optim, linconstraint, A*Z̃var .≤ b)
389-
set_nonlincon!(mpc, model, optim, transcription)
389+
set_nonlincon!(mpc, model, transcription, optim)
390390
else
391391
i_b, i_g = init_matconstraint_mpc(
392392
model, transcription, nc,

src/controller/nonlinmpc.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ function init_optimization!(mpc::NonLinMPC, model::SimModel, optim)
509509
@operator(optim, J, nZ̃, Jfunc, ∇Jfunc!)
510510
@objective(optim, Min, J(Z̃var...))
511511
init_nonlincon!(mpc, model, transcription, gfuncs, ∇gfuncs!, geqfuncs, ∇geqfuncs!)
512-
set_nonlincon!(mpc, model, optim, transcription)
512+
set_nonlincon!(mpc, model, transcription, optim)
513513
return nothing
514514
end
515515

src/controller/transcription.jl

+5-3
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,10 @@ Init nonlinear constraints for [`LinModel`](@ref) for all [`TranscriptionMethod`
613613
The only nonlinear constraints are the custom inequality constraints `gc`.
614614
"""
615615
function init_nonlincon!(
616-
mpc::PredictiveController, ::LinModel, ::TranscriptionMethod, gfuncs, ∇gfuncs!, _ , _
617-
)
616+
mpc::PredictiveController, ::LinModel, ::TranscriptionMethod,
617+
gfuncs, ∇gfuncs!,
618+
_ , _
619+
)
618620
optim, con = mpc.optim, mpc.con
619621
nZ̃ = length(mpc.Z̃)
620622
if length(con.i_g) 0
@@ -746,7 +748,7 @@ end
746748

747749
"By default, there is no nonlinear constraint, thus do nothing."
748750
function set_nonlincon!(
749-
::PredictiveController, ::SimModel, ::JuMP.GenericModel, ::TranscriptionMethod
751+
::PredictiveController, ::SimModel, ::TranscriptionMethod, ::JuMP.GenericModel,
750752
)
751753
return nothing
752754
end

0 commit comments

Comments
 (0)