added functional affect component-level testing and fixed issues with cont. events

Author: dd

src/systems/callbacks.jl

@@ -75,17 +75,20 @@ struct SymbolicContinuousCallback
     eqs::Vector{Equation}
     affect::Union{Vector{Equation}, FunctionalAffect}
     function SymbolicContinuousCallback(eqs::Vector{Equation}, affect = NULL_AFFECT)
-        new(eqs, affect)
+        new(eqs, make_affect(affect))
     end # Default affect to nothing
 end
+make_affect(affect) = affect
+make_affect(affect::Tuple) = FunctionalAffect(affect...)
+make_affect(affect::NamedTuple) = FunctionalAffect(;affect...)
 
 function Base.:(==)(e1::SymbolicContinuousCallback, e2::SymbolicContinuousCallback)
     isequal(e1.eqs, e2.eqs) && isequal(e1.affect, e2.affect)
 end
 Base.isempty(cb::SymbolicContinuousCallback) = isempty(cb.eqs)
 function Base.hash(cb::SymbolicContinuousCallback, s::UInt)
     s = foldr(hash, cb.eqs, init = s)
-    foldr(hash, cb.affect, init = s)
+    cb.affect isa AbstractVector ? foldr(hash, cb.affect, init = s) : hash(cb.affect, s)
 end
 
 to_equation_vector(eq::Equation) = [eq]
@@ -116,6 +119,7 @@ equations(cb::SymbolicContinuousCallback) = cb.eqs
 function equations(cbs::Vector{<:SymbolicContinuousCallback})
     reduce(vcat, [equations(cb) for cb in cbs])
 end
+
 affects(cb::SymbolicContinuousCallback) = cb.affect
 function affects(cbs::Vector{SymbolicContinuousCallback})
     reduce(vcat, [affects(cb) for cb in cbs])
@@ -129,8 +133,6 @@ function namespace_callback(cb::SymbolicContinuousCallback, s)::SymbolicContinuo
                                namespace_affects(affects(cb), s))
 end
 
-cb_add_context(cb::SymbolicContinuousCallback, s) = SymbolicContinuousCallback(equations(cb), af_add_context(affects(cb), s))
-
 function continuous_events(sys::AbstractSystem)
     obs = get_continuous_events(sys)
     filter(!isempty, obs)

test/funcaffect.jl

@@ -80,4 +80,50 @@ prob = ODEProblem(s2, [resistor.v=> 10.0], (0, 2.01))
 sol = solve(prob, Tsit5())
 @test ctx[1] == 2
 
+include("../examples/rc_model.jl")
 
+function affect5!(integ, u,p,ctx)
+    @test integ.u[u.capacitor₊v] ≈ 0.3
+    integ.p[p.C] *= 200
+end
+
+@named rc_model = ODESystem(rc_eqs, t, continuous_events=[[capacitor.v ~ 0.3]=>(affect5!, [capacitor.v], [capacitor.C => :C], nothing)])
+rc_model = compose(rc_model, [resistor, capacitor, source, ground])
+
+sys = structural_simplify(rc_model)
+u0 = [capacitor.v => 0.0
+      capacitor.p.i => 0.0
+      resistor.v => 0.0]
+
+prob = ODEProblem(sys, u0, (0, 10.0))
+sol = solve(prob, Rodas4())
+@test all(sol[rc_model.capacitor.v] .< 0.4)
+
+function affect6!(integ, u,p,ctx)
+    @test integ.u[u.v] ≈ 0.3
+    integ.p[p.C] *= 200
+end
+
+function Capacitor(; name, C = 1.0)
+    @named oneport = OnePort()
+    @unpack v, i = oneport
+    ps = @parameters C = C
+    D = Differential(t)
+    eqs = [
+        D(v) ~ i / C,
+    ]
+    extend(ODESystem(eqs, t, [], ps; name = name, continuous_events=[[v ~ 0.3]=>(affect6!, [v], [C], nothing)]), oneport)
+end
+
+@named capacitor = Capacitor(C = C)
+@named rc_model = ODESystem(rc_eqs, t)
+rc_model = compose(rc_model, [resistor, capacitor, source, ground])
+
+sys = structural_simplify(rc_model)
+u0 = [capacitor.v => 0.0
+      capacitor.p.i => 0.0
+      resistor.v => 0.0]
+
+prob = ODEProblem(sys, u0, (0, 10.0))
+sol = solve(prob, Rodas4())
+@test all(sol[rc_model.capacitor.v] .< 0.4)