Merge pull request #4491 from SciML/as/fix-lts

fix: fix LTS tests

Author: AayushSabharwal

lib/ModelingToolkitBase/src/problems/linearproblem.jl

@@ -31,7 +31,8 @@ function LinearFunction{iip}(
     A, b = calculate_A_b(sys; sparse)
     A = Moshi.Match.@match structural_hint begin
         StructuralHint.NoHint() => A
-        StructuralHint.Diagonal() => Diagonal{SymbolicT, Vector{SymbolicT}}(A)
+        # `Diagonal{T, Vector{T}}(::AbstractMatrix)` does not exist on 1.10
+        StructuralHint.Diagonal() => Diagonal{SymbolicT, Vector{SymbolicT}}(diag(A))
         StructuralHint.Banded(; lower_band_size, upper_band_size) => begin
             BandedMatrix{SymbolicT, Matrix{SymbolicT}}(A, (lower_band_size, upper_band_size))
         end

lib/ModelingToolkitBase/test/mtkparameters.jl

@@ -43,7 +43,8 @@ end
     @test ps2.tunable isa SVector
     @test ps2.initials isa SVector
     @test ps2.discrete isa Tuple{<:BlockedVector{Float64, <:SVector}}
-    @test ps2.constant isa Tuple{<:SVector, <:SVector, <:SVector{1, <:SMatrix}}
+    @test all(Base.Fix2(isa, SVector), ps2.constant)
+    @test any(Base.Fix2(isa, SVector{1, <:SMatrix}), ps2.constant)
     @test ps2.nonnumeric isa Tuple{<:SVector}
 end
 

test/linearize.jl

@@ -126,7 +126,7 @@ function compare_matrices(reference, value)
     @assert size(reference.A) == (2, 2) "This testing function is only valid for `2x2` systems"
     @test isapprox(reference.C, value.C) || isapprox(reverse(reference.C), value.C)
     colorder = isapprox(reference.C, value.C) ? [1, 2] : [2, 1]
-    @test isapprox(reference.B, value.B) || isapprox(reverse(reference.B), value.B)
+    @test isapprox(reference.B, value.B) || isapprox(reference.B[[2, 1], :], value.B)
     roworder = isapprox(reference.B, value.B) ? [1, 2] : [2, 1]
     @test isapprox(reference.D, value.D)
     @test isapprox(reference.A[roworder, colorder], value.A)
@@ -164,10 +164,8 @@ lsys,
 )
 @unpack int, der = pid
 
-@test lsys.A == [0 0; 0 -10]
-@test lsys.B == [2 -2; 10 -10]
-@test lsys.C == [400 -4000]
-@test lsys.D == [4400 -4400]
+refmats = (; A = [0 0; 0 -10], B = [2 -2; 10 -10], C = [400 -4000], D = [4400 -4400])
+compare_matrices(refmats, lsys)
 
 lsyss0,
     ssys2 = ModelingToolkit.linearize_symbolic(
@@ -183,10 +181,7 @@ compare_matrices(lsys, lsyss)
 # Test with the reverse desired unknown order as well to verify that similarity transform and reoreder_unknowns really works
 lsys = ModelingToolkit.reorder_unknowns(lsys, unknowns(ssys), reverse(unknowns(ssys)))
 
-@test lsys.A == [-10 0; 0 0]
-@test lsys.B == [10 -10; 2 -2]
-@test lsys.C == [-4000 400]
-@test lsys.D == [4400 -4400]
+compare_matrices(refmats, lsys)
 
 ## Test that there is a warning when input is misspecified
 @test_throws ["inputs provided to `mtkcompile`", "not found"] linearize(

test/structural_transformation/tearing.jl

@@ -13,7 +13,7 @@ import SymbolicUtils as SU
 ### Nonlinear system
 ###
 @constants h = 1
-@variables u1(t) u2(t) u3(t) u4(t) u5(t)
+@variables u1(t) u2(t) u3(t) u4(t) u5(t) [state_priority = 10]
 eqs = [
     0 ~ u1 - sin(u5) * h,
     0 ~ u2 - cos(u1),
@@ -65,7 +65,8 @@ graph2vars(graph) = map(is -> Set(map(i -> int2var[i], is)), graph.fadjlist)
 
 newsys = tearing(sys)
 @test length(equations(newsys)) == 1
-@test issetequal(SU.search_variables(equations(newsys)), [u1, u4, u5])
+vars = SU.search_variables(equations(newsys))
+@test issetequal(vars, [u1, u4, u5]) || issetequal(vars, [h, u1, u5])
 
 # Before:
 #      u1  u2  u3  u4  u5
@@ -100,16 +101,19 @@ newsys = tearing(sys)
 # --------------------|-----
 # e5 [  1           1 |  1 ]
 
-let state = TearingState(sys)
-    result, = tearing(state)
-    S = StructuralTransformations.reordered_matrix(sys, result.var_eq_matching)
-    @test S == [
-        1 0 0 0 1
-        1 1 0 0 0
-        1 1 1 0 0
-        0 1 1 1 0
-        1 0 0 1 1
-    ]
+# Variable and equation ordering changes with version
+if v"1.12" <= VERSION < v"1.13"
+    let state = TearingState(sys)
+        result, = tearing(state)
+        S = StructuralTransformations.reordered_matrix(sys, result.var_eq_matching)
+        @test S == [
+            1 0 0 0 1
+            1 1 0 0 0
+            1 1 1 0 0
+            0 1 1 1 0
+            1 0 0 1 1
+        ]
+    end
 end
 
 # unknowns: u5
@@ -124,8 +128,8 @@ end
 # solve for
 # 0 = u5 - hypot(sin(u5), hypot(cos(sin(u5)), hypot(sin(u5), cos(sin(u5)))))
 tornsys = complete(tearing(sys))
-@test isequal(equations(tornsys), [0 ~ u5 - hypot(u4, u1)])
-prob = NonlinearProblem(tornsys, [u5 => 1.0])
+@test isequal(equations(tornsys), [0 ~ u5 - hypot(u4, u1)]) || isequal(equations(tornsys), [0 ~ u1 - h * sin(u5)])
+prob = NonlinearProblem(tornsys, [u5 => 1.0, u1 => 1.0])
 sol = solve(prob, NewtonRaphson())
 @test norm(prob.f(sol.u, sol.prob.p)) < 1.0e-10
 
@@ -260,7 +264,7 @@ end
     @test length(equations(sys3)) == 1
     @test isequal(only(unknowns(sys3)), sys3.capacitor.v)
 
-    idx = findfirst(isequal(sys3.capacitor.p.i), observables(sys3))
+    idx = findfirst(isequal(sys3.resistor1.v), observables(sys3))
     rhs = observed(sys3)[idx].rhs
     @test operation(rhs) === getindex
     @test operation(arguments(rhs)[1]) === (\)