test: update tests as per new MTKBase mtkcompile

Author: AayushSabharwal

lib/ModelingToolkitBase/test/analysis_points.jl

@@ -6,6 +6,9 @@ using Test
 using ModelingToolkitBase: t_nounits as t, D_nounits as D, AnalysisPoint, AbstractSystem
 import ModelingToolkitBase as MTK
 import ControlSystemsBase as CS
+using SciCompDSL
+using ModelingToolkitStandardLibrary
+
 using Symbolics: NAMESPACE_SEPARATOR
 
 @testset "AnalysisPoint is lowered to `connect`" begin

lib/ModelingToolkitBase/test/changeofvariables.jl

@@ -1,6 +1,7 @@
 using ModelingToolkitBase, OrdinaryDiffEq, StochasticDiffEq
 using Test, LinearAlgebra
 import DiffEqNoiseProcess
+using Symbolics: unwrap
 
 common_alg = @isdefined(ModelingToolkit) ? Tsit5() : Rodas5P()
 
@@ -136,7 +137,7 @@ new_sys = change_of_variables(sys, t, forward_subs, backward_subs)
 @test equations(new_sys)[1] == (D(z) ~ μ - 1/2*σ^2)
 @test equations(new_sys)[2] == (D(w) ~ α^2)
 @test equations(new_sys)[3] == (D(v) ~ μ - 1/2*(α^2 + σ^2))
-col1 = @isdefined(ModelingToolkit) ? 1 : 2
+col1 = isequal(noise_eqs(new_sys)[1, 1], unwrap(σ))::Bool ? 1 : 2
 col2 = 3 - col1
 @test value(noise_eqs(new_sys)[1, col1]) === value(σ)
 @test value(noise_eqs(new_sys)[1,  col2]) === value(0)

lib/ModelingToolkitBase/test/code_generation.jl

@@ -78,12 +78,8 @@ end
         return [x, 2x]
     end
     @mtkcompile sys = System([D(x) ~ y[1] + y[2], y ~ foo(x)], t)
-    if @isdefined(ModelingToolkit)
-        @test length(equations(sys)) == 1
-        @test length(ModelingToolkitBase.observed(sys)) == 3
-    else
-        @test length(equations(sys)) == 3
-    end
+    @test length(equations(sys)) == 1
+    @test length(ModelingToolkitBase.observed(sys)) == 3
     prob = ODEProblem(sys, [x => 1.0, foo => _tmp_fn2], (0.0, 1.0))
     val[] = 0
     @test_nowarn prob.f(prob.u0, prob.p, 0.0)

lib/ModelingToolkitBase/test/components.jl

@@ -79,7 +79,7 @@ include("common/rc_model.jl")
     @test !isempty(ModelingToolkitBase.bindings(sys))
     u0 = [capacitor.v => 0.0]
     prob = ODEProblem(sys, u0, (0, 10.0))
-    sol = solve(prob, Rodas4())
+    sol = solve(prob, Rodas4(); abstol = 1e-8, reltol = 1e-8)
     check_rc_sol(sol)
 end
 

lib/ModelingToolkitBase/test/constants.jl

@@ -20,11 +20,7 @@ eqs = [D(x) ~ 1,
 @named sys = System(eqs, t)
 # Now eliminate the constants first
 simp = mtkcompile(sys)
-if @isdefined(ModelingToolkit)
-    @test equations(simp) == [D(x) ~ 1.0]
-else
-    @test equations(simp) == [D(x) ~ 1.0, 0 ~ a-w]
-end
+@test equations(simp) == [D(x) ~ 1.0]
 
 #Constant with units
 @constants β=1 [unit = u"m/s"]

lib/ModelingToolkitBase/test/initializationsystem.jl

@@ -273,7 +273,7 @@ if @isdefined(ModelingToolkit)
     @test SciMLBase.successful_retcode(initsol)
     @test maximum(abs.(initsol[conditions])) < 5e-14
 else
-    @test length(initprob.u0) == 63
+    @test length(initprob.u0) == 8
     initsol = solve(initprob, reltol = 1e-12, abstol = 1e-12)
     @test SciMLBase.successful_retcode(initsol)
     @test maximum(abs.(initsol[conditions])) < 5e-13
@@ -508,11 +508,7 @@ sol = solve(prob, Tsit5())
 
     unsimp = generate_initializesystem(pend; op = [x => 1], initialization_eqs = [y ~ 1])
     sys = mtkcompile(unsimp; fully_determined = false)
-    if @isdefined(ModelingToolkit)
-        @test length(equations(sys)) in (3, 4, 5) # depending on tearing
-    else
-        @test length(equations(sys)) == 7
-    end
+    @test length(equations(sys)) in (3, 4, 5) # depending on tearing
 end
 
 @testset "Extend two systems with initialization equations and guesses" begin
@@ -592,9 +588,9 @@ end
 @parameters k1 k2 ω
 @variables X(t) Y(t)
 eqs_1st_order = [D(Y) ~ ω - Y,
-    X + k1 ~ Y + k2]
+    Y ~ X + k1 - k2]
 eqs_2nd_order = [D(D(Y)) ~ -2ω * D(Y) - (ω^2) * Y,
-    X + k1 ~ Y + k2]
+    Y ~ X + k1 - k2]
 @mtkcompile sys_1st_order = System(eqs_1st_order, t)
 @mtkcompile sys_2nd_order = System(eqs_2nd_order, t)
 
@@ -612,7 +608,7 @@ oprob_2nd_order_2 = ODEProblem(sys_2nd_order, [u0_2nd_order_2; ps], tspan)
 
 @test solve(oprob_1st_order_1, Rosenbrock23()).retcode ==
       SciMLBase.ReturnCode.InitialFailure
-@test solve(oprob_1st_order_2, Rosenbrock23())[Y][1] == 2.0
+@test solve(oprob_1st_order_2, Rosenbrock23())[Y][1] ≈ 2.0
 @test solve(oprob_2nd_order_1, Rosenbrock23()).retcode ==
       SciMLBase.ReturnCode.InitialFailure
 sol = solve(oprob_2nd_order_2, Rosenbrock23()) # retcode: Success
@@ -624,7 +620,7 @@ sol = solve(oprob_2nd_order_2, Rosenbrock23()) # retcode: Success
     @named sys = System([D(x) ~ x, D(y) ~ y], t; initialization_eqs = [y ~ -x])
     sys = mtkcompile(sys)
     prob = ODEProblem(sys, [sys.x => ones(5)], (0.0, 1.0))
-    sol = solve(prob, Tsit5(), reltol = 1e-8)
+    sol = solve(prob, Tsit5(); abstol = 1e-8, reltol = 1e-8)
     @test sol(1.0; idxs = sys.x) ≈ fill(exp(1), 5) atol=1e-6
     @test sol(1.0; idxs = sys.y) ≈ fill(-exp(1), 5) atol=1e-6
 end
@@ -683,7 +679,7 @@ end
         # Solve for either
         @mtkcompile sys = System([D(x) ~ p * x + rhss[1], D(y) ~ q * y + rhss[2]], t;
                                  bindings = [p => missing, q => missing],
-                                 initialization_eqs = [p ~ 3 * q^2], guesses = [q => 10.0])
+                                 initialization_eqs = [p ~ 3 * q^2], guesses = [q => 10.0, p => 1.0])
         # Specify `p`
         prob = Problem(sys, [x => 1.0, y => 1.0, p => 12.0], (0.0, 1.0); u0_constructor, p_constructor)
         if !@isdefined(ModelingToolkit)
@@ -942,10 +938,10 @@ end
         end
         sys = complete(sys)
         prob = Problem(sys, [x => 1.0, y => 1.0], (0.0, 1.0))
-        @test init(prob, alg).ps[p] ≈ 2.0
+        @test init(prob, alg; abstol = 1e-6, reltol = 1e-6).ps[p] ≈ 2.0 atol=1e-4
         # nonsensical value for y just to test that equations work
         prob2 = remake(prob; u0 = [x => 1.0, y => 2x + exp(x)])
-        @test init(prob2, alg).ps[p] ≈ 3 + exp(1)
+        @test init(prob2, alg; abstol = 1e-6, reltol = 1e-6).ps[p] ≈ 3 + exp(1) atol=1e-4
         # solve for `x` given `p` and `y`
         prob3 = remake(prob; u0 = [x => nothing, y => 1.0], p = [p => 2x + exp(y)])
         @test init(prob3, alg; abstol=1e-6, reltol=1e-6)[x] ≈ 1 - exp(1) atol=1e-6
@@ -954,7 +950,7 @@ end
         prob4 = remake(prob; u0 = [x => 1.0, y => 2.0], p = [p => 4.0])
         @test solve(prob4, alg).retcode == ReturnCode.InitialFailure
         prob5 = remake(prob)
-        @test init(prob, alg).ps[p] ≈ 2.0
+        @test init(prob, alg; abstol = 1e-6, reltol = 1e-6).ps[p] ≈ 2.0 atol=1e-4
     end
 end
 
@@ -1660,7 +1656,7 @@ end
 
     @mtkcompile sys = System(eqs, t)
     prob = ODEProblem(sys, [], (0.0, 1.0))
-    sol = solve(prob, @isdefined(ModelingToolkit) ? Tsit5() : Rodas5P())
+    sol = solve(prob, Tsit5())
     @test SciMLBase.successful_retcode(sol)
 end
 

lib/ModelingToolkitBase/test/input_output_handling.jl

@@ -324,7 +324,7 @@ eqs = [connect_sd(sd, mass1, mass2)
 
 f, dvs, ps, io_sys = ModelingToolkitBase.generate_control_function(
     model, [u]; simplify = true)
-@test length(dvs) == (@isdefined(ModelingToolkit) ? 4 : 8)
+@test length(dvs) == 4
 p = MTKParameters(io_sys, [io_sys.u => NaN])
 x = ModelingToolkitBase.varmap_to_vars(
     merge(ModelingToolkitBase.initial_conditions(model),

lib/ModelingToolkitBase/test/namespacing.jl

@@ -32,7 +32,7 @@ nsys = toggle_namespacing(sys, false)
     @named inner = System([D(x) ~ x, y ~ 2x + 1], t)
     @test issetequal(unknowns(inner), [x, y])
     ss = mtkcompile(inner)
-    @test issetequal(unknowns(ss), [x, y])
+    @test issetequal(unknowns(ss), [x])
 
     @named sys = System(Equation[], t; systems = [inner])
     xx, yy = let sys = inner
@@ -42,5 +42,5 @@ nsys = toggle_namespacing(sys, false)
     end
     @test issetequal(unknowns(sys), [xx, yy])
     ss = mtkcompile(sys)
-    @test isequal(unknowns(ss), [xx, yy])
+    @test isequal(unknowns(ss), [xx])
 end

lib/ModelingToolkitBase/test/odesystem.jl

@@ -572,9 +572,6 @@ let
 
     u0 = x .=> [0.5, 0]
     du0 = D.(x) .=> 0.0
-    if !@isdefined(ModelingToolkit)
-        push!(du0, D(y) => 0.0)
-    end
     prob = DAEProblem(sys, du0, (0, 50); guesses = u0)
     @test prob.du0 ≈ zeros(length(unknowns(sys)))
     @test prob.p isa MTKParameters
@@ -583,27 +580,21 @@ let
     @test sol[y] ≈ 0.9 * sol[x[1]] + sol[x[2]]
     @test isapprox(sol[x[1]][end], 1, atol = 1e-3)
 
-    prob = DAEProblem(sys, [D(y) => 0, D(x[1]) => 0, D(x[2]) => 0], (0, 50); guesses = u0)
+    prob = DAEProblem(sys, [D(x[1]) => 0, D(x[2]) => 0], (0, 50); guesses = u0)
     @test prob.du0 ≈ zeros(length(unknowns(sys)))
     @test prob.p isa MTKParameters
     @test prob.ps[k] ≈ 1
     sol = solve(prob, IDA())
     @test isapprox(sol[x[1]][end], 1, atol = 1e-3)
 
-    prob = DAEProblem(sys, [D(y) => 0, D(x[1]) => 0, D(x[2]) => 0, k => 2],
+    prob = DAEProblem(sys, [D(x[1]) => 0, D(x[2]) => 0, k => 2],
         (0, 50); guesses = u0)
     @test prob.du0 ≈ zeros(length(unknowns(sys)))
     @test prob.p isa MTKParameters
     @test prob.ps[k] ≈ 2
     sol = solve(prob, IDA())
     @test isapprox(sol[x[1]][end], 2, atol = 1e-3)
 
-    if !@isdefined(ModelingToolkit)
-        # no initial conditions for D(x[1]) and D(x[2]) provided
-        @test_throws ModelingToolkitBase.MissingVariablesError prob=DAEProblem(
-            sys, Pair[], (0, 50); guesses = u0)
-    end
-
     prob = ODEProblem(sys, Pair[x[1] => 0], (0, 50))
     sol = solve(prob, Rosenbrock23())
     @test isapprox(sol[x[1]][end], 1, atol = 1e-3)
@@ -760,13 +751,9 @@ end
 eqs = [D(Q) ~ 1 / sin(P), D(P) ~ log(-cos(Q))]
 @named sys = System(eqs, t, [P, Q], [])
 sys = complete(debug_system(sys))
-if @isdefined(ModelingToolkit)
-    prob = ODEProblem(sys, [], (0.0, 1.0))
-    @test_throws "log(-cos(Q(t))) errors" prob.f([1, 0], prob.p, 0.0)
-    @test_throws "/(1, sin(P(t))) output non-finite value" prob.f([0, 2], prob.p, 0.0)
-else
-    @test_throws "/(1, sin(P(t))) output non-finite value" ODEProblem(sys, [], (0.0, 1.0))
-end
+prob = ODEProblem(sys, [], (0.0, 1.0))
+@test_throws "log(-cos(Q(t))) errors" prob.f([1, 0], prob.p, 0.0)
+@test_throws "/(1, sin(P(t))) output non-finite value" prob.f([0, 2], prob.p, 0.0)
 
 let
     @variables x(t) = 1
@@ -996,11 +983,7 @@ end
     @variables x(t)[0:1] # 0-indexed variable array
     @named sys = System([x[0] ~ 0.0, D(x[1]) ~ x[0]], t, [x], [])
     sys = @test_nowarn mtkcompile(sys)
-    if @isdefined(ModelingToolkit)
-        @test full_equations(sys) == [D(x[1]) ~ 0.0]
-    else
-        @test issetequal(full_equations(sys), [D(x[1]) ~ x[0], 0 ~ -x[0]])
-    end
+    @test full_equations(sys) == [D(x[1]) ~ 0.0]
 end
 
 # Namespacing of array variables

lib/ModelingToolkitBase/test/symbolic_events.jl

@@ -322,11 +322,7 @@ end
     @test length(ModelingToolkitBase.continuous_events(ball)) == 1
     cev = only(continuous_events(ball))
     @test isequal(only(equations(cev)), x ~ 0)
-    if @isdefined(ModelingToolkit)
-        @test isequal(only(observed(cev.affect.system)), v ~ -Pre(v))
-    else
-        @test isequal(only(equations(cev.affect.system)), 0 ~ -Pre(v) - v)
-    end
+    @test isequal(only(observed(cev.affect.system)), v ~ -Pre(v))
 
     tspan = (0.0, 5.0)
     prob = ODEProblem(ball, Pair[], tspan)
@@ -358,13 +354,8 @@ end
     _cevs = getfield(ball, :continuous_events)
     @test isequal(only(equations(_cevs[1])), x ~ 0)
     @test issetequal(equations(_cevs[2]), [y ~ -1.5, y ~ 1.5])
-    if @isdefined(ModelingToolkit)
-        @test isequal(only(observed(_cevs[1].affect.system)), vx ~ -Pre(vx))
-        @test isequal(only(observed(_cevs[2].affect.system)), vy ~ -Pre(vy))
-    else
-        @test isequal(only(equations(_cevs[1].affect.system)), 0 ~ -Pre(vx) - vx)
-        @test isequal(only(equations(_cevs[2].affect.system)), 0 ~ -Pre(vy) - vy)
-    end
+    @test isequal(only(observed(_cevs[1].affect.system)), vx ~ -Pre(vx))
+    @test isequal(only(observed(_cevs[2].affect.system)), vy ~ -Pre(vy))
     cond = cb.condition
     out = [0.0, 0.0, 0.0]
     p0 = 0.0