Skip to content

[v9] fix: retain events and metadata in substitute #3770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2025
+35 −7
Merged

[v9] fix: retain events and metadata in substitute #3770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions src/systems/abstractsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2835,15 +2835,20 @@ function Symbolics.substitute(sys::AbstractSystem, rules::Union{Vector{<:Pair},
elseif sys isa ODESystem
rules = todict(map(r -> Symbolics.unwrap(r[1]) => Symbolics.unwrap(r[2]),
collect(rules)))
eqs = fast_substitute(get_eqs(sys), rules)
pdeps = fast_substitute(get_parameter_dependencies(sys), rules)
defs = Dict(fast_substitute(k, rules) => fast_substitute(v, rules)
newsys = @set sys.eqs = fast_substitute(get_eqs(sys), rules)
@set! newsys.unknowns = map(get_unknowns(sys)) do var
get(rules, var, var)
end
@set! newsys.ps = map(get_ps(sys)) do var
get(rules, var, var)
end
@set! newsys.parameter_dependencies = fast_substitute(
get_parameter_dependencies(sys), rules)
@set! newsys.defaults = Dict(fast_substitute(k, rules) => fast_substitute(v, rules)
for (k, v) in get_defaults(sys))
guess = Dict(fast_substitute(k, rules) => fast_substitute(v, rules)
@set! newsys.guesses = Dict(fast_substitute(k, rules) => fast_substitute(v, rules)
for (k, v) in get_guesses(sys))
subsys = map(s -> substitute(s, rules), get_systems(sys))
ODESystem(eqs, get_iv(sys); name = nameof(sys), defaults = defs,
guesses = guess, parameter_dependencies = pdeps, systems = subsys)
@set! newsys.systems = map(s -> substitute(s, rules), get_systems(sys))
else
error("substituting symbols is not supported for $(typeof(sys))")
end
Expand Down
23 changes: 23 additions & 0 deletions test/odesystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,3 +1783,26 @@ end
@test !process_running(proc)
kill(proc, Base.SIGKILL)
end

@testset "`substitute` retains events and metadata" begin
@parameters p(t) = 1.0
@variables x(t) = 0.0
event = [0.5] => [p ~ t]
event2 = [x ~ 0.75] => [p ~ 2 * t]

eq = [
D(x) ~ p
]
@named sys = ODESystem(eq, t, [x], [p], discrete_events = [event],
continuous_events = [event2], metadata = "TEST")

@variables x2(t) = 0.0
sys2 = substitute(sys, [x => x2])

@test length(ModelingToolkit.get_discrete_events(sys)) == 1
@test length(ModelingToolkit.get_discrete_events(sys2)) == 1
@test length(ModelingToolkit.get_continuous_events(sys)) == 1
@test length(ModelingToolkit.get_continuous_events(sys2)) == 1
@test ModelingToolkit.get_metadata(sys) == "TEST"
@test ModelingToolkit.get_metadata(sys2) == "TEST"
end
Loading