Skip to content

Commit ad2b71f

Browse files
authored
Use OrderedDict for variable_symbols (#12)
* use `OrderedDict` for `variable_symbols` * bump version
1 parent b6ec333 commit ad2b71f

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

Project.toml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
name = "GraphDynamics"
22
uuid = "bcd5d0fe-e6b7-4ef1-9848-780c183c7f4c"
3-
version = "0.2.0"
3+
version = "0.2.1"
44

55
[deps]
66
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
77
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
88
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
9+
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
910
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
1011
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1112
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1213
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
1314

15+
[weakdeps]
16+
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
17+
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
18+
19+
[extensions]
20+
MTKExt = ["Symbolics", "ModelingToolkit"]
21+
1422
[compat]
15-
julia = "1.10"
1623
Accessors = "0.1"
1724
ConstructionBase = "1.5"
25+
ModelingToolkit = "9"
1826
OhMyThreads = "0.6, 0.7"
27+
OrderedCollections = "1.6.3"
1928
RecursiveArrayTools = "3"
2029
SciMLBase = "2"
2130
SparseArrays = "1"
2231
SymbolicIndexingInterface = "0.3"
2332
Symbolics = "6"
24-
ModelingToolkit = "9"
25-
26-
[weakdeps]
27-
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
28-
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
29-
30-
[extensions]
31-
MTKExt = ["Symbolics", "ModelingToolkit"]
33+
julia = "1.10"
3234

3335
[extras]
3436
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/GraphDynamics.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ using SparseArrays:
9898
rowvals,
9999
nzrange
100100

101+
using OrderedCollections:
102+
OrderedCollections,
103+
OrderedDict
104+
105+
101106
#----------------------------------------------------------
102107
# Random utils
103108
include("utils.jl")

src/symbolic_indexing.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct ParamIndex #todo: this'll require some generalization to support weight p
1616
end
1717

1818
function compute_namemap(names_partitioned, states_partitioned::Tuple{Vararg{AbstractVector{<:SubsystemStates}}})
19-
state_namemap = Dict{Symbol, StateIndex}()
19+
state_namemap = OrderedDict{Symbol, StateIndex}()
2020
for i eachindex(names_partitioned, states_partitioned)
2121
for j eachindex(names_partitioned[i], states_partitioned[i])
2222
for (k, name) enumerate(propertynames(states_partitioned[i][j]))
@@ -28,7 +28,7 @@ function compute_namemap(names_partitioned, states_partitioned::Tuple{Vararg{Abs
2828
state_namemap
2929
end
3030
function compute_namemap(names_partitioned, params_partitioned::Tuple{Vararg{AbstractVector{<:SubsystemParams}}})
31-
param_namemap = Dict{Symbol, ParamIndex}()
31+
param_namemap = OrderedDict{Symbol, ParamIndex}()
3232
for i eachindex(names_partitioned, params_partitioned)
3333
for j eachindex(names_partitioned[i], params_partitioned[i])
3434
for name propertynames(params_partitioned[i][j])

0 commit comments

Comments
 (0)