test: account for additional initialization parameters

Author: AayushSabharwal

test/discrete_system.jl

@@ -83,7 +83,9 @@ prob_map2 = DiscreteProblem(sys)
 sol_map2 = solve(prob_map2, FunctionMap());
 
 @test sol_map.u ≈ sol_map2.u
-@test sol_map.prob.p == sol_map2.prob.p
+for p in parameters(sys)
+    @test sol_map.prob.ps[p] ≈ sol_map2.prob.ps[p]
+end
 @test_throws Any sol_map2[R2]
 @test sol_map2[R2(k + 1)][begin:(end - 1)] == sol_map2[R][(begin + 1):end]
 # Direct Implementation

test/mtkparameters.jl

@@ -109,7 +109,7 @@ eq = D(X) ~ p[1] - p[2] * X
 u0 = [X => 1.0]
 ps = [p => [2.0, 0.1]]
 p = MTKParameters(osys, ps, u0)
-@test p.tunable == [2.0, 0.1]
+@test p.tunable == [2.0, 0.1, 1.0]
 
 # Ensure partial update promotes the buffer
 @parameters p q r

test/odesystem.jl

@@ -268,7 +268,10 @@ u01 = [y₁ => 1, y₂ => 1, y₃ => 1]
 prob_pmap = remake(prob14; p = p3, u0 = u01)
 prob_dpmap = remake(prob14; p = Dict(p3), u0 = Dict(u01))
 for p in [prob_pmap, prob_dpmap]
-    @test p.p == MTKParameters(sys, [k₁ => 0.05, k₂ => 2e7, k₃ => 1.1e4])
+    @test p.p isa MTKParameters
+    p.ps[k₁] ≈ 0.05
+    p.ps[k₂] ≈ 2e7
+    p.ps[k₃] ≈ 1.1e-4
     @test Set(Num.(unknowns(sys)) .=> p.u0) == Set([y₁ => 1, y₂ => 1, y₃ => 1])
 end
 sol_pmap = solve(prob_pmap, Rodas5())
@@ -296,7 +299,10 @@ sol_dpmap = solve(prob_dpmap, Rodas5())
     prob = ODEProblem(sys, Pair[])
     prob_new = SciMLBase.remake(prob, p = Dict(sys1.a => 3.0, b => 4.0),
         u0 = Dict(sys1.x => 1.0))
-    @test prob_new.p == MTKParameters(sys, [b => 4.0, sys1.a => 3.0, sys.sys2.a => 1.0])
+    @test prob_new.p isa MTKParameters
+    @test prob_new.ps[b] ≈ 4.0
+    @test prob_new.ps[sys1.a] ≈ 3.0
+    @test prob_new.ps[sys.sys2.a] ≈ 1.0
     @test prob_new.u0 == [1.0, 0.0]
 end
 

test/symbolic_indexing_interface.jl

@@ -23,7 +23,8 @@ using SciMLStructures: Tunable
     @test parameter_index.(
         (odesys,), [x, y, t, ParameterIndex(Tunable(), 1), :x, :y]) ==
           [nothing, nothing, nothing, ParameterIndex(Tunable(), 1), nothing, nothing]
-    @test isequal(parameter_symbols(odesys), [a, b])
+    @test isequal(
+        Set(parameter_symbols(odesys)), Set([a, b, Initial(x), Initial(y), Initial(xy)]))
     @test all(is_independent_variable.((odesys,), [t, :t]))
     @test all(.!is_independent_variable.((odesys,), [x, y, a, :x, :y, :a]))
     @test isequal(independent_variable_symbols(odesys), [t])