Skip to content

Commit 401b0b6

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 6c7a1fa + eebe19f commit 401b0b6

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ModelPredictiveControl"
22
uuid = "61f9bdb8-6ae4-484a-811f-bbf86720c31c"
33
authors = ["Francis Gagnon"]
4-
version = "0.5.6"
4+
version = "0.5.7"
55

66
[deps]
77
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"

docs/src/index.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ The package depends on [`ControlSystemsBase.jl`](https://github.com/JuliaControl
77
for the linear systems and [`JuMP.jl`](https://github.com/jump-dev/JuMP.jl) for the solving.
88

99
The objective is to provide a simple and clear framework to quickly design model predictive
10-
controllers (MPCs) in Julia, while keeping the flexibility for advanced optimization. Modern
11-
MPCs based on closed-loop state estimators are the main focus of the package, but classical
12-
approaches that rely on internal models are also possible. The `JuMP.jl` interface allows
13-
to easily test different solvers if the performance of the default settings is not
14-
satisfactory.
10+
controllers (MPCs) in Julia, while preserving the flexibility for advanced real-time
11+
optimization. Modern MPCs based on closed-loop state estimators are the main focus of the
12+
package, but classical approaches that rely on internal models are also possible. The
13+
`JuMP.jl` interface allows to easily test different solvers if the performance of the
14+
default settings is not satisfactory.
1515

1616
The documentation is divided in two parts:
1717

18-
- **[Manual](@ref man_lin)** This section includes step-by-step guides to design
19-
predictive controllers or multiple case studies.
20-
- **[Functions](@ref func_sim_model)** This part contains the documentation of
21-
methods and types that are exported by the package. The "Internals" section provides
22-
implementation details of functions that are not exported.
18+
- **[Manual](@ref man_lin)** This section includes step-by-step guides to design
19+
predictive controllers on multiple case studies.
20+
- **[Functions](@ref func_sim_model)** — Documentation of methods and types exported by the
21+
package. The "Internals" section provides implementation details of functions that are
22+
not exported.
2323

2424
## Manual
2525

docs/src/manual/nonlinmpc.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
## Nonlinear Model
44

55
In this example, the goal is to control the angular position ``θ`` of a pendulum
6-
attached to a motor. If the manipulated input is the motor torque ``τ``, the vectors
7-
are:
6+
attached to a motor. Knowing that the manipulated input is the motor torque ``τ``, the I/O
7+
vectors are:
88

99
```math
1010
\begin{aligned}
@@ -45,8 +45,8 @@ nu, nx, ny = 1, 2, 1
4545
model = NonLinModel(f, h, Ts, nu, nx, ny)
4646
```
4747

48-
The output function ``\mathbf{h}`` converts the angular position ``θ`` to degrees. It
49-
is good practice to first simulate `model` using [`sim!`](@ref) as a quick sanity check:
48+
The output function ``\mathbf{h}`` converts the ``θ`` angle to degrees. It is good practice
49+
to first simulate `model` using [`sim!`](@ref) as a quick sanity check:
5050

5151
```@example 1
5252
using Plots
@@ -92,9 +92,9 @@ res = sim!(mpc, 65, [180.0], plant=plant, x0=zeros(plant.nx), x̂0=zeros(mpc.est
9292
plot(res)
9393
```
9494

95-
The controller seems robust enough to variations on ``K`` coefficient. Moreover, starting
96-
from this inverted position, the closed-loop response to a step disturbances of 10° on ``θ``
97-
is also satisfactory:
95+
The controller seems robust enough to variations on ``K`` coefficient. Starting from this
96+
inverted position, the closed-loop response to a step disturbances of 10° is also
97+
satisfactory:
9898

9999
```@example 1
100100
res = sim!(mpc, 65, [180.0], plant=plant, x0=[π, 0], x̂0=[π, 0, 0], y_step=[10])

0 commit comments

Comments
 (0)