Skip to content

Commit a85c1c5

Browse files
committed
merge ss_discrete
2 parents 6fb59de + 4e7e1f6 commit a85c1c5

21 files changed

+1148
-121
lines changed

Project.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ AbstractTrees = "0.3, 0.4"
8383
ArrayInterface = "6, 7"
8484
BifurcationKit = "0.4"
8585
BlockArrays = "1.1"
86+
BoundaryValueDiffEqAscher = "1.1.0"
87+
BoundaryValueDiffEqMIRK = "1.4.0"
8688
ChainRulesCore = "1"
8789
Combinatorics = "1"
8890
CommonSolve = "0.2.4"
@@ -157,6 +159,8 @@ julia = "1.9"
157159
[extras]
158160
AmplNLWriter = "7c4d4715-977e-5154-bfe0-e096adeac482"
159161
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
162+
BoundaryValueDiffEqMIRK = "1a22d4ce-7765-49ea-b6f2-13c8438986a6"
163+
BoundaryValueDiffEqAscher = "7227322d-7511-4e07-9247-ad6ff830280e"
160164
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
161165
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
162166
DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
@@ -189,4 +193,4 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
189193
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
190194

191195
[targets]
192-
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", "Logging"]
196+
test = ["AmplNLWriter", "BenchmarkTools", "BoundaryValueDiffEqMIRK", "BoundaryValueDiffEqAscher", "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", "Logging"]

src/ModelingToolkit.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ include("systems/codegen_utils.jl")
156156
include("systems/problem_utils.jl")
157157
include("linearization.jl")
158158

159+
include("systems/optimization/constraints_system.jl")
160+
include("systems/optimization/optimizationsystem.jl")
161+
include("systems/optimization/modelingtoolkitize.jl")
162+
159163
include("systems/nonlinear/nonlinearsystem.jl")
160164
include("systems/nonlinear/homotopy_continuation.jl")
161165
include("systems/diffeqs/odesystem.jl")
@@ -172,10 +176,6 @@ include("systems/discrete_system/implicit_discrete_system.jl")
172176

173177
include("systems/jumps/jumpsystem.jl")
174178

175-
include("systems/optimization/constraints_system.jl")
176-
include("systems/optimization/optimizationsystem.jl")
177-
include("systems/optimization/modelingtoolkitize.jl")
178-
179179
include("systems/pde/pdesystem.jl")
180180

181181
include("systems/sparsematrixclil.jl")

src/structural_transformation/StructuralTransformations.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ using SymbolicUtils: maketerm, iscall
1111

1212
using ModelingToolkit
1313
using ModelingToolkit: ODESystem, AbstractSystem, var_from_nested_derivative, Differential,
14-
unknowns, equations, vars, Symbolic, diff2term_with_unit, value,
14+
unknowns, equations, vars, Symbolic, diff2term_with_unit,
15+
shift2term_with_unit, value,
1516
operation, arguments, Sym, Term, simplify, symbolic_linear_solve,
1617
isdiffeq, isdifferential, isirreducible,
1718
empty_substitutions, get_substitutions,
@@ -22,7 +23,8 @@ using ModelingToolkit: ODESystem, AbstractSystem, var_from_nested_derivative, Di
2223
get_postprocess_fbody, vars!,
2324
IncrementalCycleTracker, add_edge_checked!, topological_sort,
2425
invalidate_cache!, Substitutions, get_or_construct_tearing_state,
25-
filter_kwargs, lower_varname_with_unit, lower_shift_varname_with_unit, setio, SparseMatrixCLIL,
26+
filter_kwargs, lower_varname_with_unit,
27+
lower_shift_varname_with_unit, setio, SparseMatrixCLIL,
2628
get_fullvars, has_equations, observed,
2729
Schedule, schedule
2830

0 commit comments

Comments
 (0)