Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ModelPredictiveControl"
uuid = "61f9bdb8-6ae4-484a-811f-bbf86720c31c"
version = "1.13.2"
version = "1.13.3"
authors = ["Francis Gagnon"]

[deps]
Expand All @@ -20,6 +20,7 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35"
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"

[compat]
ControlSystemsBase = "1.18.2"
Expand All @@ -42,6 +43,7 @@ RecipesBase = "1"
SparseArrays = "1.10"
SparseConnectivityTracer = "0.6.13, 1"
SparseMatrixColorings = "0.4.14"
StableRNGs = "1.0.4"
TestItemRunner = "1"
TestItems = "1"
julia = "1.10"
Expand Down
3 changes: 2 additions & 1 deletion src/ModelPredictiveControl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module ModelPredictiveControl
using PrecompileTools
using LinearAlgebra, SparseArrays
using Random: randn
using StableRNGs: StableRNG

using RecipesBase

Expand All @@ -15,7 +16,7 @@ using DifferentiationInterface: Constant, Cache
using SparseConnectivityTracer: TracerSparsityDetector
using SparseMatrixColorings: GreedyColoringAlgorithm, sparsity_pattern
using SparseMatrixColorings: NaturalOrder, LargestFirst, SmallestLast
using SparseMatrixColorings: IncidenceDegree, DynamicLargestFirst
using SparseMatrixColorings: IncidenceDegree, DynamicLargestFirst, RandomOrder

import ProgressLogging

Expand Down
11 changes: 6 additions & 5 deletions src/controller/nonlinmpc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,12 @@ NonLinMPC controller with a sample time Ts = 10.0 s:
sparsity_detector = TracerSparsityDetector(),
coloring_algorithm = GreedyColoringAlgorithm(
(
NaturalOrder(),
LargestFirst(),
SmallestLast(),
IncidenceDegree(),
DynamicLargestFirst()
NaturalOrder(),
LargestFirst(),
SmallestLast(),
IncidenceDegree(),
DynamicLargestFirst(),
RandomOrder(StableRNG(0), 0)
),
postprocessing = true
)
Expand Down
11 changes: 6 additions & 5 deletions src/estimator/mhe/construct.jl
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,12 @@ MovingHorizonEstimator estimator with a sample time Ts = 10.0 s:
sparsity_detector = TracerSparsityDetector(),
coloring_algorithm = GreedyColoringAlgorithm(
(
NaturalOrder(),
LargestFirst(),
SmallestLast(),
IncidenceDegree(),
DynamicLargestFirst()
NaturalOrder(),
LargestFirst(),
SmallestLast(),
IncidenceDegree(),
DynamicLargestFirst(),
RandomOrder(StableRNG(0), 0)
),
postprocessing = true
)
Expand Down
1 change: 1 addition & 0 deletions src/general.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const ALL_COLORING_ORDERS = (
SmallestLast(),
IncidenceDegree(),
DynamicLargestFirst(),
RandomOrder(StableRNG(0), 0)
)

"Termination status that means 'no solution available'."
Expand Down