-
Notifications
You must be signed in to change notification settings - Fork 3
debug: correctly handle custom move blocking for LinModel
#301
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
franckgaga
wants to merge
21
commits into
main
Choose a base branch
from
debug_moveblocking
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+175
−82
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #301 +/- ##
=======================================
Coverage 98.55% 98.55%
=======================================
Files 28 28
Lines 4980 4993 +13
=======================================
+ Hits 4908 4921 +13
Misses 72 72 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #300, this one was hard ! 😮💨
This bug affected all controllers (
LinMPCorNonLinMPC) and all transcription methods (SingleShootingandMultipleShooting). It was hitting when the model was aLinModeland using custom move blocking patterns (whenHcis a vector of integers). The resulting solution of the optimization problem was completely wrong.The$\mathbf{Z} = \mathbf{\Delta U}$ only include the free moves (thus it skips the blocked moves). The resulting
init_predmatmethod forSingleShootingandLinModelwas not considering the fact that the decision vectorEmatrix is way more complex when I take this into account. I needed to revise the mathematical notation to keep track of all the various indices. The methodinit_defectmatforMultipleShootingandLinModelhad a similar bug with theEŝmatrix.I added a test that compare the solution of custom move blocking patterns for
LinMPCandNonLinMPC, both forSingleShootingandMultipleShooting.The new mathematical notation is described here:
init_predmatdocstring (see extended help): https://juliacontrol.github.io/ModelPredictiveControl.jl/previews/PR301/internals/predictive_control/#ModelPredictiveControl.init_predmatinit_defectmatdocstring (see extended help): https://juliacontrol.github.io/ModelPredictiveControl.jl/previews/PR301/internals/predictive_control/#ModelPredictiveControl.init_defectmat