Skip to content

Commit c27e1d8

Browse files
committed
Merge remote-tracking branch 'origin'
update origin master
2 parents f109d22 + 083a639 commit c27e1d8

File tree

74 files changed

+6163
-1258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+6163
-1258
lines changed

.github/workflows/Tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
group:
3333
- InterfaceI
3434
- InterfaceII
35+
- Initialization
3536
- SymbolicIndexingInterface
3637
- Extended
3738
- Extensions

Project.toml

Lines changed: 20 additions & 7 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 = ["Yingbo Ma <[email protected]>", "Chris Rackauckas <[email protected]> and contributors"]
4-
version = "9.53.0"
4+
version = "9.60.0"
55

66
[deps]
77
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -44,6 +44,7 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
4444
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
4545
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
4646
RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
47+
SCCNonlinearSolve = "9dfe8606-65a1-4bb3-9748-cb89d1561431"
4748
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
4849
SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
4950
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -64,13 +65,15 @@ BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665"
6465
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
6566
DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
6667
HomotopyContinuation = "f213a82b-91d6-5c5d-acf7-10f1c761b327"
68+
InfiniteOpt = "20393b10-9daf-11e9-18c9-8db751c92c57"
6769
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
6870

6971
[extensions]
7072
MTKBifurcationKitExt = "BifurcationKit"
7173
MTKChainRulesCoreExt = "ChainRulesCore"
7274
MTKDeepDiffsExt = "DeepDiffs"
7375
MTKHomotopyContinuationExt = "HomotopyContinuation"
76+
MTKInfiniteOptExt = "InfiniteOpt"
7477
MTKLabelledArraysExt = "LabelledArrays"
7578

7679
[compat]
@@ -86,6 +89,7 @@ ConstructionBase = "1"
8689
DataInterpolations = "6.4"
8790
DataStructures = "0.17, 0.18"
8891
DeepDiffs = "1"
92+
DelayDiffEq = "5.50"
8993
DiffEqBase = "6.157"
9094
DiffEqCallbacks = "2.16, 3, 4"
9195
DiffEqNoiseProcess = "5"
@@ -104,6 +108,7 @@ FunctionWrappers = "1.1"
104108
FunctionWrappersWrappers = "0.1"
105109
Graphs = "1.5.2"
106110
HomotopyContinuation = "2.11"
111+
InfiniteOpt = "0.5"
107112
InteractiveUtils = "1"
108113
JuliaFormatter = "1.0.47"
109114
JumpProcesses = "9.13.1"
@@ -112,28 +117,34 @@ Latexify = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16"
112117
Libdl = "1"
113118
LinearAlgebra = "1"
114119
MLStyle = "0.4.17"
120+
ModelingToolkitStandardLibrary = "2.19"
115121
NaNMath = "0.3, 1"
116-
NonlinearSolve = "3.14, 4"
122+
NonlinearSolve = "4.3"
117123
OffsetArrays = "1"
118124
OrderedCollections = "1"
119125
OrdinaryDiffEq = "6.82.0"
120-
OrdinaryDiffEqCore = "1.7.0"
126+
OrdinaryDiffEqCore = "1.13.0"
127+
OrdinaryDiffEqDefault = "1.2"
128+
OrdinaryDiffEqNonlinearSolve = "1.3.0"
121129
PrecompileTools = "1"
122130
REPL = "1"
123131
RecursiveArrayTools = "3.26"
124132
Reexport = "0.2, 1"
125133
RuntimeGeneratedFunctions = "0.5.9"
126-
SciMLBase = "2.57.1"
134+
SCCNonlinearSolve = "1.0.0"
135+
SciMLBase = "2.68.1"
127136
SciMLStructures = "1.0"
128137
Serialization = "1"
129138
Setfield = "0.7, 0.8, 1"
130139
SimpleNonlinearSolve = "0.1.0, 1, 2"
131140
SparseArrays = "1"
132141
SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0, 2"
133142
StaticArrays = "0.10, 0.11, 0.12, 1.0"
134-
SymbolicIndexingInterface = "0.3.35"
143+
StochasticDiffEq = "6.72.1"
144+
StochasticDelayDiffEq = "1.8.1"
145+
SymbolicIndexingInterface = "0.3.36"
135146
SymbolicUtils = "3.7"
136-
Symbolics = "6.19"
147+
Symbolics = "6.22.1"
137148
URIs = "1"
138149
UnPack = "0.1, 1.0"
139150
Unitful = "1.1"
@@ -157,6 +168,8 @@ OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
157168
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
158169
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
159170
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
171+
OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"
172+
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
160173
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
161174
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
162175
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -171,4 +184,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
171184
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
172185

173186
[targets]
174-
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsBase", "DataInterpolations", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "OrdinaryDiffEqCore", "REPL", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq", "Pkg", "JET"]
187+
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsBase", "DataInterpolations", "DelayDiffEq", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "OrdinaryDiffEqCore", "OrdinaryDiffEqDefault", "REPL", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq", "Pkg", "JET", "OrdinaryDiffEqNonlinearSolve"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ lower it to a first order system, symbolically generate the Jacobian function
3636
for the numerical integrator, and solve it.
3737

3838
```julia
39-
using DifferentialEquations, ModelingToolkit
39+
using OrdinaryDiffEqDefault, ModelingToolkit
4040
using ModelingToolkit: t_nounits as t, D_nounits as D
4141

4242
@parameters σ ρ β

docs/Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
[deps]
22
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
33
BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665"
4+
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
45
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
5-
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
66
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
77
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
88
DynamicQuantities = "06fc5a27-2a28-4c7c-a15d-362465fb6821"
99
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1010
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
11+
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
1112
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
1213
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
1314
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
1415
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
1516
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
1617
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
1718
SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
19+
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
1820
StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
1921
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
2022
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
@@ -25,18 +27,19 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
2527
BenchmarkTools = "1.3"
2628
BifurcationKit = "0.4"
2729
DataInterpolations = "6.5"
28-
DifferentialEquations = "7.6"
2930
Distributions = "0.25"
3031
Documenter = "1"
3132
DynamicQuantities = "^0.11.2, 0.12, 1"
3233
ModelingToolkit = "8.33, 9"
34+
ModelingToolkitStandardLibrary = "2.19"
3335
NonlinearSolve = "3, 4"
3436
Optim = "1.7"
3537
Optimization = "3.9, 4"
3638
OptimizationOptimJL = "0.1, 0.4"
3739
OrdinaryDiffEq = "6.31"
3840
Plots = "1.36"
3941
SciMLStructures = "1.1"
42+
Setfield = "1"
4043
StochasticDiffEq = "6"
4144
SymbolicIndexingInterface = "0.3.1"
4245
SymbolicUtils = "3"

docs/make.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ makedocs(sitename = "ModelingToolkit.jl",
2525
modules = [ModelingToolkit],
2626
clean = true, doctest = false, linkcheck = true,
2727
warnonly = [:docs_block, :missing_docs, :cross_references],
28-
linkcheck_ignore = ["https://epubs.siam.org/doi/10.1137/0903023"],
28+
linkcheck_ignore = [
29+
"https://epubs.siam.org/doi/10.1137/0903023",
30+
# this link tends to fail linkcheck stochastically and often takes much longer to succeed
31+
# even in the browser it takes ages
32+
"http://www.scholarpedia.org/article/Differential-algebraic_equations"
33+
],
2934
format = Documenter.HTML(;
3035
assets = ["assets/favicon.ico"],
3136
mathengine,

docs/pages.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ pages = [
1313
"tutorials/bifurcation_diagram_computation.md",
1414
"tutorials/SampledData.md",
1515
"tutorials/domain_connections.md",
16-
"tutorials/callable_params.md"],
16+
"tutorials/callable_params.md",
17+
"tutorials/linear_analysis.md"],
1718
"Examples" => Any[
1819
"Basic Examples" => Any["examples/higher_order.md",
1920
"examples/spring_mass.md",

docs/src/basics/Composition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ x0 = [decay1.x => 1.0
5656
p = [decay1.a => 0.1
5757
decay2.a => 0.2]
5858
59-
using DifferentialEquations
59+
using OrdinaryDiffEq
6060
prob = ODEProblem(simplified_sys, x0, (0.0, 100.0), p)
6161
sol = solve(prob, Tsit5())
6262
sol[decay2.f]

0 commit comments

Comments
 (0)