Skip to content

Commit 9921adb

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents c82eb54 + 56df390 commit 9921adb

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

docs/src/manual/linmpc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Manual: Linear Design](@id my_manual)
1+
# [Manual: Linear Design](@id man_lin)
22

33
## Linear Model
44

docs/src/manual/nonlinmpc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Manual: Nonlinear Design
1+
# [Manual: Nonlinear Design](@id man_nonlin)
22

33
## Nonlinear Model
44

docs/src/public/state_estim.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ the controller computations, without introducing any additional delays. Moreover
2626
[`moveinput!`](@ref) method of the predictive controllers does not automatically update the
2727
estimates with [`updatestate!`](@ref). This allows applying the calculated inputs on the
2828
real plant before starting the potentially expensive estimator computations (see
29-
[Manual](@ref my_manual) for examples).
29+
[Manual](@ref man_lin) for examples).
3030

3131
!!! info
3232
All the estimators support measured ``\mathbf{y^m}`` and unmeasured ``\mathbf{y^u}``

src/model/linmodel.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ with the state ``\mathbf{x}`` and output ``\mathbf{y}`` vectors. The ``\mathbf{z
4444
comprises the manipulated inputs ``\mathbf{u}`` and measured disturbances ``\mathbf{d}``,
4545
in any order. `i_u` provides the indices of ``\mathbf{z}`` that are manipulated, and `i_d`,
4646
the measured disturbances. See Extended Help if `sys` is continuous-time, or discrete-time
47-
and `Ts ≠ sys.Ts`.
47+
with `Ts ≠ sys.Ts`.
4848
4949
See also [`ss`](https://juliacontrol.github.io/ControlSystems.jl/stable/lib/constructors/#ControlSystemsBase.ss),
5050
[`tf`](https://juliacontrol.github.io/ControlSystems.jl/stable/lib/constructors/#ControlSystemsBase.tf).

src/model/nonlinmodel.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ manipulated inputs, states, outputs and measured disturbances.
4040
Replace the `d` argument with `_` if `nd = 0` (see Examples below).
4141
4242
Nonlinear continuous-time state-space functions are not supported for now. In such a case,
43-
manually call a differential equation solver in the `f` function (e.g.: Euler method).
43+
manually call a differential equation solver in `f` (see [Manual](@ref man_nonlin)).
4444
4545
!!! warning
4646
`f` and `h` must be pure Julia functions to use the model in [`NonLinMPC`](@ref).

0 commit comments

Comments
 (0)