test coverage

Author: dd

src/systems/callbacks.jl

@@ -21,11 +21,11 @@ end
 function FunctionalAffect(f, sts, pars, ctx = nothing)
     # sts & pars contain either pairs: resistor.R => R, or Syms: R
     vs = [x isa Pair ? x.first : x for x in sts]
-    vs_syms = [x isa Pair ? Symbol(x.second) : getname(x) for x in sts]
+    vs_syms = Symbol[x isa Pair ? Symbol(x.second) : getname(x) for x in sts]
     length(vs_syms) == length(unique(vs_syms)) || error("Variables are not unique")
 
     ps = [x isa Pair ? x.first : x for x in pars]
-    ps_syms = [x isa Pair ? Symbol(x.second) : getname(x) for x in pars]
+    ps_syms = Symbol[x isa Pair ? Symbol(x.second) : getname(x) for x in pars]
     length(ps_syms) == length(unique(ps_syms)) || error("Parameters are not unique")
 
     FunctionalAffect(f, vs, vs_syms, ps, ps_syms, ctx)

test/funcaffect.jl

@@ -15,6 +15,22 @@ sol = solve(prob, Tsit5())
 i4 = findfirst(==(4.0), sol[:t])
 @test sol.u[i4 + 1][1] > 10.0
 
+# callback
+cb = ModelingToolkit.SymbolicDiscreteCallback([t ~ 0],
+                                              (f = affect1!, sts = [], pars = [],
+                                               ctx = [1]))
+cb1 = ModelingToolkit.SymbolicDiscreteCallback([t ~ 0], (affect1!, [], [], [1]))
+@test ModelingToolkit.affects(cb) isa ModelingToolkit.FunctionalAffect
+@test cb == cb1
+@test ModelingToolkit.SymbolicDiscreteCallback(cb) === cb # passthrough
+
+cb = ModelingToolkit.SymbolicContinuousCallback([t ~ 0],
+                                                (f = affect1!, sts = [], pars = [],
+                                                 ctx = [1]))
+cb1 = ModelingToolkit.SymbolicContinuousCallback([t ~ 0], (affect1!, [], [], [1]))
+@test cb == cb1
+@test ModelingToolkit.SymbolicContinuousCallback(cb) === cb # passthrough
+
 # named tuple
 sys1 = ODESystem(eqs, t, [u], [], name = :sys,
                  discrete_events = [
@@ -202,6 +218,7 @@ end
 balls = compose(balls, [ball1, ball2])
 
 @test ModelingToolkit.has_discrete_events(balls)
+@test length(ModelingToolkit.affects(ModelingToolkit.discrete_events(balls))) == 2
 
 prob = ODEProblem(balls, [ball1.x => 10.0, ball1.v => 0, ball2.x => 10.0, ball2.v => 0],
                   (0, 3.0))
@@ -252,6 +269,9 @@ end
                             continuous_events = [[y ~ 0] => (bb_affect!, [v], [], nothing)])
 
 bb_sys = structural_simplify(bb_model)
+@test ModelingToolkit.affects(ModelingToolkit.continuous_events(bb_sys)) isa
+      ModelingToolkit.FunctionalAffect
+
 u0 = [v => 0.0, y => 50.0]
 
 bb_prob = ODEProblem(bb_sys, u0, (0, 15.0))