fix: most tests passing

Author: vyudu

src/systems/callbacks.jl

@@ -685,6 +685,8 @@ function generate_discrete_callbacks(sys::AbstractSystem, dvs = unknowns(sys), p
     [generate_callback(db, sys; kwargs...) for db in dbs]
 end
 
+const EMPTY_FUNCTION = (args...) -> ()
+
 """
 Codegen a DifferentialEquations callback. A (set of) continuous callback with multiple equations becomes a VectorContinuousCallback.
 Continuous callbacks with only one equation will become a ContinuousCallback.
@@ -705,9 +707,9 @@ function generate_callback(cbs::Vector{SymbolicContinuousCallback}, sys; kwargs.
     inits = []
     finals = []
     for cb in cbs
-        affect = compile_affect(cb.affect, cb, sys, default = nothing)
+        affect = compile_affect(cb.affect, cb, sys, default = EMPTY_FUNCTION) 
         push!(affects, affect)
-        affect_neg = (cb.affect_neg == cb.affect) ? affect : compile_affect(cb.affect_neg, cb, sys, default = nothing)
+        affect_neg = (cb.affect_neg === cb.affect) ? affect : compile_affect(cb.affect_neg, cb, sys, default = EMPTY_FUNCTION)
         push!(affect_negs, affect_neg)
         push!(inits, compile_affect(cb.initialize, cb, sys; default = nothing, is_init = true))
         push!(finals, compile_affect(cb.finalize, cb, sys; default = nothing))
@@ -741,11 +743,11 @@ function generate_callback(cb, sys; kwargs...)
     ps = parameters(sys; initial_parameters = true)
 
     trigger = is_timed ? conditions(cb) : compile_condition(cb, sys, dvs, ps; kwargs...)
-    affect = compile_affect(cb.affect, cb, sys, default = (args...) -> ())
+    affect = compile_affect(cb.affect, cb, sys, default = EMPTY_FUNCTION)
     affect_neg = if is_discrete(cb)
         nothing
     else
-        (cb.affect == cb.affect_neg) ? affect : compile_affect(cb.affect_neg, cb, sys, default = nothing)
+        (cb.affect === cb.affect_neg) ? affect : compile_affect(cb.affect_neg, cb, sys, default = EMPTY_FUNCTION)
     end
     init = compile_affect(cb.initialize, cb, sys, default = SciMLBase.INITIALIZE_DEFAULT, is_init = true)
     final = compile_affect(cb.finalize, cb, sys, default = SciMLBase.FINALIZE_DEFAULT)
@@ -860,7 +862,7 @@ function compile_equational_affect(aff::AffectSystem, sys; kwargs...)
                 push!(pmap, pre_p => pval)
             end
             guesses = Pair[u => integrator[aff_map[u]] for u in unknowns(affsys)]
-            affprob = ImplicitDiscreteProblem(affsys, Pair[], (0, 1), pmap; guesses, build_initializeprob = false)
+            affprob = ImplicitDiscreteProblem(affsys, Pair[], (integrator.t, integrator.t), pmap; guesses, build_initializeprob = false)
 
             affsol = init(affprob, SimpleIDSolve())
             for u in dvs_to_modify

test/symbolic_events.jl

@@ -644,7 +644,6 @@ end
         dprob = DiscreteProblem(jsys, u0, tspan, p)
         jprob = JumpProblem(jsys, dprob, Direct(); kwargs...)
         sol = solve(jprob, SSAStepper(); tstops = tstops)
-        @show sol
         @test (sol(1.000000000001)[1] - sol(0.99999999999)[1]) == 1
         paramtotest === nothing || (@test sol.ps[paramtotest] == 1.0)
         @test sol(40.0)[1] == 0
@@ -1153,7 +1152,7 @@ end
     f = ModelingToolkit.FunctionalAffect(
         f = (i, u, p, c) -> seen = true, sts = [], pars = [], discretes = [])
     cb1 = ModelingToolkit.SymbolicContinuousCallback(
-                                                     [x ~ 0], Equation[], initialize = [x ~ 1.5], finalize = f)
+                                                     [x ~ 0], nothing, initialize = [x ~ 1.5], finalize = f)
     @mtkbuild sys = ODESystem(D(x) ~ -1, t, [x], []; continuous_events = [cb1])
     prob = ODEProblem(sys, [x => 1.0], (0.0, 2), [])
     sol = solve(prob, Tsit5(); dtmax = 0.01)
@@ -1166,15 +1165,15 @@ end
     f = ModelingToolkit.FunctionalAffect(
         f = (i, u, p, c) -> seen = true, sts = [], pars = [], discretes = [])
     cb1 = ModelingToolkit.SymbolicContinuousCallback(
-        [x ~ 0], Equation[], initialize = [x ~ 1.5], finalize = f)
+        [x ~ 0], nothing, initialize = [x ~ 1.5], finalize = f)
     inited = false
     finaled = false
     a = ModelingToolkit.FunctionalAffect(
         f = (i, u, p, c) -> inited = true, sts = [], pars = [], discretes = [])
     b = ModelingToolkit.FunctionalAffect(
         f = (i, u, p, c) -> finaled = true, sts = [], pars = [], discretes = [])
     cb2 = ModelingToolkit.SymbolicContinuousCallback(
-        [x ~ 0.1], Equation[], initialize = a, finalize = b)
+        [x ~ 0.1], nothing, initialize = a, finalize = b)
     @mtkbuild sys = ODESystem(D(x) ~ -1, t, [x], []; continuous_events = [cb1, cb2])
     prob = ODEProblem(sys, [x => 1.0], (0.0, 2), [])
     sol = solve(prob, Tsit5())
@@ -1238,7 +1237,7 @@ end
     @variables x(t) [irreducible = true] y(t) [irreducible = true]
     eqs = [x ~ y, D(x) ~ -1]
     cb = [x ~ 0.0] => [x ~ 0, y ~ 1]
-    @test_throws ErrorException @mtkbuild pend = ODESystem(eqs, t; continuous_events = [cb])
+    @test_throws Exception @mtkbuild pend = ODESystem(eqs, t; continuous_events = [cb])
 
     cb = [x ~ 0.0] => [y ~ 1]
     @mtkbuild pend = ODESystem(eqs, t; continuous_events = [cb])