Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/systems/diffeqs/odesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct ODESystem <: AbstractODESystem
"""
preface::Any
"""
events: A `Vector{SymbolicContinuousCallback}` that model events.
continuous_events: A `Vector{SymbolicContinuousCallback}` that model events.
The integrator will use root finding to guarantee that it steps at each zero crossing.
"""
continuous_events::Vector{SymbolicContinuousCallback}
Expand Down
12 changes: 8 additions & 4 deletions src/systems/discrete_system/discrete_system.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,20 @@ struct DiscreteSystem <: AbstractTimeDependentSystem
"""
defaults::Dict
"""
structure: structural information of the system
"""
structure::Any
"""
type: type of the system
"""
connector_type::Any
function DiscreteSystem(discreteEqs, iv, dvs, ps, var_to_name, ctrls, observed, name, systems, defaults, connector_type; checks::Bool = true)
function DiscreteSystem(discreteEqs, iv, dvs, ps, var_to_name, ctrls, observed, name, systems, defaults, structure, connector_type; checks::Bool = true)
if checks
check_variables(dvs, iv)
check_parameters(ps, iv)
all_dimensionless([dvs;ps;iv;ctrls]) ||check_units(discreteEqs)
all_dimensionless([dvs;ps;iv;ctrls]) || check_units(discreteEqs)
end
new(discreteEqs, iv, dvs, ps, var_to_name, ctrls, observed, name, systems, defaults, connector_type)
new(discreteEqs, iv, dvs, ps, var_to_name, ctrls, observed, name, systems, defaults, structure, connector_type)
end
end

Expand Down Expand Up @@ -104,7 +108,7 @@ function DiscreteSystem(
if length(unique(sysnames)) != length(sysnames)
throw(ArgumentError("System names must be unique."))
end
DiscreteSystem(eqs, iv′, dvs′, ps′, var_to_name, ctrl′, observed, name, systems, defaults, connector_type, kwargs...)
DiscreteSystem(eqs, iv′, dvs′, ps′, var_to_name, ctrl′, observed, name, systems, defaults, nothing, connector_type, kwargs...)
end


Expand Down
2 changes: 2 additions & 0 deletions test/discretesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ eqs = [D(S) ~ S-infection,

# System
@named sys = DiscreteSystem(eqs,t,[S,I,R],[c,nsteps,δt,β,γ]; controls = [β, γ])
syss = structural_simplify(sys)
@test syss == syss

# Problem
u0 = [S => 990.0, I => 10.0, R => 0.0]
Expand Down