Skip to content

Commit 5b58e4d

Browse files
Merge branch 'master' into recompile
2 parents 4c1545e + 66c3627 commit 5b58e4d

37 files changed

+532
-405
lines changed

.github/workflows/Documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: julia-actions/setup-julia@latest
1616
with:
1717
version: '1'

.github/workflows/Downstream.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
- {user: SciML, repo: MethodOfLines.jl, group: DAE}
3232
- {user: ai4energy, repo: Ai4EComponentLib.jl, group: Downstream}
3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535
- uses: julia-actions/setup-julia@v1
3636
with:
3737
version: ${{ matrix.julia-version }}
3838
arch: x64
3939
- uses: julia-actions/julia-buildpkg@latest
4040
- name: Clone Downstream
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242
with:
4343
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
4444
path: downstream

.github/workflows/FormatCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
version: ${{ matrix.julia-version }}
2323

24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: Install JuliaFormatter and format
2626
# This will use the latest version by default but you can set the version like so:
2727
#

.github/workflows/Invalidations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
- uses: julia-actions/setup-julia@v1
2020
with:
2121
version: '1'
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: julia-actions/julia-buildpkg@v1
2424
- uses: julia-actions/julia-invalidations@v1
2525
id: invs_pr
2626

27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
ref: ${{ github.event.repository.default_branch }}
3030
- uses: julia-actions/julia-buildpkg@v1

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- '1'
1818
- '1.6'
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- uses: julia-actions/setup-julia@v1
2222
with:
2323
version: ${{ matrix.version }}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
- This repository follows the [SciMLStyle](https://github.com/SciML/SciMLStyle) and the SciML [ColPrac](https://github.com/SciML/ColPrac).
2-
- Please run `using JuliaFormatter, ModelingToolkit; format(joinpath(dirname(pathof(ModelingToolkit)), ".."))` before commiting.
2+
- Please run `using JuliaFormatter, ModelingToolkit; format(joinpath(dirname(pathof(ModelingToolkit)), ".."))` before committing.
33
- Add tests for any new features.

Project.toml

Lines changed: 4 additions & 3 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 = "8.64.0"
4+
version = "8.68.0"
55

66
[deps]
77
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -32,6 +32,7 @@ MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
3232
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
3333
NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
3434
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
35+
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
3536
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
3637
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
3738
RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
@@ -79,6 +80,7 @@ Latexify = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16"
7980
MLStyle = "0.4.17"
8081
MacroTools = "0.5"
8182
NaNMath = "0.3, 1"
83+
OrdinaryDiffEq = "6"
8284
RecursiveArrayTools = "2.3"
8385
Reexport = "0.2, 1"
8486
RuntimeGeneratedFunctions = "0.5.9"
@@ -108,7 +110,6 @@ NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
108110
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
109111
OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
110112
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
111-
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
112113
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
113114
ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
114115
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
@@ -121,4 +122,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
121122
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
122123

123124
[targets]
124-
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsMTK", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq"]
125+
test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsMTK", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials", "StochasticDelayDiffEq"]

docs/src/basics/FAQ.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ We can solve this problem by using the `missing_variable_defaults()` function
120120
prob = ODEProblem(sys, ModelingToolkit.missing_variable_defaults(sys), (0,1))
121121
```
122122

123-
This function provides 0 for the default values, which is a safe assumption for dummy derivatives of most models. However, the 2nd arument allows for a different default value or values to be used if needed.
123+
This function provides 0 for the default values, which is a safe assumption for dummy derivatives of most models. However, the 2nd argument allows for a different default value or values to be used if needed.
124124

125125
```
126126
julia> ModelingToolkit.missing_variable_defaults(sys, [1,2,3])

src/ModelingToolkit.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ abstract type AbstractOptimizationSystem <: AbstractTimeIndependentSystem end
110110

111111
function independent_variable end
112112

113-
# this has to be included early to deal with depency issues
113+
# this has to be included early to deal with dependency issues
114114
include("structural_transformation/bareiss.jl")
115115
function complete end
116116
function var_derivative! end

src/bipartite_graph.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ Essentially the graph adapter performs two largely orthogonal functions
618618
1. It pairs an undirected bipartite graph with a matching of the destination vertex.
619619
620620
This matching is used to induce an orientation on the otherwise undirected graph:
621-
Matched edges pass from destination to source [source to desination], all other edges
621+
Matched edges pass from destination to source [source to destination], all other edges
622622
pass in the opposite direction.
623623
624624
2. It exposes the graph view obtained by contracting the destination [source] vertices
@@ -632,7 +632,7 @@ graph is acyclic.
632632
# Hypergraph interpretation
633633
634634
Consider the bipartite graph `B` as the incidence graph of some hypergraph `H`.
635-
Note that a maching `M` on `B` in the above sense is equivalent to determining
635+
Note that a matching `M` on `B` in the above sense is equivalent to determining
636636
an (1,n)-orientation on the hypergraph (i.e. each directed hyperedge has exactly
637637
one head, but any arbitrary number of tails). In this setting, this is simply
638638
the graph formed by expanding each directed hyperedge into `n` ordinary edges
@@ -685,7 +685,7 @@ function Base.iterate(c::CMONeighbors{false}, (l, state...))
685685
r === nothing && return nothing
686686
# If this is a matched edge, skip it, it's reversed in the induced
687687
# directed graph. Otherwise, if there is no matching for this destination
688-
# edge, also skip it, since it got delted in the contraction.
688+
# edge, also skip it, since it got deleted in the contraction.
689689
vsrc = c.g.matching[r[1]]
690690
if vsrc === c.v || !isa(vsrc, Int)
691691
state = (r[2],)

0 commit comments

Comments
 (0)