Skip to content

Commit 3d1f55f

Browse files
author
dd
committed
cosmetic changes
1 parent f70aec9 commit 3d1f55f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/systems/callbacks.jl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,10 @@ function compile_user_affect(affect::FunctionalAffect, sys, dvs, ps; kwargs...)
412412

413413
# HACK: filter out eliminated symbols. Not clear this is the right thing to do
414414
# (MTK should keep these symbols)
415-
u = filter(x -> !isnothing(x[2]), collect(zip(states_syms(affect), v_inds)))
416-
p = filter(x -> !isnothing(x[2]), collect(zip(parameters_syms(affect), p_inds)))
417-
u = NamedTuple(u)
418-
p = NamedTuple(p)
415+
u = filter(x -> !isnothing(x[2]), collect(zip(states_syms(affect), v_inds))) |> NamedTuple
416+
p = filter(x -> !isnothing(x[2]), collect(zip(parameters_syms(affect), p_inds))) |> NamedTuple
419417

420-
let u=u, p=p, user_affect=func(affect), ctx = context(affect)
418+
let u=u, p=p, user_affect=func(affect), ctx=context(affect)
421419
function (integ)
422420
user_affect(integ, u, p, ctx)
423421
end

test/funcaffect.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ i8 = findfirst(==(8.0), sol[:t])
6464
@variables v(t)
6565
@test_throws ErrorException ODESystem(eqs, t, [u], [a], discrete_events=[[4.0, 8.0]=>(affect3!, [u, v => :u], [a], nothing)]; name=:sys)
6666

67+
@test_nowarn ODESystem(eqs, t, [u], [a], discrete_events=[[4.0, 8.0]=>(affect3!, [u], [a => :u], nothing)]; name=:sys)
68+
6769
@named resistor = ODESystem(D(v) ~ v, t, [v], [])
6870

6971
# nested namespace

0 commit comments

Comments
 (0)