Skip to content

Commit 6414850

Browse files
committed
Merge branch 'main' into new_jump_nlp_syntax
2 parents 4d7ab12 + 6d4691e commit 6414850

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4728
-1620
lines changed

.github/workflows/DocCleanup.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Doc Preview Cleanup
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
7+
jobs:
8+
doc-preview-cleanup:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout gh-pages branch
12+
uses: actions/checkout@v2
13+
with:
14+
ref: gh-pages
15+
16+
- name: Delete preview and history
17+
run: |
18+
git config user.name "Documenter.jl"
19+
git config user.email "documenter@juliadocs.github.io"
20+
git rm -rf "previews/PR$PRNUM"
21+
git commit -m "delete preview"
22+
git branch gh-pages-new $(echo "delete history" | git commit-tree HEAD^{tree})
23+
env:
24+
PRNUM: ${{ github.event.number }}
25+
26+
- name: Push changes
27+
run: |
28+
git push --force origin gh-pages-new:gh-pages

Project.toml

Lines changed: 4 additions & 2 deletions
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.20.1"
4+
version = "0.21.2"
55

66
[deps]
77
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
@@ -12,6 +12,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1212
OSQP = "ab2f91bb-94b4-55e3-9ba0-7f65df51de79"
1313
PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
1414
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
15+
ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
1516
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1617
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
1718

@@ -24,15 +25,16 @@ LinearAlgebra = "1.6"
2425
OSQP = "0.8"
2526
PreallocationTools = "0.4"
2627
PrecompileTools = "1"
28+
ProgressLogging = "0.1"
2729
Random = "1.6"
2830
RecipesBase = "1"
2931
julia = "1.6"
3032

3133
[extras]
34+
DAQP = "c47d62df-3981-49c8-9651-128b1cd08617"
3235
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3336
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
3437
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
35-
DAQP = "c47d62df-3981-49c8-9651-128b1cd08617"
3638

3739
[targets]
3840
test = ["Test", "Documenter", "Plots", "DAQP"]

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,12 @@ for more detailed examples.
8585
- [x] input setpoint tracking
8686
- [x] terminal costs
8787
- [x] economic costs (economic model predictive control)
88+
- [ ] adaptive linear model predictive controller
89+
- [x] manual model modification
90+
- [x] automatic successive linearization of a nonlinear model
91+
- [ ] objective function weights modification
8892
- [x] explicit predictive controller for problems without constraint
89-
- [x] soft and hard constraints on:
93+
- [x] online-tunable soft and hard constraints on:
9094
- [x] output predictions
9195
- [x] manipulated inputs
9296
- [x] manipulated inputs increments
@@ -126,7 +130,7 @@ for more detailed examples.
126130
- [x] moving horizon estimator in two formulations:
127131
- [x] linear plant models (quadratic optimization)
128132
- [x] nonlinear plant models (nonlinear optimization)
129-
- [x] moving horizon estimator soft and hard constraints on:
133+
- [x] moving horizon estimator online-tunable soft and hard constraints on:
130134
- [x] state estimates
131135
- [x] process noise estimates
132136
- [x] sensor noise estimates

0 commit comments

Comments
 (0)