Changed DataStructures -> OrderedCollections (was not yet done eyerywhere and not reflected in Project.toml)

Author: MartinOtter

Manifest.toml

@@ -5,9 +5,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
 
 [[ArrayInterface]]
 deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"]
-git-tree-sha1 = "045ff5e1bc8c6fb1ecb28694abba0a0d55b5f4f5"
+git-tree-sha1 = "a71d224f61475b93c9e196e83c17c6ac4dedacfa"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "3.1.17"
+version = "3.1.18"
 
 [[Artifacts]]
 uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -23,9 +23,9 @@ version = "0.5.1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "0b0aa9d61456940511416b59a0e902c57b154956"
+git-tree-sha1 = "f53ca8d41e4753c41cdafa6ec5f7ce914b34be54"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "0.10.12"
+version = "0.10.13"
 
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
@@ -55,9 +55,9 @@ version = "1.7.0"
 
 [[DataFrames]]
 deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"]
-git-tree-sha1 = "1dadfca11c0e08e03ab15b63aaeda55266754bad"
+git-tree-sha1 = "a19645616f37a2c2c3077a44bc0d3e73e13441d7"
 uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-version = "1.2.0"
+version = "1.2.1"
 
 [[DataStructures]]
 deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
@@ -325,10 +325,10 @@ version = "0.3.0+0"
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 
 [[SLEEFPirates]]
-deps = ["IfElse", "Static", "VectorizationBase"]
-git-tree-sha1 = "da6d214ffc85b1292f300649ef86d3c4f9aaf25d"
+deps = ["IfElse", "Libdl", "VectorizationBase"]
+git-tree-sha1 = "e262a4909eda52b6d9f1d1f0eac6537d8267a4b5"
 uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa"
-version = "0.6.22"
+version = "0.6.19"
 
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -358,9 +358,9 @@ version = "1.5.1"
 
 [[Static]]
 deps = ["IfElse"]
-git-tree-sha1 = "2740ea27b66a41f9d213561a04573da5d3823d4b"
+git-tree-sha1 = "62701892d172a2fa41a1f829f66d2b0db94a9a63"
 uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
-version = "0.2.5"
+version = "0.3.0"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
@@ -432,9 +432,9 @@ version = "1.9.0"
 
 [[VectorizationBase]]
 deps = ["ArrayInterface", "Hwloc", "IfElse", "Libdl", "LinearAlgebra", "Static"]
-git-tree-sha1 = "4e371140521702bddc350ecd5ba1ab25f9797dc8"
+git-tree-sha1 = "ddeac5d8aad03c17bdc8efd45246e82fc52d12f4"
 uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
-version = "0.20.21"
+version = "0.20.24"
 
 [[Zlib_jll]]
 deps = ["Libdl"]

Project.toml

@@ -5,18 +5,18 @@ version = "0.7.2-dev"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
 MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
+OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
 DataFrames = "1.2, 1.1, 0.22, 0.21, 0.20, 0.19"
-DataStructures = "0.18, 0.17"
 DiffRules = "1.0"
 Measurements = "2.6, 2.5, 2.4, 2.3"
 MonteCarloMeasurements = "0.10, 0.9"
+OrderedCollections = "1.4, 1.3"
 Unitful = "1.6, 1.5, 1.4, 1.3"
 julia = "1.6, 1.5"

docs/make.jl

@@ -8,7 +8,7 @@ makedocs(
   pages    = [
      "Home"   => "index.md",
 	 "Tutorial" => "Tutorial.md",
-     "Data Structures"        => "DataStructures.md",
+     "Data Structures"        => "OrderedCollections.md",
      "Equation Sorting"       => "EquationSorting.md",
      "Equation Reduction"     => "EquationReduction.md",
      "Transformation to ODE System" => "TransformationToODEs.md",

src/EquationAndStateInfo.jl

@@ -5,7 +5,7 @@
 # Provide information about the structure of the ODE or DAE equations.
 
 import DataFrames
-import DataStructures
+import OrderedCollections
 using  LinearAlgebra
 
 export StateCategory, XD, XALG, XLAMBDA, XMUE
@@ -543,7 +543,7 @@ mutable struct EquationInfo
     nx::Int                                        # = length(x) or -1 if not yet known
     x_infoByIndex::Vector{Int}                     # i = x_infoByIndex[j] -> x_info[i] 
                                                    # or empty vector, if not yet known.  
-    x_dict::DataStructures.OrderedDict{String,Int} # x_dict[x_name] returns the index of x_name with respect to x_info                                                  
+    x_dict::OrderedCollections.OrderedDict{String,Int} # x_dict[x_name] returns the index of x_name with respect to x_info                                                  
     defaultParameterAndStartValues::Union{AbstractDict,Nothing}
     ResultType    
     ResultTypeHasFloatType::Bool
@@ -565,7 +565,7 @@ EquationInfo(; status                = MANUAL,
                EquationInfo(status, ode, nz, x_info, 
                             residualCategories, linearEquations, 
                             vSolvedWithFixedTrue, nx, x_infoByIndex,
-                            DataStructures.OrderedDict{String,Int}(),
+                            OrderedCollections.OrderedDict{String,Int}(),
                             defaultParameterAndStartValues,
                             ResultType, ResultTypeHasFloatType)
 

src/LinearIntegerEquations.jl

@@ -29,7 +29,7 @@ argument `vProperty` of [`simplifyLinearIntegerEquations`](@ref):
 [DLR - Institute of System Dynamics and Control](https://www.dlr.de/sr/en)
 =#
 
-import DataStructures
+import OrderedCollections
 
 export simplifyLinearIntegerEquations!
 export printSimplifiedLinearIntegerEquations
@@ -567,7 +567,7 @@ function simplifyLinearIntegerEquations!(G, eInt::Vector{Int}, GcInt, Avar::Vect
         printLinearIntegerEquations(Gint, eInt, GcInt, var_name)
 
         println("    Unknown variables:")
-        unknowns = collect(DataStructures.OrderedSet([v for e in Gint for v in e]))
+        unknowns = collect(OrderedCollections.OrderedSet([v for e in Gint for v in e]))
         for v in unknowns
             print(lpad(string(v),8), ": ", var_name(v))
             if v in vShouldBeSolved

src/StateSelection.jl

@@ -26,7 +26,7 @@ export StateSelectionFunctions
 export showCodeWithoutComments
 
 
-#using DataStructures
+#using OrderedCollections
 using ModiaBase
 using ModiaBase.BLTandPantelides