Skip to content

Commit ddff0a3

Browse files
test: remove reliance of tests on Initial parameters
1 parent 8e0bf3b commit ddff0a3

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Diff for: test/reactionsystem_core/reactionsystem.jl

+6-7
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ let
118118
kvals = Float64.(1:length(k))
119119
def_p = [k => kvals]
120120
def_u0 = [A => 0.5, B => 1.0, C => 1.5, D => 2.0]
121-
inits = (MT.Initial(A), MT.Initial(B), MT.Initial(C), MT.Initial(D)) .=> 0
122121
defs = merge(Dict(def_p), Dict(def_u0))
123-
fulldefs = merge(copy(defs), Dict(inits))
124122

125123
@named rs = ReactionSystem(rxs, t, [A, B, C, D], [k]; defaults = defs)
126124
rs = complete(rs)
@@ -133,7 +131,8 @@ let
133131

134132
# these systems add initial conditions to the defaults
135133
@test ModelingToolkit.get_defaults(odesys) ==
136-
ModelingToolkit.get_defaults(sdesys) == fulldefs
134+
ModelingToolkit.get_defaults(sdesys)
135+
@test issubset(defs, ModelingToolkit.get_defaults(odesys))
137136

138137
u0map = [A => 5.0]
139138
kvals[1] = 5.0
@@ -465,9 +464,9 @@ let
465464
rs = complete(rs)
466465
@test all(eq -> eq isa Reaction, ModelingToolkit.get_eqs(rs)[1:4])
467466
osys = complete(convert(ODESystem, rs))
468-
inits = Initial.((B, C, D, E))
469467
@test issetequal(MT.get_unknowns(osys), [B, C, D, E])
470-
@test issetequal(MT.get_ps(osys), [k1, k2, A, inits...])
468+
_ps = filter(x -> !iscall(x) || !(operation(x) isa Initial), MTK.get_ps(osys))
469+
@test issetequal(_ps, [k1, k2, A])
471470

472471
# test nonlinear systems
473472
u0 = [1.0, 2.0, 3.0, 4.0]
@@ -497,9 +496,9 @@ let
497496
@named rs = ReactionSystem(rxs, t) # add constraint csys when supported!
498497
rs = complete(rs)
499498
ssys = complete(convert(SDESystem, rs))
500-
inits = Initial.((B, C, D, E))
501499
@test issetequal(MT.get_unknowns(ssys), [B, C, D, E])
502-
@test issetequal(MT.get_ps(ssys), [A, k1, k2, inits...])
500+
_ps = filter(x -> !iscall(x) || !(operation(x) isa Initial), MTK.get_ps(ssys))
501+
@test issetequal(_ps, [A, k1, k2])
503502
du1 = zeros(4)
504503
du2 = zeros(4)
505504
sprob = SDEProblem(ssys, u0map, tspan, pmap; check_length = false)

0 commit comments

Comments
 (0)