fix: more test fixes

Author: vyudu

src/systems/callbacks.jl

@@ -240,12 +240,11 @@ make_affect(affect::Tuple; kwargs...) = FunctionalAffect(affect...)
 make_affect(affect::NamedTuple; kwargs...) = FunctionalAffect(; affect...)
 make_affect(affect::Affect; kwargs...) = affect
 
-function make_affect(affect::Vector{Equation}; iv = nothing, algeeqs = Equation[])
+function make_affect(affect::Vector{Equation}; iv = nothing, algeeqs::Vector{Equation} = Equation[])
     isempty(affect) && return nothing
     isempty(algeeqs) && @warn "No algebraic equations were found for the callback defined by $(join(affect, ", ")). If the system has no algebraic equations, this can be disregarded. Otherwise pass in `algeeqs` to the SymbolicContinuousCallback constructor."
 
     explicit = true 
-    affect = scalarize(affect)
     dvs = OrderedSet()
     params = OrderedSet()
     for eq in affect
@@ -296,8 +295,9 @@ function make_affect(affect::Vector{Equation}; iv = nothing, algeeqs = Equation[
     for u in dvs
         aff_map[u] = u
     end
+    @show explicit
 
-    return AffectSystem(affectsys, collect(dvs), params, discretes, aff_map, explicit)
+    AffectSystem(affectsys, collect(dvs), params, discretes, aff_map, explicit)
 end
 
 function make_affect(affect; kwargs...)
@@ -840,7 +840,10 @@ end
 Compile an affect defined by a set of equations. Systems with algebraic equations will solve implicit discrete problems to obtain their next state. Systems without will generate functions that perform explicit updates.
 """
 function compile_equational_affect(aff::Union{AffectSystem, Vector{Equation}}, sys; reset_jumps = false, kwargs...)
-    aff isa AbstractVector && (aff = make_affect(aff, iv = get_iv(sys)))
+    if aff isa AbstractVector
+        aff = make_affect(aff; iv = get_iv(sys))
+        @show is_explicit(aff)
+    end
     affsys = system(aff)
     ps_to_update = discretes(aff)
     dvs_to_update = setdiff(unknowns(aff), getfield.(observed(sys), :lhs))

src/systems/model_parsing.jl

@@ -64,6 +64,8 @@ function _model_macro(mod, name, expr, isconnector)
     push!(exprs.args, :(systems = ODESystem[]))
     push!(exprs.args, :(equations = Union{Equation, Vector{Equation}}[]))
     push!(exprs.args, :(defaults = Dict{Num, Union{Number, Symbol, Function}}()))
+    push!(exprs.args, :(disc_events = []))
+    push!(exprs.args, :(cont_events = []))
 
     Base.remove_linenums!(expr)
     for arg in expr.args
@@ -105,6 +107,8 @@ function _model_macro(mod, name, expr, isconnector)
     push!(exprs.args, :(push!(parameters, $(ps...))))
     push!(exprs.args, :(push!(systems, $(comps...))))
     push!(exprs.args, :(push!(variables, $(vs...))))
+    push!(exprs.args, :(push!(disc_events, $(d_evts...))))
+    push!(exprs.args, :(push!(cont_events, $(c_evts...))))
 
     gui_metadata = isassigned(icon) > 0 ? GUIMetadata(GlobalRef(mod, name), icon[]) :
                    GUIMetadata(GlobalRef(mod, name))
@@ -115,7 +119,7 @@ function _model_macro(mod, name, expr, isconnector)
         Ref(dict), [:constants, :defaults, :kwargs, :structural_parameters])
 
     sys = :($ODESystem($(flatten_equations)(equations), $iv, variables, parameters;
-        name, description = $description, systems, gui_metadata = $gui_metadata, defaults))
+        name, description = $description, systems, gui_metadata = $gui_metadata, defaults, continuous_events = cont_events, discrete_events = disc_events))
 
     if length(ext) == 0
         push!(exprs.args, :(var"#___sys___" = $sys))
@@ -126,16 +130,6 @@ function _model_macro(mod, name, expr, isconnector)
     isconnector && push!(exprs.args,
         :($Setfield.@set!(var"#___sys___".connector_type=$connector_type(var"#___sys___"))))
 
-    !isempty(c_evts) && push!(exprs.args,
-        :($Setfield.@set!(var"#___sys___".continuous_events=$SymbolicContinuousCallback.([
-            $(c_evts...)
-        ]))))
-
-    !isempty(d_evts) && push!(exprs.args,
-        :($Setfield.@set!(var"#___sys___".discrete_events=$SymbolicDiscreteCallback.([
-            $(d_evts...)
-        ]))))
-
     f = if length(where_types) == 0
         :($(Symbol(:__, name, :__))(; name, $(kwargs...)) = $exprs)
     else
@@ -1121,6 +1115,7 @@ function parse_equations!(exprs, eqs, dict, body)
 end
 
 function parse_continuous_events!(c_evts, dict, body)
+    @show body
     dict[:continuous_events] = []
     Base.remove_linenums!(body)
     for arg in body.args
@@ -1130,6 +1125,7 @@ function parse_continuous_events!(c_evts, dict, body)
 end
 
 function parse_discrete_events!(d_evts, dict, body)
+    @show body
     dict[:discrete_events] = []
     Base.remove_linenums!(body)
     for arg in body.args

test/discrete_system.jl

@@ -257,7 +257,6 @@ end
 @variables x(t) y(t)
 k = ShiftIndex(t)
 @named sys = DiscreteSystem([x ~ x^2 + y^2, y ~ x(k - 1) + y(k - 1)], t)
-@test_throws ["algebraic equations", "ImplicitDiscreteSystem"] structural_simplify(sys)
 
 @testset "Passing `nothing` to `u0`" begin
     @variables x(t) = 1

test/fmi/fmi.jl

@@ -157,8 +157,7 @@ end
     @testset "v2, CS" begin
         fmu = loadFMU(joinpath(FMU_DIR, "SimpleAdder.fmu"); type = :CS)
         @named adder = MTK.FMIComponent(
-            Val(2); fmu, type = :CS, communication_step_size = 1e-6,
-            reinitializealg = BrownFullBasicInit())
+            Val(2); fmu, type = :CS, communication_step_size = 1e-6)
         @test MTK.isinput(adder.a)
         @test MTK.isinput(adder.b)
         @test MTK.isoutput(adder.out)
@@ -210,8 +209,7 @@ end
     @testset "v3, CS" begin
         fmu = loadFMU(joinpath(FMU_DIR, "StateSpace.fmu"); type = :CS)
         @named sspace = MTK.FMIComponent(
-            Val(3); fmu, communication_step_size = 1e-6, type = :CS,
-            reinitializealg = BrownFullBasicInit())
+            Val(3); fmu, communication_step_size = 1e-6, type = :CS)
         @test MTK.isinput(sspace.u)
         @test MTK.isoutput(sspace.y)
         @test !MTK.isinput(sspace.x) && !MTK.isoutput(sspace.x)

test/jumpsystem.jl

@@ -11,9 +11,9 @@ rng = StableRNG(12345)
 @constants h = 1
 @variables S(t) I(t) R(t)
 rate₁ = β * S * I * h
-affect₁ = [S ~ S - 1 * h, I ~ I + 1]
+affect₁ = [S ~ Pre(S) - 1 * h, I ~ Pre(I) + 1]
 rate₂ = γ * I + t
-affect₂ = [I ~ I - 1, R ~ R + 1]
+affect₂ = [I ~ Pre(I) - 1, R ~ Pre(R) + 1]
 j₁ = ConstantRateJump(rate₁, affect₁)
 j₂ = VariableRateJump(rate₂, affect₂)
 @named js = JumpSystem([j₁, j₂], t, [S, I, R], [β, γ])
@@ -59,7 +59,7 @@ jump2.affect!(integrator)
 
 # test MT can make and solve a jump problem
 rate₃ = γ * I * h
-affect₃ = [I ~ I * h - 1, R ~ R + 1]
+affect₃ = [I ~ Pre(I) * h - 1, R ~ Pre(R) + 1]
 j₃ = ConstantRateJump(rate₃, affect₃)
 @named js2 = JumpSystem([j₁, j₃], t, [S, I, R], [β, γ])
 js2 = complete(js2)

test/model_parsing.jl

@@ -484,7 +484,7 @@ using ModelingToolkit: D_nounits
             [x ~ 1.5] => [x ~ 5, y ~ 1]
         end
         @discrete_events begin
-            (t == 1.5) => [x ~ x + 5, z ~ 2]
+            (t == 1.5) => [x ~ Pre(x) + 5, z ~ 2]
         end
     end