Skip to content

Commit bb4fb15

Browse files
authored
Merge pull request #830 from SciML/myb/st
Move StructuralTransformations to MTK
2 parents 8a9b870 + ca55c44 commit bb4fb15

File tree

19 files changed

+2282
-67
lines changed

19 files changed

+2282
-67
lines changed

LICENSE.md

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

Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ModelingToolkit"
22
uuid = "961ee093-0014-501f-94e3-6117800e7a78"
33
authors = ["Chris Rackauckas <[email protected]>"]
4-
version = "5.8.0"
4+
version = "5.9.0"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -21,6 +21,7 @@ LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
2121
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2222
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
2323
NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
24+
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
2425
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
2526
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2627
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
@@ -51,6 +52,7 @@ Latexify = "0.11, 0.12, 0.13, 0.14"
5152
LightGraphs = "1.3"
5253
MacroTools = "0.5"
5354
NaNMath = "0.3"
55+
NonlinearSolve = "0.3.8"
5456
RecursiveArrayTools = "2.3"
5557
Reexport = "0.2, 1"
5658
Requires = "1.0"
@@ -67,6 +69,7 @@ Unitful = "1.1"
6769
julia = "1.2"
6870

6971
[extras]
72+
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
7073
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
7174
GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
7275
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
@@ -78,4 +81,4 @@ StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
7881
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7982

8083
[targets]
81-
test = ["ForwardDiff", "GalacticOptim", "NonlinearSolve", "OrdinaryDiffEq", "Optim", "Random", "SteadyStateDiffEq", "Test", "StochasticDiffEq"]
84+
test = ["BenchmarkTools", "ForwardDiff", "GalacticOptim", "NonlinearSolve", "OrdinaryDiffEq", "Optim", "Random", "SteadyStateDiffEq", "Test", "StochasticDiffEq"]

src/ModelingToolkit.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module ModelingToolkit
22

3-
using DiffEqBase, SciMLBase
3+
using DiffEqBase, SciMLBase, Reexport
44
using Distributed
55
using StaticArrays, LinearAlgebra, SparseArrays, LabelledArrays
66
using Latexify, Unitful, ArrayInterface
@@ -249,6 +249,8 @@ include("systems/systemstructure.jl")
249249
using .SystemStructures
250250

251251
include("systems/alias_elimination.jl")
252+
include("structural_transformation/StructuralTransformations.jl")
253+
@reexport using .StructuralTransformations
252254

253255
include("latexify_recipes.jl")
254256
include("build_function.jl")
@@ -276,6 +278,7 @@ export IntervalDomain, ProductDomain, ⊗, CircleDomain
276278
export Equation, ConstrainedEquation
277279
export Term, Sym
278280
export independent_variable, states, parameters, equations, controls, observed, structure
281+
export structural_simplify
279282

280283
export calculate_jacobian, generate_jacobian, generate_function
281284
export calculate_tgrad, generate_tgrad

0 commit comments

Comments
 (0)