Merge pull request #170 from JuliaControl/bump

changed: moved equality constraint function to `transcription.jl` and bump

Author: franckgaga

Diff for: Project.toml

@@ -1,7 +1,7 @@
 name = "ModelPredictiveControl"
 uuid = "61f9bdb8-6ae4-484a-811f-bbf86720c31c"
 authors = ["Francis Gagnon"]
-version = "1.4.0"
+version = "1.4.1"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

Diff for: src/controller/nonlinmpc.jl

@@ -822,42 +822,6 @@ function con_nonlinprog!(g, mpc::NonLinMPC, ::SimModel, x̂0end, Ŷ0, gc, ϵ)
     return g
 end
 
-"""
-    con_nonlinprogeq!(
-        geq, X̂0, Û0, mpc::NonLinMPC, model::NonLinModel, ::MultipleShooting, U0, Z̃
-    )
-
-Nonlinear equality constrains for [`NonLinModel`](@ref) and [`MultipleShooting`](@ref).
-
-The method mutates the `geq`, `X̂0` and `Û0` vectors in argument.
-"""
-function con_nonlinprogeq!(
-    geq, X̂0, Û0, mpc::NonLinMPC, model::NonLinModel, ::MultipleShooting, U0, Z̃
-)
-    nx̂, nu, nd, Hp, Hc = mpc.estim.nx̂, model.nu, model.nd, mpc.Hp, mpc.Hc
-    nΔU, nX̂ = nu*Hc, nx̂*Hp
-    D̂0 = mpc.D̂0
-    X̂0_Z̃ = @views Z̃[(nΔU+1):(nΔU+nX̂)]
-    x̂0 = @views mpc.estim.x̂0[1:nx̂]
-    d0 = @views mpc.d0[1:nd]
-    #TODO: allow parallel for loop or threads? 
-    for j=1:Hp
-        u0     = @views U0[(1 + nu*(j-1)):(nu*j)]
-        û0     = @views Û0[(1 + nu*(j-1)):(nu*j)]
-        x̂0next = @views X̂0[(1 + nx̂*(j-1)):(nx̂*j)]
-        f̂!(x̂0next, û0, mpc.estim, model, x̂0, u0, d0)
-        x̂0next .+= mpc.estim.f̂op .- mpc.estim.x̂op
-        x̂0next_Z̃ = @views X̂0_Z̃[(1 + nx̂*(j-1)):(nx̂*j)]       
-        ŝnext    = @views  geq[(1 + nx̂*(j-1)):(nx̂*j)]
-        ŝnext   .= x̂0next .- x̂0next_Z̃
-        x̂0 = x̂0next_Z̃ # using states in Z̃ for next iteration (allow parallel for)
-        d0 = @views D̂0[(1 + nd*(j-1)):(nd*j)]
-    end
-    return geq
-end
-con_nonlinprogeq!(geq,_,_, ::NonLinMPC, ::NonLinModel, ::SingleShooting,      _,_) = geq
-con_nonlinprogeq!(geq,_,_, ::NonLinMPC, ::LinModel,    ::TranscriptionMethod, _,_) = geq
-
 @doc raw"""
     con_custom!(gc, mpc::NonLinMPC, Ue, Ŷe, ϵ) -> gc
 

Diff for: src/controller/transcription.jl

@@ -701,3 +701,39 @@ function predict!(
     return Ŷ0, x̂0end
 end
 
+
+"""
+    con_nonlinprogeq!(
+        geq, X̂0, Û0, mpc::PredictiveController, model::NonLinModel, ::MultipleShooting, U0, Z̃
+    )
+
+Nonlinear equality constrains for [`NonLinModel`](@ref) and [`MultipleShooting`](@ref).
+
+The method mutates the `geq`, `X̂0` and `Û0` vectors in argument.
+"""
+function con_nonlinprogeq!(
+    geq, X̂0, Û0, mpc::PredictiveController, model::NonLinModel, ::MultipleShooting, U0, Z̃
+)
+    nx̂, nu, nd, Hp, Hc = mpc.estim.nx̂, model.nu, model.nd, mpc.Hp, mpc.Hc
+    nΔU, nX̂ = nu*Hc, nx̂*Hp
+    D̂0 = mpc.D̂0
+    X̂0_Z̃ = @views Z̃[(nΔU+1):(nΔU+nX̂)]
+    x̂0 = @views mpc.estim.x̂0[1:nx̂]
+    d0 = @views mpc.d0[1:nd]
+    #TODO: allow parallel for loop or threads? 
+    for j=1:Hp
+        u0     = @views U0[(1 + nu*(j-1)):(nu*j)]
+        û0     = @views Û0[(1 + nu*(j-1)):(nu*j)]
+        x̂0next = @views X̂0[(1 + nx̂*(j-1)):(nx̂*j)]
+        f̂!(x̂0next, û0, mpc.estim, model, x̂0, u0, d0)
+        x̂0next .+= mpc.estim.f̂op .- mpc.estim.x̂op
+        x̂0next_Z̃ = @views X̂0_Z̃[(1 + nx̂*(j-1)):(nx̂*j)]       
+        ŝnext    = @views  geq[(1 + nx̂*(j-1)):(nx̂*j)]
+        ŝnext   .= x̂0next .- x̂0next_Z̃
+        x̂0 = x̂0next_Z̃ # using states in Z̃ for next iteration (allow parallel for)
+        d0 = @views D̂0[(1 + nd*(j-1)):(nd*j)]
+    end
+    return geq
+end
+con_nonlinprogeq!(geq,_,_,::PredictiveController,::NonLinModel,::SingleShooting,  _,_) = geq
+con_nonlinprogeq!(geq,_,_,::PredictiveController,::LinModel,::TranscriptionMethod,_,_) = geq