first test is passing

Author: isaacsas

src/systems/callbacks.jl

@@ -151,6 +151,12 @@ function add_integrator_header(out=:u)
                  expr.body)
 end
 
+function condition_header()
+    integrator = gensym(:MTKIntegrator)
+    expr -> Func([expr.args[1], expr.args[2],
+                  DestructuredArgs(expr.args[3:end], integrator, inds = [:p])], [], expr.body)
+end
+
 """
     compile_condition(cb::SymbolicDiscreteCallback, sys, dvs, ps; expression, kwargs...)
 
@@ -168,7 +174,7 @@ function compile_condition(cb::SymbolicDiscreteCallback, sys, dvs, ps;
     p = map(x -> time_varying_as_func(value(x), sys), ps)
     t = get_iv(sys)
     condit = condition(cb)
-    build_function(condit, u, p, t; expression, kwargs...)
+    build_function(condit, u, t, p; expression, wrap_code = condition_header(), kwargs...)
 end
 
 function compile_affect(cb::SymbolicContinuousCallback, args...; kwargs...)
@@ -199,7 +205,6 @@ function compile_affect(eqs::Vector{Equation}, sys, dvs, ps; outputidxs = nothin
         end
     else
         rhss = map(x -> x.rhs, eqs)
-
         outvar = :u
         if outputidxs === nothing
             lhss = map(x -> x.lhs, eqs)
@@ -332,5 +337,10 @@ function process_events(sys; callback = nothing, has_difference = false, kwargs.
     end
     difference_cb = has_difference ? generate_difference_cb(sys; kwargs...) : nothing
 
-    foldl(merge_cb, (contin_cb, discrete_cb, difference_cb, callback))
+    cb = CallbackSet(contin_cb, difference_cb, callback, discrete_cb...)
+    # cb = merge_cb(contin_cb, discrete_cb...)
+    # cb = merge_cb(cb, difference_cb)
+    # cb = merge_cb(cb, callback)
+    # @show typeof(cbs),cbs
+    cb
 end

test/root_equations.jl

@@ -336,23 +336,26 @@ sys = structural_simplify(model)
 @test isempty(ModelingToolkit.continuous_events(sys))
 
 
-# let
-#     @parameters k t1 t2
-#     @variables t A(t)
-
-#     cond1 = (t == t1)
-#     affect1 = [A ~ A + 1]
-#     cb1 = cond1 => affect1
-#     cond2 = (t == t2)
-#     affect2 = [k ~ 1.0]
-#     cb2 = cond2 => affect2
-
-#     ∂ₜ = Differential(t)
-#     eqs = [∂ₜ(A) ~ -k*A]
-#     @named osys = ODESystem(eqs, t, discrete_events=[cb1,cb2])
-#     u0 = [A => 1.0]
-#     p = [k => 0.0, t1 => 1.0, t2 => 2.0]
-#     tspan = (0.0, 4.0)
-#     oprob = ODEProblem(osys, u0, tspan, p)
-#     sol = solve(oprob, Tsit5())
-# end
+let
+    @parameters k t1 t2
+    @variables t A(t)
+
+    cond1 = (t == t1)
+    affect1 = [A ~ A + 1]
+    cb1 = cond1 => affect1
+    cond2 = (t == t2)
+    affect2 = [k ~ 1.0]
+    cb2 = cond2 => affect2
+
+    ∂ₜ = Differential(t)
+    eqs = [∂ₜ(A) ~ -k*A]
+    @named osys = ODESystem(eqs, t, [A], [k,t1,t2], discrete_events=[cb1,cb2])
+    u0 = [A => 1.0]
+    p = [k => 0.0, t1 => 1.0, t2 => 2.0]
+    tspan = (0.0, 4.0)
+    oprob = ODEProblem(osys, u0, tspan, p)
+    sol = solve(oprob, Tsit5(), tstops=[1.0,2.0]; abstol=1e-10, reltol=1e-10)
+    @test isapprox(sol(1.0000000001)[1] - sol(.999999999)[1], 1.0; rtol=1e-6)
+    @test oprob.p[1] == 1.0
+    @test isapprox(sol(4.0)[1], 2*exp(-2.0))
+end