Skip to content

Commit f37415e

Browse files
Merge pull request #21 from JuliaComputing/as/state-selection
refactor: use StateSelection.jl
2 parents c4177c3 + 9de8e5e commit f37415e

38 files changed

+343
-5982
lines changed

LICENSE.md

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,3 @@ The ModelingToolkit.jl package is licensed under the MIT "Expat" License:
3232
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3333
>
3434
> SOFTWARE.
35-
36-
The code in `src/structural_transformation/bipartite_tearing/modia_tearing.jl`,
37-
which is from the [Modia.jl](https://github.com/ModiaSim/Modia.jl) project, is
38-
licensed as follows:
39-
40-
MIT License
41-
42-
Copyright (c) 2017-2018 ModiaSim developers
43-
44-
Permission is hereby granted, free of charge, to any person obtaining a copy
45-
of this software and associated documentation files (the "Software"), to deal
46-
in the Software without restriction, including without limitation the rights
47-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
48-
copies of the Software, and to permit persons to whom the Software is
49-
furnished to do so, subject to the following conditions:
50-
51-
The above copyright notice and this permission notice shall be included in all
52-
copies or substantial portions of the Software.
53-
54-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
55-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
56-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
57-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
58-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
59-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
60-
SOFTWARE.

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
2121
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
2222
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2323
ModelingToolkitBase = "7771a370-6774-4173-bd38-47e70ca0b839"
24+
ModelingToolkitTearing = "6bb917b9-1269-42b9-9f7c-b0dca72083ab"
2425
Moshi = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d"
2526
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
2627
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
@@ -36,26 +37,27 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
3637
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
3738
SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
3839
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
40+
StateSelection = "64909d44-ed92-46a8-bbd9-f047dfbdc84b"
3941
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
4042
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
4143
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
4244
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
4345
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
4446

4547
[weakdeps]
46-
DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
4748
FMI = "14a09403-18e3-468f-ad8a-74f8dda2d9ac"
4849

4950
[sources]
5051
ModelingToolkitBase = {subdir = "lib/ModelingToolkitBase"}
5152
ModelingToolkitStandardLibrary = {rev = "as/mtk-v11", url = "https://github.com/SciML/ModelingToolkitStandardLibrary.jl"}
53+
ModelingToolkitTearing = {rev = "main", url = "https://github.com/JuliaComputing/StateSelection.jl/", subdir = "lib/ModelingToolkitTearing"}
5254
Optimization = {rev = "as/symbolics-v7", url = "https://github.com/AayushSabharwal/Optimization.jl"}
5355
OptimizationBase = { url = "https://github.com/AayushSabharwal/Optimization.jl", rev = "as/symbolics-v7", subdir = "lib/OptimizationBase" }
5456
OptimizationMOI = {rev = "as/symbolics-v7", subdir = "lib/OptimizationMOI", url = "https://github.com/AayushSabharwal/Optimization.jl"}
5557
SciCompDSL = {subdir = "lib/SciCompDSL"}
58+
StateSelection = {rev = "main", url = "https://github.com/JuliaComputing/StateSelection.jl/"}
5659

5760
[extensions]
58-
MTKDeepDiffsExt = "DeepDiffs"
5961
MTKFMIExt = "FMI"
6062

6163
[compat]
@@ -68,7 +70,6 @@ Combinatorics = "1"
6870
CommonSolve = "0.2.4"
6971
DataInterpolations = "7, 8"
7072
DataStructures = "0.17, 0.18, 0.19"
71-
DeepDiffs = "1"
7273
DelayDiffEq = "5.61"
7374
DiffEqBase = "6.189.1"
7475
DifferentiationInterface = "0.6.47, 0.7"
@@ -122,7 +123,6 @@ BoundaryValueDiffEqAscher = "7227322d-7511-4e07-9247-ad6ff830280e"
122123
BoundaryValueDiffEqMIRK = "1a22d4ce-7765-49ea-b6f2-13c8438986a6"
123124
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
124125
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
125-
DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
126126
DelayDiffEq = "bcd4f6db-9728-5f36-b5f7-82caef46ccdb"
127127
DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
128128
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"

ext/MTKDeepDiffsExt.jl

Lines changed: 0 additions & 190 deletions
This file was deleted.

lib/ModelingToolkitBase/LICENSE.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The ModelingToolkitBase.jl package is licensed under the MIT "Expat" License:
2+
3+
Copyright (c) 2018-22: Yingbo Ma, Christopher Rackauckas, Julia Computing, and
4+
contributors
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

lib/ModelingToolkitBase/src/ModelingToolkitBase.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ export debug_system
303303
#export has_discrete_domain, has_continuous_domain
304304
#export is_discrete_domain, is_continuous_domain, is_hybrid_domain
305305
export Shift, ShiftIndex
306+
export Sample, Hold, SampleTime
306307
export Clock, SolverStepClock, TimeDomain
307308

308309
export MTKParameters, reorder_dimension_by_tunables!, reorder_dimension_by_tunables

0 commit comments

Comments
 (0)