test: account for new parameter dependencies in tests

Author: AayushSabharwal

test/initializationsystem.jl

@@ -486,7 +486,7 @@ sys = mtkcompile(unsimp; fully_determined = false)
 @variables x(t) y(t)
 @named sysx = System([D(x) ~ 0], t; initialization_eqs = [x ~ 1])
 @named sysy = System([D(y) ~ 0], t; initialization_eqs = [y^2 ~ 2], guesses = [y => 1])
-sys = extend(sysx, sysy)
+sys = complete(extend(sysx, sysy))
 @test length(equations(generate_initializesystem(sys))) == 2
 @test length(ModelingToolkit.guesses(sys)) == 1
 
@@ -920,7 +920,7 @@ end
         (ModelingToolkit.System, SDDEProblem, ImplicitEM(), _x(t - 0.1) + a)
     ]
         @mtkcompile sys = System(
-            [D(x) ~ 2x + r + rhss], t; parameter_dependencies = [r ~ p + 2q, q ~ p + 3],
+            [D(x) ~ 2x + r + rhss, r ~ p + 2q, q ~ p + 3], t;
             guesses = [p => 1.0])
         prob = Problem(sys, [x => 1.0, p => missing], (0.0, 1.0))
         @test length(equations(ModelingToolkit.get_parent(prob.f.initialization_data.initializeprob.f.sys))) ==
@@ -1061,8 +1061,8 @@ end
 @testset "Nonnumeric parameter dependencies are retained" begin
     @variables x(t) y(t)
     @parameters foo(::Real, ::Real) p
-    @mtkcompile sys = System([D(x) ~ t, 0 ~ foo(x, y)], t;
-        parameter_dependencies = [foo ~ Multiplier(p, 2p)], guesses = [y => -1.0])
+    @mtkcompile sys = System([D(x) ~ t, 0 ~ foo(x, y), foo ~ Multiplier(p, 2p)], t;
+        guesses = [y => -1.0])
     prob = ODEProblem(sys, [x => 1.0, p => 1.0], (0.0, 1.0))
     integ = init(prob, Rosenbrock23())
     @test integ[y] ≈ -0.5
@@ -1241,7 +1241,7 @@ end
     @variables x(t) [guess = 1.0] y(t) [guess = 1.0]
     @parameters p [guess = 1.0] q [guess = 1.0]
     @mtkcompile sys = System(
-        [D(x) ~ p * x + q * y, y ~ 2x], t; parameter_dependencies = [q ~ 2p])
+        [D(x) ~ p * x + q * y, y ~ 2x, q ~ 2p], t)
     prob = ODEProblem(sys, [x => 1.0, p => 1.0], (0.0, 1.0))
     test_dummy_initialization_equation(prob, x)
     prob2 = remake(prob; u0 = [x => 2.0])
@@ -1262,7 +1262,7 @@ end
     @variables x(t) [guess = 1.0] y(t) [guess = 1.0]
     @parameters p [guess = 1.0] q [guess = 1.0]
     @mtkcompile sys = System(
-        [D(x) ~ p * x + q * y, y ~ 2x], t; parameter_dependencies = [q ~ 2p])
+        [D(x) ~ p * x + q * y, y ~ 2x, q ~ 2p], t)
     prob = ODEProblem(sys, [:x => 1.0, p => 1.0], (0.0, 1.0))
     test_dummy_initialization_equation(prob, x)
     prob2 = remake(prob; u0 = [:x => 2.0])
@@ -1442,8 +1442,7 @@ end
     end
     @testset "$Problem" for Problem in [NonlinearProblem, NonlinearLeastSquaresProblem]
         @parameters p1 p2
-        @mtkcompile sys = System([x^2 + y^2 ~ p1, (x - 1)^2 + (y - 1)^2 ~ p2];
-            parameter_dependencies = [p2 ~ 2p1],
+        @mtkcompile sys = System([x^2 + y^2 ~ p1, (x - 1)^2 + (y - 1)^2 ~ p2, p2 ~ 2p1];
             guesses = [p1 => 0.0], defaults = [p1 => missing])
         prob = Problem(sys, [x => 1.0, y => 1.0, p2 => 6.0])
         @test prob.ps[p1] ≈ 3.0

test/mtkparameters.jl

@@ -9,7 +9,7 @@ using JET
 
 @parameters a b c(t) d::Integer e[1:3] f[1:3, 1:3]::Int g::Vector{AbstractFloat} h::String
 @named sys = System(
-    Equation[], t, [], [a, c, d, e, f, g, h], parameter_dependencies = [b ~ 2a],
+    [b ~ 2a], t, [], [a, b, c, d, e, f, g, h];
     continuous_events = [ModelingToolkit.SymbolicContinuousCallback(
         [a ~ 0] => [c ~ 0], discrete_parameters = c)], defaults = Dict(a => 0.0))
 sys = complete(sys)
@@ -178,10 +178,11 @@ function level1()
     D = Differential(t)
 
     eqs = [D(x) ~ p1 * x - p2 * x * y
-           D(y) ~ -p3 * y + p4 * x * y]
+           D(y) ~ -p3 * y + p4 * x * y
+           y0 ~ 2p4]
 
     sys = mtkcompile(complete(System(
-        eqs, t, name = :sys, parameter_dependencies = [y0 => 2p4])))
+        eqs, t, name = :sys)))
     prob = ODEProblem{true, SciMLBase.FullSpecialize}(sys, [], (0.0, 3.0))
 end
 
@@ -192,10 +193,11 @@ function level2()
     D = Differential(t)
 
     eqs = [D(x) ~ p1 * x - p23[1] * x * y
-           D(y) ~ -p23[2] * y + p4 * x * y]
+           D(y) ~ -p23[2] * y + p4 * x * y
+           y0 ~ 2p4]
 
     sys = mtkcompile(complete(System(
-        eqs, t, name = :sys, parameter_dependencies = [y0 => 2p4])))
+        eqs, t, name = :sys)))
     prob = ODEProblem{true, SciMLBase.FullSpecialize}(sys, [], (0.0, 3.0))
 end
 
@@ -206,10 +208,11 @@ function level3()
     D = Differential(t)
 
     eqs = [D(x) ~ p1 * x - p23[1] * x * y
-           D(y) ~ -p23[2] * y + p4 * x * y]
+           D(y) ~ -p23[2] * y + p4 * x * y
+           y0 ~ 2p4]
 
     sys = mtkcompile(complete(System(
-        eqs, t, name = :sys, parameter_dependencies = [y0 => 2p4])))
+        eqs, t, name = :sys)))
     prob = ODEProblem{true, SciMLBase.FullSpecialize}(sys, [], (0.0, 3.0))
 end
 

test/nonlinearsystem.jl

@@ -368,12 +368,13 @@ end
 @testset "Can convert from `System`" begin
     @variables x(t) y(t)
     @parameters p q r
-    @named sys = System([D(x) ~ p * x^3 + q, 0 ~ -y + q * x - r], t;
+    @named sys = System([D(x) ~ p * x^3 + q, 0 ~ -y + q * x - r, r ~ 3p], t;
         defaults = [x => 1.0, p => missing], guesses = [p => 1.0],
-        initialization_eqs = [p^3 + q^3 ~ 4r], parameter_dependencies = [r ~ 3p])
+        initialization_eqs = [p^3 + q^3 ~ 4r])
     nlsys = NonlinearSystem(sys)
+    nlsys = complete(nlsys)
     defs = defaults(nlsys)
-    @test length(defs) == 3
+    @test length(defs) == 6
     @test defs[x] == 1.0
     @test defs[p] === missing
     @test isinf(defs[t])
@@ -384,7 +385,7 @@ end
     @test length(equations(nlsys)) == 2
     @test all(iszero, [eq.lhs for eq in equations(nlsys)])
     @test nameof(nlsys) == nameof(sys)
-    @test !ModelingToolkit.iscomplete(nlsys)
+    @test ModelingToolkit.iscomplete(nlsys)
 
     sys1 = complete(sys; split = false)
     nlsys = NonlinearSystem(sys1)

test/odesystem.jl

@@ -881,6 +881,7 @@ eqs = [D(D(q₁)) ~ -λ * q₁,
     q₂ ~ L * cos(θ)]
 
 @named pend = System(eqs, t)
+pend = complete(pend)
 @test_nowarn generate_initializesystem(
     pend; op = [q₁ => 1.0, q₂ => 0.0], guesses = [λ => 1])
 
@@ -1189,14 +1190,15 @@ end
 @testset "Substituting preserves parameter dependencies, defaults, guesses" begin
     @parameters p1 p2
     @variables x(t) y(t)
-    @named sys = System([D(x) ~ y + p2], t; parameter_dependencies = [p2 ~ 2p1],
+    @named sys = System([D(x) ~ y + p2, p2 ~ 2p1], t;
         defaults = [p1 => 1.0, p2 => 2.0], guesses = [p1 => 2.0, p2 => 3.0])
     @parameters p3
     sys2 = substitute(sys, [p1 => p3])
+    sys2 = complete(sys2)
     @test length(parameters(sys2)) == 1
     @test is_parameter(sys2, p3)
     @test !is_parameter(sys2, p1)
-    @test length(ModelingToolkit.defaults(sys2)) == 2
+    @test length(ModelingToolkit.defaults(sys2)) == 7
     @test ModelingToolkit.defaults(sys2)[p3] == 1.0
     @test length(ModelingToolkit.guesses(sys2)) == 2
     @test ModelingToolkit.guesses(sys2)[p3] == 2.0
@@ -1205,22 +1207,23 @@ end
 @testset "Substituting with nested systems" begin
     @parameters p1 p2
     @variables x(t) y(t)
-    @named innersys = System([D(x) ~ y + p2], t; parameter_dependencies = [p2 ~ 2p1],
+    @named innersys = System([D(x) ~ y + p2; p2 ~ 2p1], t;
         defaults = [p1 => 1.0, p2 => 2.0], guesses = [p1 => 2.0, p2 => 3.0])
     @parameters p3 p4
     @named outersys = System(
-        [D(innersys.y) ~ innersys.y + p4], t; parameter_dependencies = [p4 ~ 3p3],
+        [D(innersys.y) ~ innersys.y + p4, p4 ~ 3p3], t;
         defaults = [p3 => 3.0, p4 => 9.0], guesses = [p4 => 10.0], systems = [innersys])
     @test_nowarn mtkcompile(outersys)
     @parameters p5
     sys2 = substitute(outersys, [p4 => p5])
+    sys2 = complete(sys2)
     @test_nowarn mtkcompile(sys2)
     @test length(equations(sys2)) == 2
     @test length(parameters(sys2)) == 2
-    @test length(full_parameters(sys2)) == 4
+    @test length(full_parameters(sys2)) == 10
     @test all(!isequal(p4), full_parameters(sys2))
     @test any(isequal(p5), full_parameters(sys2))
-    @test length(ModelingToolkit.defaults(sys2)) == 4
+    @test length(ModelingToolkit.defaults(sys2)) == 10
     @test ModelingToolkit.defaults(sys2)[p5] == 9.0
     @test length(ModelingToolkit.guesses(sys2)) == 3
     @test ModelingToolkit.guesses(sys2)[p5] == 10.0
@@ -1296,7 +1299,7 @@ end
 
 @testset "Parameter dependencies with constant RHS" begin
     @parameters p
-    @test_nowarn System(Equation[], t; parameter_dependencies = [p ~ 1.0], name = :a)
+    @test_nowarn System([p ~ 1.0], t; name = :a)
 end
 
 @testset "Variable discovery in arrays of `Num` inside callable symbolic" begin