fix: fix sfmi bugs and

Author: vyudu

src/systems/callbacks.jl

@@ -426,7 +426,7 @@ struct SymbolicDiscreteCallback <: AbstractCallback
     reinitializealg::SciMLBase.DAEInitializationAlgorithm
 
     function SymbolicDiscreteCallback(
-            condition::Union{Number, Vector{<:Number}}, affect = nothing;
+            condition::Union{Symbolic{Bool}, Number, Vector{<:Number}}, affect = nothing;
             initialize = nothing, finalize = nothing,
             reinitializealg = nothing, kwargs...)
         c = is_timed_condition(condition) ? condition : value(scalarize(condition))
@@ -468,10 +468,17 @@ function is_timed_condition(condition::T) where {T}
     end
 end
 
-to_cb_vector(cbs::Vector{<:AbstractCallback}) = cbs
-to_cb_vector(cbs::Vector) = Vector{AbstractCallback}(cbs)
-to_cb_vector(cbs::Nothing) = AbstractCallback[]
-to_cb_vector(cb::AbstractCallback) = [cb]
+to_cb_vector(cbs::Vector{<:AbstractCallback}; kwargs...) = cbs
+to_cb_vector(cbs::Union{Nothing, Vector{Nothing}}; kwargs...) = AbstractCallback[]
+to_cb_vector(cb::AbstractCallback; kwargs...) = [cb]
+function to_cb_vector(cbs; CB_TYPE = SymbolicContinuousCallback, kwargs...)
+    if cbs isa Pair
+        @show cbs
+        [CB_TYPE(cbs; kwargs...)]
+    else
+        Vector{CB_TYPE}([CB_TYPE(cb; kwargs...) for cb in cbs])
+    end
+end
 
 ############################################
 ########## Namespacing Utilities ###########
@@ -906,10 +913,10 @@ function compile_equational_affect(
 
         u_up, u_up! = build_function_wrapper(sys, (@view rhss[is_u]), dvs, _ps..., t;
             wrap_code = add_integrator_header(sys, integ, :u),
-            expression = Val{false}, outputidxs = u_idxs, wrap_mtkparameters)
+            expression = Val{false}, outputidxs = u_idxs, wrap_mtkparameters, cse = false)
         p_up, p_up! = build_function_wrapper(sys, (@view rhss[is_p]), dvs, _ps..., t;
             wrap_code = add_integrator_header(sys, integ, :p),
-            expression = Val{false}, outputidxs = p_idxs, wrap_mtkparameters)
+            expression = Val{false}, outputidxs = p_idxs, wrap_mtkparameters, cse = false)
 
         return function explicit_affect!(integ)
             isempty(dvs_to_update) || u_up!(integ)
@@ -934,7 +941,10 @@ function compile_equational_affect(
                 end
                 affprob = ImplicitDiscreteProblem(affsys, u0, (integ.t, integ.t), pmap;
                     build_initializeprob = false, check_length = false)
+                @show pmap
+                @show u0
                 affsol = init(affprob, IDSolve())
+                @show affsol
                 (check_error(affsol) === ReturnCode.InitialFailure) &&
                     throw(UnsolvableCallbackError(all_equations(aff)))
                 for u in dvs_to_update

src/systems/diffeqs/odesystem.jl

@@ -320,10 +320,8 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
 
     alg_eqs = filter(eq -> eq.lhs isa Union{Symbolic, Number} && !is_diff_equation(eq),
         deqs)
-    cont_callbacks = to_cb_vector(SymbolicContinuousCallback.(
-        continuous_events; alg_eqs = alg_eqs, iv = iv, warn_no_algebraic = false))
-    disc_callbacks = to_cb_vector(SymbolicDiscreteCallback.(
-        discrete_events; alg_eqs = alg_eqs, iv = iv, warn_no_algebraic = false))
+    cont_callbacks = to_cb_vector(continuous_events; CB_TYPE = SymbolicContinuousCallback, iv = iv, alg_eqs = alg_eqs, warn_no_algebraic = false)
+    disc_callbacks = to_cb_vector(discrete_events; CB_TYPE = SymbolicDiscreteCallback, iv = iv, alg_eqs = alg_eqs, warn_no_algebraic = false)
 
     if is_dde === nothing
         is_dde = _check_if_dde(deqs, iv′, systems)

src/systems/diffeqs/sdesystem.jl

@@ -272,10 +272,8 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs::AbstractArray, iv, dv
 
     alg_eqs = filter(eq -> eq.lhs isa Union{Symbolic, Number} && !is_diff_equation(eq),
         deqs)
-    cont_callbacks = to_cb_vector(SymbolicContinuousCallback.(
-        continuous_events; alg_eqs = alg_eqs, iv = iv, warn_no_algebraic = false))
-    disc_callbacks = to_cb_vector(SymbolicDiscreteCallback.(
-        discrete_events; alg_eqs = alg_eqs, iv = iv, warn_no_algebraic = false))
+    cont_callbacks = to_cb_vector(continuous_events; CB_TYPE = SymbolicContinuousCallback, iv = iv, alg_eqs = alg_eqs, warn_no_algebraic = false)
+    disc_callbacks = to_cb_vector(discrete_events; CB_TYPE = SymbolicDiscreteCallback, iv = iv, alg_eqs = alg_eqs, warn_no_algebraic = false)
 
     if is_dde === nothing
         is_dde = _check_if_dde(deqs, iv′, systems)

src/systems/jumps/jumpsystem.jl

@@ -212,10 +212,8 @@ function JumpSystem(eqs, iv, unknowns, ps;
         end
     end
 
-    disc_callbacks = to_cb_vector(SymbolicDiscreteCallback.(
-        discrete_events; iv = iv, warn_no_algebraic = false))
-    cont_callbacks = to_cb_vector(SymbolicContinuousCallback.(
-        continuous_events; iv = iv, warn_no_algebraic = false))
+    cont_callbacks = to_cb_vector(continuous_events; CB_TYPE = SymbolicContinuousCallback, iv = iv, warn_no_algebraic = false)
+    disc_callbacks = to_cb_vector(discrete_events; CB_TYPE = SymbolicDiscreteCallback, iv = iv, warn_no_algebraic = false)
 
     JumpSystem{typeof(ap)}(Threads.atomic_add!(SYSTEM_COUNT, UInt(1)),
         ap, iv′, us′, ps′, var_to_name, observed, name, description, systems,