@@ -687,27 +687,23 @@ Update `k̄` and `geq` in place for the open loop root solving of [`NonLinModelD
687687function update_predictions! (k̄, geq, model, Z)
688688 x0, u0, d0 = model. x0_optim, model. u0_optim, model. d0_optim
689689 u0next, d0next = model. u0next_optim, model. d0next_optim
690- con_nonlinprogeq! (
691- geq, k̄, model, model. transcription, x0, u0, d0, u0next, d0next, Z
692- )
690+ con_nonlinroots! (geq, k̄, model, model. transcription, x0, u0, d0, u0next, d0next, Z)
693691 return nothing
694692end
695693
696694"""
697- con_nonlinprogeq !(
695+ con_nonlinroots !(
698696 geq, k̄dot,
699697 model::NonLinModelDAE, ::TrapezoidalCollocation, x0, u0, d0, u0next, d0next, Z
700698 ) -> geq
701699
702700Nonlinear equality constraint for open loop root solving of [`NonLinModelDAE`](@ref).
703701"""
704- function con_nonlinprogeq ! (
702+ function con_nonlinroots ! (
705703 geq, k̄dot,
706704 model:: NonLinModelDAE , :: TrapezoidalCollocation , x0, u0, d0, u0next, d0next, Z
707705)
708- transcription = model. transcription
709706 nx, na = model. nx, model. na
710- h = transcription. h
711707 Ts = model. Ts
712708 u⁺, d⁺ = u0, d0
713709 # h is ignored here, u0next & d0next values determine the hold order (like NonLinModel):
@@ -722,14 +718,14 @@ function con_nonlinprogeq!(
722718end
723719
724720"""
725- con_nonlinprogeq !(
721+ con_nonlinroots !(
726722 geq, k̄dot
727723 model::NonLinModelDAE, ::OrthogonalCollocation, x0, u0, d0, u0next, d0next, Z
728724 ) -> geq
729725
730726Same but using an [`OrthogonalCollocation`](@ref) transcription.
731727"""
732- function con_nonlinprogeq ! (
728+ function con_nonlinroots ! (
733729 geq, k̄dot,
734730 model:: NonLinModelDAE , :: OrthogonalCollocation , x0, u0, d0, u0next, d0next, Z
735731)
0 commit comments