Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/controller/construct.jl
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ LinMPC controller with a sample time Ts = 4.0 s:
│ ├ 0 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 3 decision variables Z̃ (1 slack variable)
├ 3 decision variables Z̃ (1 slack variable, 5 bounds)
├ 20 linear inequality constraints A (0 custom)
└ 0 linear equality constraints Aeq
```
Expand Down
4 changes: 2 additions & 2 deletions src/controller/linmpc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ LinMPC controller with a sample time Ts = 4.0 s:
│ ├ 0 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 2 decision variables Z̃ (1 slack variable)
├ 2 decision variables Z̃ (1 slack variable, 1 bounds)
├ 0 linear inequality constraints A (0 custom)
└ 0 linear equality constraints Aeq
```
Expand Down Expand Up @@ -281,7 +281,7 @@ LinMPC controller with a sample time Ts = 4.0 s:
│ ├ 1 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 2 decision variables Z̃ (1 slack variable)
├ 2 decision variables Z̃ (1 slack variable, 1 bounds)
├ 0 linear inequality constraints A (0 custom)
└ 0 linear equality constraints Aeq
```
Expand Down
6 changes: 3 additions & 3 deletions src/controller/nonlinmpc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ NonLinMPC controller with a sample time Ts = 10.0 s:
│ ├ 0 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 51 decision variables Z̃ (1 slack variable)
├ 51 decision variables Z̃ (1 slack variable, 1 bounds)
├ 0 linear inequality constraints A (0 custom)
├ 20 linear equality constraints Aeq
├ 0 nonlinear inequality constraints g (0 custom)
Expand Down Expand Up @@ -391,7 +391,7 @@ julia> model = NonLinModel((x,u,_,_)->0.5x+u, (x,_,_)->2x, 10.0, 1, 1, 1, solver

julia> estim = UnscentedKalmanFilter(model, σQint_ym=[0.05]);

julia> mpc = NonLinMPC(estim, Hp=20, Cwt=1e6)
julia> mpc = NonLinMPC(estim, Hp=20, Cwt=1e4)
NonLinMPC controller with a sample time Ts = 10.0 s:
├ estimator: UnscentedKalmanFilter
├ model: NonLinModel
Expand All @@ -409,7 +409,7 @@ NonLinMPC controller with a sample time Ts = 10.0 s:
│ ├ 0 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 3 decision variables Z̃ (1 slack variable)
├ 3 decision variables Z̃ (1 slack variable, 1 bounds)
├ 0 linear inequality constraints A (0 custom)
├ 0 linear equality constraints Aeq
├ 0 nonlinear inequality constraints g (0 custom)
Expand Down
4 changes: 2 additions & 2 deletions src/estimator/mhe/construct.jl
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ MovingHorizonEstimator estimator with a sample time Ts = 10.0 s:
│ ├ 0 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 12 decision variables Z̃ (0 slack variable)
├ 12 decision variables Z̃ (0 slack variable, 0 bounds)
├ 0 linear inequality constraints A
└ 0 nonlinear inequality constraints g (0 custom)
```
Expand Down Expand Up @@ -789,7 +789,7 @@ MovingHorizonEstimator estimator with a sample time Ts = 1.0 s:
│ ├ 0 unmeasured outputs yu
│ └ 0 measured disturbances d
└ optimization:
├ 8 decision variables Z̃ (0 slack variable)
├ 8 decision variables Z̃ (0 slack variable, 4 bounds)
├ 12 linear inequality constraints A
└ 0 nonlinear inequality constraints g (0 custom)
```
Expand Down