From 9d0154097318a046a070c369c5250cee85d9cc91 Mon Sep 17 00:00:00 2001 From: Yingbo Ma Date: Fri, 28 Jun 2024 12:37:55 -0400 Subject: [PATCH] More flexible subsystem structure --- src/systems/diffeqs/odesystem.jl | 2 +- src/systems/diffeqs/sdesystem.jl | 2 +- src/systems/discrete_system/discrete_system.jl | 2 +- src/systems/jumps/jumpsystem.jl | 2 +- src/systems/nonlinear/nonlinearsystem.jl | 2 +- src/systems/optimization/constraints_system.jl | 2 +- src/systems/optimization/optimizationsystem.jl | 2 +- src/systems/pde/pdesystem.jl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/systems/diffeqs/odesystem.jl b/src/systems/diffeqs/odesystem.jl index 619a896810..c5e2744ff0 100644 --- a/src/systems/diffeqs/odesystem.jl +++ b/src/systems/diffeqs/odesystem.jl @@ -81,7 +81,7 @@ struct ODESystem <: AbstractODESystem """ The internal systems. These are required to have unique names. """ - systems::Vector{ODESystem} + systems::Vector{Any} """ The default values to use when initial conditions and/or parameters are not supplied in `ODEProblem`. diff --git a/src/systems/diffeqs/sdesystem.jl b/src/systems/diffeqs/sdesystem.jl index a81a6694e7..44e63e1a62 100644 --- a/src/systems/diffeqs/sdesystem.jl +++ b/src/systems/diffeqs/sdesystem.jl @@ -82,7 +82,7 @@ struct SDESystem <: AbstractODESystem """ The internal systems. These are required to have unique names. """ - systems::Vector{SDESystem} + systems::Vector{Any} """ The default values to use when initial conditions and/or parameters are not supplied in `ODEProblem`. diff --git a/src/systems/discrete_system/discrete_system.jl b/src/systems/discrete_system/discrete_system.jl index d19c93435d..683f179a54 100644 --- a/src/systems/discrete_system/discrete_system.jl +++ b/src/systems/discrete_system/discrete_system.jl @@ -44,7 +44,7 @@ struct DiscreteSystem <: AbstractTimeDependentSystem """ The internal systems. These are required to have unique names. """ - systems::Vector{DiscreteSystem} + systems::Vector{Any} """ The default values to use when initial conditions and/or parameters are not supplied in `DiscreteProblem`. diff --git a/src/systems/jumps/jumpsystem.jl b/src/systems/jumps/jumpsystem.jl index accc0bc39f..0844c43719 100644 --- a/src/systems/jumps/jumpsystem.jl +++ b/src/systems/jumps/jumpsystem.jl @@ -71,7 +71,7 @@ struct JumpSystem{U <: ArrayPartition} <: AbstractTimeDependentSystem """The name of the system.""" name::Symbol """The internal systems. These are required to have unique names.""" - systems::Vector{JumpSystem} + systems::Vector{Any} """ The default values to use when initial conditions and/or parameters are not supplied in `ODEProblem`. diff --git a/src/systems/nonlinear/nonlinearsystem.jl b/src/systems/nonlinear/nonlinearsystem.jl index 00f526028d..f6b8c26208 100644 --- a/src/systems/nonlinear/nonlinearsystem.jl +++ b/src/systems/nonlinear/nonlinearsystem.jl @@ -46,7 +46,7 @@ struct NonlinearSystem <: AbstractTimeIndependentSystem """ The internal systems. These are required to have unique names. """ - systems::Vector{NonlinearSystem} + systems::Vector{Any} """ The default values to use when initial conditions and/or parameters are not supplied in `ODEProblem`. diff --git a/src/systems/optimization/constraints_system.jl b/src/systems/optimization/constraints_system.jl index 7fde00e2f4..20dfb38b5c 100644 --- a/src/systems/optimization/constraints_system.jl +++ b/src/systems/optimization/constraints_system.jl @@ -47,7 +47,7 @@ struct ConstraintsSystem <: AbstractTimeIndependentSystem """ The internal systems. These are required to have unique names. """ - systems::Vector{ConstraintsSystem} + systems::Vector{Any} """ The default values to use when initial conditions and/or parameters are not supplied in `ODEProblem`. diff --git a/src/systems/optimization/optimizationsystem.jl b/src/systems/optimization/optimizationsystem.jl index f017494b13..fd5df11a0d 100644 --- a/src/systems/optimization/optimizationsystem.jl +++ b/src/systems/optimization/optimizationsystem.jl @@ -38,7 +38,7 @@ struct OptimizationSystem <: AbstractOptimizationSystem """The name of the system.""" name::Symbol """The internal systems. These are required to have unique names.""" - systems::Vector{OptimizationSystem} + systems::Vector{Any} """ The default values to use when initial guess and/or parameters are not supplied in `OptimizationProblem`. diff --git a/src/systems/pde/pdesystem.jl b/src/systems/pde/pdesystem.jl index e14c59f440..3ecf790bc9 100644 --- a/src/systems/pde/pdesystem.jl +++ b/src/systems/pde/pdesystem.jl @@ -59,7 +59,7 @@ struct PDESystem <: ModelingToolkit.AbstractMultivariateSystem """ The internal systems. These are required to have unique names. """ - systems::Vector + systems::Vector{Any} """ A vector of explicit symbolic expressions for the analytic solutions of each dependent variable. e.g. `analytic = [u(t, x) ~ a*sin(c*t) * cos(k*x)]`.