@@ -796,11 +796,11 @@ constraints:
796796function relaxU (C, c_Umin, c_Umax, S_Hp, S_Hc)
797797 if ! isinf (C) # ΔŨ = [ΔU; ϵ]
798798 # ϵ impacts ΔU → U conversion for constraint calculations:
799- A_Umin, A_Umax = - [S_Hc + c_Umin], + [S_Hc - c_Umax]
799+ A_Umin, A_Umax = - [S_Hc c_Umin], [S_Hc - c_Umax]
800800 # ϵ has no impact on ΔU → U conversion for prediction calculations:
801801 S̃_Hp = [S_Hp falses (size (S_Hp, 1 ))]
802802 else # ΔŨ = ΔU (only hard constraints)
803- A_Umin, A_Umax = - S_Hc, + S_Hc
803+ A_Umin, A_Umax = - S_Hc, S_Hc
804804 S̃_Hp = S_Hp
805805 end
806806 return A_Umin, A_Umax, S̃_Hp
@@ -832,12 +832,12 @@ function relaxΔU(C, c_ΔUmin, c_ΔUmax, ΔUmin, ΔUmax, N_Hc)
832832 # 0 ≤ ϵ ≤ ∞
833833 ΔŨmin, ΔŨmax = [ΔUmin; 0.0 ], [ΔUmax; Inf ]
834834 A_ϵ = [zeros (1 , length (ΔUmin)) [1 ]]
835- A_ΔŨmin, A_ΔŨmax = - [I + c_ΔUmin; A_ϵ], + [I - c_ΔUmax; A_ϵ]
835+ A_ΔŨmin, A_ΔŨmax = - [I c_ΔUmin; A_ϵ], [I - c_ΔUmax; A_ϵ]
836836 Ñ_Hc = Diagonal ([diag (N_Hc); C])
837837 else # ΔŨ = ΔU (only hard constraints)
838838 ΔŨmin, ΔŨmax = ΔUmin, ΔUmax
839839 I_Hc = Matrix {Float64} (I, size (N_Hc))
840- A_ΔŨmin, A_ΔŨmax = - I_Hc, + I_Hc
840+ A_ΔŨmin, A_ΔŨmax = - I_Hc, I_Hc
841841 Ñ_Hc = N_Hc
842842 end
843843 return A_ΔŨmin, A_ΔŨmax, ΔŨmin, ΔŨmax, Ñ_Hc
@@ -866,12 +866,12 @@ Denoting the input increments augmented with the slack variable
866866function relaxŶ (:: LinModel , C, c_Ŷmin, c_Ŷmax, E)
867867 if ! isinf (C) # ΔŨ = [ΔU; ϵ]
868868 # ϵ impacts predicted output constraint calculations:
869- A_Ŷmin, A_Ŷmax = - [E + c_Ŷmin], + [E - c_Ŷmax]
869+ A_Ŷmin, A_Ŷmax = - [E c_Ŷmin], [E - c_Ŷmax]
870870 # ϵ has not impact on output predictions
871871 Ẽ = [E zeros (size (E, 1 ), 1 )]
872872 else # ΔŨ = ΔU (only hard constraints)
873873 Ẽ = E
874- A_Ŷmin, A_Ŷmax = - E, + E
874+ A_Ŷmin, A_Ŷmax = - E, E
875875 end
876876 return A_Ŷmin, A_Ŷmax, Ẽ
877877end
0 commit comments