Skip to content

Commit c156223

Browse files
authored
Merge pull request #302 from JuliaControl/doc_minor_modif
doc and test: minor modifications
2 parents 80f6a52 + 21e4688 commit c156223

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/model/linmodel.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ LinModel with a sample time Ts = 0.1 s:
136136
137137
It is assumed that ``\mathbf{D_u=0}`` (or `sys` is strictly proper) since otherwise the
138138
resulting discrete controller would be acausal in its implementation (≠ mathematical
139-
causality). Indeed, at each sampling instant `k`, the predictive controller will:
139+
causality). Indeed, at each sampling instant ``k``, the predictive controller will:
140140
141141
1. sample an output ``\mathbf{y}(k)`` from the plant
142142
2. computes an action ``\mathbf{u}(k)`` and

test/3_test_predictive_control.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ end
14801480
f = (x, u, _, p) -> p.A * x + p.Bu * u
14811481
h = (x, _, p) -> p.C * x
14821482
nonlinmodel = NonLinModel(f, h, 100.0, 1, 1, 1, p=linmodel, solver=nothing)
1483-
Mwt, Nwt, Hp, Hc = [1], [0], 30, [1, 2, 3, 24]
1483+
Mwt, Nwt, Hp, Hc = [1], [0], 30, [2, 3, 4, 21]
14841484
N = 25
14851485
mpc1 = LinMPC(linmodel; Mwt, Nwt, Hp, Hc, transcription=SingleShooting())
14861486
mpc2 = LinMPC(linmodel; Mwt, Nwt, Hp, Hc, transcription=MultipleShooting())

0 commit comments

Comments
 (0)