|
118 | 118 | kvals = Float64.(1:length(k))
|
119 | 119 | def_p = [k => kvals]
|
120 | 120 | 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 |
122 | 121 | defs = merge(Dict(def_p), Dict(def_u0))
|
123 |
| - fulldefs = merge(copy(defs), Dict(inits)) |
124 | 122 |
|
125 | 123 | @named rs = ReactionSystem(rxs, t, [A, B, C, D], [k]; defaults = defs)
|
126 | 124 | rs = complete(rs)
|
|
133 | 131 |
|
134 | 132 | # these systems add initial conditions to the defaults
|
135 | 133 | @test ModelingToolkit.get_defaults(odesys) ==
|
136 |
| - ModelingToolkit.get_defaults(sdesys) == fulldefs |
| 134 | + ModelingToolkit.get_defaults(sdesys) |
| 135 | + @test issubset(defs, ModelingToolkit.get_defaults(odesys)) |
137 | 136 |
|
138 | 137 | u0map = [A => 5.0]
|
139 | 138 | kvals[1] = 5.0
|
|
465 | 464 | rs = complete(rs)
|
466 | 465 | @test all(eq -> eq isa Reaction, ModelingToolkit.get_eqs(rs)[1:4])
|
467 | 466 | osys = complete(convert(ODESystem, rs))
|
468 |
| - inits = Initial.((B, C, D, E)) |
469 | 467 | @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]) |
471 | 470 |
|
472 | 471 | # test nonlinear systems
|
473 | 472 | u0 = [1.0, 2.0, 3.0, 4.0]
|
|
497 | 496 | @named rs = ReactionSystem(rxs, t) # add constraint csys when supported!
|
498 | 497 | rs = complete(rs)
|
499 | 498 | ssys = complete(convert(SDESystem, rs))
|
500 |
| - inits = Initial.((B, C, D, E)) |
501 | 499 | @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]) |
503 | 502 | du1 = zeros(4)
|
504 | 503 | du2 = zeros(4)
|
505 | 504 | sprob = SDEProblem(ssys, u0map, tspan, pmap; check_length = false)
|
|
0 commit comments