Skip to content

Commit 9b15ccd

Browse files
authored
handle MIMO sys in Num conversion (#24)
* handle MIMO sys in `Num` conversion * fix * breaking `Num` -> `to_num` * manifest * m * fix
1 parent da68d05 commit 9b15ccd

File tree

4 files changed

+64
-132
lines changed

4 files changed

+64
-132
lines changed

Manifest.toml

Lines changed: 20 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
3232
version = "0.4.5"
3333

3434
[[Accessors]]
35-
deps = ["CompositionsBase", "ConstructionBase", "InverseFunctions", "MacroTools"]
36-
git-tree-sha1 = "e93c42e833e6d4bd28be7b3b56d8deb99fd51f25"
35+
deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"]
36+
git-tree-sha1 = "0ba8f4c1f06707985ffb4804fdad1bf97b233897"
3737
uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
38-
version = "0.1.40"
38+
version = "0.1.41"
3939

4040
[Accessors.extensions]
4141
AxisKeysExt = "AxisKeys"
42-
DatesExt = "Dates"
4342
IntervalSetsExt = "IntervalSets"
4443
LinearAlgebraExt = "LinearAlgebra"
4544
StaticArraysExt = "StaticArrays"
@@ -49,7 +48,6 @@ version = "0.1.40"
4948

5049
[Accessors.weakdeps]
5150
AxisKeys = "94b1ba4f-4ee9-5380-92f1-94cde586c3c5"
52-
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
5351
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
5452
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
5553
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
@@ -128,18 +126,6 @@ git-tree-sha1 = "d8b0439d2be438a5f2cd68ec158fe08a7b2595b7"
128126
uuid = "e2ed5e7c-b2de-5872-ae92-c73ca462fb04"
129127
version = "0.1.9"
130128

131-
[[BitTwiddlingConvenienceFunctions]]
132-
deps = ["Static"]
133-
git-tree-sha1 = "f21cfd4950cb9f0587d5067e69405ad2acd27b87"
134-
uuid = "62783981-4cbd-42fc-bca8-16325de8dc4b"
135-
version = "0.1.6"
136-
137-
[[CPUSummary]]
138-
deps = ["CpuId", "IfElse", "PrecompileTools", "Static"]
139-
git-tree-sha1 = "5a97e67919535d6841172016c9530fd69494e5ec"
140-
uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
141-
version = "0.2.6"
142-
143129
[[ChainRulesCore]]
144130
deps = ["Compat", "LinearAlgebra"]
145131
git-tree-sha1 = "1713c74e00545bfe14605d2a2be1712de8fbcb58"
@@ -150,12 +136,6 @@ weakdeps = ["SparseArrays"]
150136
[ChainRulesCore.extensions]
151137
ChainRulesCoreSparseArraysExt = "SparseArrays"
152138

153-
[[CloseOpenIntervals]]
154-
deps = ["Static", "StaticArrayInterface"]
155-
git-tree-sha1 = "05ba0d07cd4fd8b7a39541e31a7b0254704ea581"
156-
uuid = "fb6a15b2-703c-40df-9091-08a04967cfa9"
157-
version = "0.1.13"
158-
159139
[[Combinatorics]]
160140
git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860"
161141
uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
@@ -229,10 +209,10 @@ weakdeps = ["IntervalSets", "LinearAlgebra", "StaticArrays"]
229209
ConstructionBaseStaticArraysExt = "StaticArrays"
230210

231211
[[ControlSystemsBase]]
232-
deps = ["DSP", "ForwardDiff", "IterTools", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MatrixEquations", "MatrixPencils", "Polyester", "Polynomials", "PrecompileTools", "Printf", "Random", "RecipesBase", "SparseArrays", "StaticArraysCore", "UUIDs"]
233-
git-tree-sha1 = "400d8ab689cf056e7499333b2b58339e16771b9d"
212+
deps = ["DSP", "ForwardDiff", "IterTools", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MatrixEquations", "MatrixPencils", "Polynomials", "PrecompileTools", "Printf", "Random", "RecipesBase", "SparseArrays", "StaticArraysCore", "UUIDs"]
213+
git-tree-sha1 = "f6f1fb86628cfce19c422146541dba3072eca276"
234214
uuid = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
235-
version = "1.12.0"
215+
version = "1.13.1"
236216

237217
[ControlSystemsBase.extensions]
238218
ControlSystemsBaseImplicitDifferentiationExt = ["ImplicitDifferentiation", "ComponentArrays"]
@@ -241,12 +221,6 @@ version = "1.12.0"
241221
ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
242222
ImplicitDifferentiation = "57b37032-215b-411a-8a7c-41a003a55207"
243223

244-
[[CpuId]]
245-
deps = ["Markdown"]
246-
git-tree-sha1 = "fcbb72b032692610bfbdb15018ac16a36cf2e406"
247-
uuid = "adafc99b-e345-5852-983c-f28acb93d879"
248-
version = "0.3.1"
249-
250224
[[DSP]]
251225
deps = ["Bessels", "FFTW", "IterTools", "LinearAlgebra", "Polynomials", "Random", "Reexport", "SpecialFunctions", "Statistics"]
252226
git-tree-sha1 = "489db9d78b53e44fb753d225c58832632d74ab10"
@@ -519,12 +493,6 @@ version = "0.16.5"
519493
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
520494
SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8"
521495

522-
[[LayoutPointers]]
523-
deps = ["ArrayInterface", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface"]
524-
git-tree-sha1 = "a9eaadb366f5493a5654e843864c13d8b107548c"
525-
uuid = "10f19ff3-798f-405d-979b-55457f8fc047"
526-
version = "0.1.17"
527-
528496
[[LazyArtifacts]]
529497
deps = ["Artifacts", "Pkg"]
530498
uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
@@ -612,11 +580,6 @@ git-tree-sha1 = "72aebe0b5051e5143a079a4685a46da330a40472"
612580
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
613581
version = "0.5.15"
614582

615-
[[ManualMemory]]
616-
git-tree-sha1 = "bcaef4fc7a0cfe2cba636d84cda54b5e4e4ca3cd"
617-
uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667"
618-
version = "0.1.8"
619-
620583
[[Markdown]]
621584
deps = ["Base64"]
622585
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
@@ -661,9 +624,9 @@ version = "0.5.7"
661624

662625
[[MutableArithmetics]]
663626
deps = ["LinearAlgebra", "SparseArrays", "Test"]
664-
git-tree-sha1 = "a2710df6b0931f987530f59427441b21245d8f5e"
627+
git-tree-sha1 = "43122df26d27424b23577d59e2d8020f28386516"
665628
uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
666-
version = "1.6.0"
629+
version = "1.6.2"
667630

668631
[[NaNMath]]
669632
deps = ["OpenLibm_jll"]
@@ -719,23 +682,11 @@ version = "1.11.0"
719682
[Pkg.weakdeps]
720683
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
721684

722-
[[Polyester]]
723-
deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"]
724-
git-tree-sha1 = "6d38fea02d983051776a856b7df75b30cf9a3c1f"
725-
uuid = "f517fe37-dbe3-4b94-8317-1923a5111588"
726-
version = "0.7.16"
727-
728-
[[PolyesterWeave]]
729-
deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"]
730-
git-tree-sha1 = "645bed98cd47f72f67316fd42fc47dee771aefcd"
731-
uuid = "1d0040c9-8b98-4ee7-8388-3f51789ca0ad"
732-
version = "0.2.2"
733-
734685
[[Polynomials]]
735686
deps = ["LinearAlgebra", "OrderedCollections", "RecipesBase", "Requires", "Setfield", "SparseArrays"]
736-
git-tree-sha1 = "adc25dbd4d13f148f3256b6d4743fe7e63a71c4a"
687+
git-tree-sha1 = "27f6107dc202e2499f0750c628a848ce5d6e77f5"
737688
uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
738-
version = "4.0.12"
689+
version = "4.0.13"
739690

740691
[Polynomials.extensions]
741692
PolynomialsChainRulesCoreExt = "ChainRulesCore"
@@ -773,9 +724,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
773724
version = "1.11.0"
774725

775726
[[PtrArrays]]
776-
git-tree-sha1 = "77a42d78b6a92df47ab37e177b2deac405e1c88f"
727+
git-tree-sha1 = "1d36ef11a9aaf1e8b74dacc6a731dd1de8fd493d"
777728
uuid = "43287f4e-b6f4-7ad1-bb20-aadabca52c3d"
778-
version = "1.2.1"
729+
version = "1.3.0"
779730

780731
[[PyCall]]
781732
deps = ["Conda", "Dates", "Libdl", "LinearAlgebra", "MacroTools", "Serialization", "VersionParsing"]
@@ -867,16 +818,11 @@ version = "0.5.13"
867818
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
868819
version = "0.7.0"
869820

870-
[[SIMDTypes]]
871-
git-tree-sha1 = "330289636fb8107c5f32088d2741e9fd7a061a5c"
872-
uuid = "94e857df-77ce-4151-89e5-788b33177be4"
873-
version = "0.1.0"
874-
875821
[[SciMLBase]]
876822
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
877-
git-tree-sha1 = "3e5a9c5d6432b77a271646b4ada2573f239ac5c4"
823+
git-tree-sha1 = "a263684f4134d50fe1863184281cc04a787a96a2"
878824
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
879-
version = "2.70.0"
825+
version = "2.71.0"
880826

881827
[SciMLBase.extensions]
882828
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -949,26 +895,6 @@ weakdeps = ["ChainRulesCore"]
949895
[SpecialFunctions.extensions]
950896
SpecialFunctionsChainRulesCoreExt = "ChainRulesCore"
951897

952-
[[Static]]
953-
deps = ["CommonWorldInvalidations", "IfElse", "PrecompileTools"]
954-
git-tree-sha1 = "87d51a3ee9a4b0d2fe054bdd3fc2436258db2603"
955-
uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
956-
version = "1.1.1"
957-
958-
[[StaticArrayInterface]]
959-
deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "Static"]
960-
git-tree-sha1 = "96381d50f1ce85f2663584c8e886a6ca97e60554"
961-
uuid = "0d7ed370-da01-4f52-bd93-41d350b8b718"
962-
version = "1.8.0"
963-
964-
[StaticArrayInterface.extensions]
965-
StaticArrayInterfaceOffsetArraysExt = "OffsetArrays"
966-
StaticArrayInterfaceStaticArraysExt = "StaticArrays"
967-
968-
[StaticArrayInterface.weakdeps]
969-
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
970-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
971-
972898
[[StaticArrays]]
973899
deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"]
974900
git-tree-sha1 = "47091a0340a675c738b1304b58161f3b0839d454"
@@ -1018,12 +944,6 @@ weakdeps = ["ChainRulesCore", "InverseFunctions"]
1018944
StatsFunsChainRulesCoreExt = "ChainRulesCore"
1019945
StatsFunsInverseFunctionsExt = "InverseFunctions"
1020946

1021-
[[StrideArraysCore]]
1022-
deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"]
1023-
git-tree-sha1 = "f35f6ab602df8413a50c4a25ca14de821e8605fb"
1024-
uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da"
1025-
version = "0.5.7"
1026-
1027947
[[SuiteSparse]]
1028948
deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]
1029949
uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
@@ -1041,9 +961,9 @@ version = "2.2.1"
1041961

1042962
[[SymPyCore]]
1043963
deps = ["CommonEq", "CommonSolve", "Latexify", "LinearAlgebra", "Markdown", "RecipesBase", "SpecialFunctions"]
1044-
git-tree-sha1 = "d9772eaf485a2d9353b6ecf7fa36f8d81cb523d5"
964+
git-tree-sha1 = "dbceac356a3b33d1de385278ba7ec8db97de734c"
1045965
uuid = "458b697b-88f0-4a86-b56b-78b75cfb3531"
1046-
version = "0.2.7"
966+
version = "0.2.8"
1047967
weakdeps = ["TermInterface"]
1048968

1049969
[SymPyCore.extensions]
@@ -1063,9 +983,9 @@ version = "0.2.2"
1063983

1064984
[[SymbolicUtils]]
1065985
deps = ["AbstractTrees", "ArrayInterface", "Bijections", "ChainRulesCore", "Combinatorics", "ConstructionBase", "DataStructures", "DocStringExtensions", "DynamicPolynomials", "IfElse", "LinearAlgebra", "MultivariatePolynomials", "NaNMath", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "TermInterface", "TimerOutputs", "Unityper", "WeakValueDicts"]
1066-
git-tree-sha1 = "bca944105ac43be732e3bdc38e39a4ce17391137"
986+
git-tree-sha1 = "0312d7a96d1e1dc683df96a24378469e3c1abddc"
1067987
uuid = "d1185830-fcd6-423d-90d6-eec64667417b"
1068-
version = "3.8.1"
988+
version = "3.10.1"
1069989

1070990
[SymbolicUtils.extensions]
1071991
SymbolicUtilsLabelledArraysExt = "LabelledArrays"
@@ -1077,9 +997,9 @@ version = "3.8.1"
1077997

1078998
[[Symbolics]]
1079999
deps = ["ADTypes", "ArrayInterface", "Bijections", "CommonWorldInvalidations", "ConstructionBase", "DataStructures", "DiffRules", "Distributions", "DocStringExtensions", "DomainSets", "DynamicPolynomials", "IfElse", "LaTeXStrings", "Latexify", "Libdl", "LinearAlgebra", "LogExpFunctions", "MacroTools", "Markdown", "NaNMath", "PrecompileTools", "Primes", "RecipesBase", "Reexport", "RuntimeGeneratedFunctions", "SciMLBase", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArraysCore", "SymbolicIndexingInterface", "SymbolicLimits", "SymbolicUtils", "TermInterface"]
1080-
git-tree-sha1 = "493c70c2a94a96dff97523afd2fb4ea7fd346b93"
1000+
git-tree-sha1 = "ad6615b11e39fb0619b0b3d766ab4d24a432d722"
10811001
uuid = "0c5d862f-8b57-4792-8d23-62f2024744c7"
1082-
version = "6.22.1"
1002+
version = "6.23.0"
10831003

10841004
[Symbolics.extensions]
10851005
SymbolicsForwardDiffExt = "ForwardDiff"
@@ -1129,12 +1049,6 @@ deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
11291049
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
11301050
version = "1.11.0"
11311051

1132-
[[ThreadingUtilities]]
1133-
deps = ["ManualMemory"]
1134-
git-tree-sha1 = "eda08f7e9818eb53661b3deb74e3159460dfbc27"
1135-
uuid = "8290d209-cae3-49c0-8002-c8c24d57dab5"
1136-
version = "0.5.2"
1137-
11381052
[[TimerOutputs]]
11391053
deps = ["ExprTools", "Printf"]
11401054
git-tree-sha1 = "d7298ebdfa1654583468a487e8e83fae9d72dac3"

Project.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
name = "SymbolicControlSystems"
22
uuid = "886cb795-8fd3-4b11-92f6-8071e46f71c5"
33
authors = ["Fredrik Bagge Carlson"]
4-
version = "0.2.0"
4+
version = "0.3.0"
55

66
[deps]
77
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
88
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
99
Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
1010
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1111
SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
12+
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
1213
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
1314

1415
[compat]
1516
ControlSystemsBase = "1"
1617
Latexify = "0.14, 0.15, 0.16"
1718
SymPy = "2"
19+
SymbolicUtils = "3.10.1"
1820
Symbolics = "6"
1921
julia = "1.10"
2022

0 commit comments

Comments
 (0)