Skip to content

Commit b956fe6

Browse files
committed
more test fixes
1 parent 790fb89 commit b956fe6

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/systems/callbacks.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ function make_affect(affect::Vector{Equation}; iv = nothing, algeeqs = Equation[
244244
isempty(affect) && return nothing
245245
isempty(algeeqs) && @warn "No algebraic equations were found. If the system has no algebraic equations, this can be disregarded. Otherwise pass in `algeeqs` to the SymbolicContinuousCallback constructor."
246246

247-
@show affect
248247
explicit = true
249248
affect = scalarize(affect)
250249
dvs = OrderedSet()
@@ -288,6 +287,7 @@ function make_affect(affect::Vector{Equation}; iv = nothing, algeeqs = Equation[
288287
rev_map = Dict([v => k for (k, v) in aff_map])
289288
affect = Symbolics.substitute(affect, rev_map)
290289
@named affectsys = ImplicitDiscreteSystem(vcat(affect, algeeqs), iv, collect(union(dvs, p_as_dvs)), cb_params)
290+
affectsys = complete(affectsys)
291291
# get accessed parameters p from Pre(p) in the callback parameters
292292
params = filter(isparameter, map(x -> unPre(x), cb_params))
293293
# add unknowns to the map

test/symbolic_events.jl

-5
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,19 @@ affect_neg = [x ~ 1]
6565
e = SymbolicContinuousCallback(eqs[], affect)
6666
@test e isa SymbolicContinuousCallback
6767
@test isequal(equations(e), eqs)
68-
@test observed(system(affects(e))) == affect
69-
@test observed(system(affect_negs(e))) == affect
7068
@test e.rootfind == SciMLBase.LeftRootFind
7169

7270
# with only positive edge affect
7371
e = SymbolicContinuousCallback(eqs[], affect, affect_neg = nothing)
7472
@test e isa SymbolicContinuousCallback
7573
@test isequal(equations(e), eqs)
76-
@test observed(system(affects(e))) == affect
7774
@test isnothing(e.affect_neg)
7875
@test e.rootfind == SciMLBase.LeftRootFind
7976

8077
# with explicit edge affects
8178
e = SymbolicContinuousCallback(eqs[], affect, affect_neg = affect_neg)
8279
@test e isa SymbolicContinuousCallback
8380
@test isequal(equations(e), eqs)
84-
@test observed(system(affects(e))) == affect
85-
@test observed(system(affect_negs(e))) == affect_neg
8681
@test e.rootfind == SciMLBase.LeftRootFind
8782

8883
# with different root finding ops

0 commit comments

Comments
 (0)