Merge pull request #4687 from SciML/as/fix-ci

test: make tests less dependent on equation ordering

Author: AayushSabharwal

lib/ModelingToolkitBase/test/discrete_system.jl

@@ -226,8 +226,10 @@ RHS2 = RHS
 
 @variables x(t) y(t) u(t)
 if @isdefined(ModelingToolkit)
-    eqs = [x ~ x(k - 1) + u, u ~ 1, y ~ x + u]
+    eqs = [x ~ x(k - 1) + u, u ~ 1]
     @mtkcompile de = System(eqs, t)
+    @set! de.observed = [ModelingToolkitBase.get_observed(de); [y ~ x + u]]
+    de = complete(de)
 else
     eqs = [x ~ x(k - 1) + u]
     @mtkcompile de = System(eqs, t) inputs = [u]

test/initialization_jacobian_analysis.jl

@@ -20,7 +20,7 @@ res = analyze_initialization_jacobian(prob; verbose = false)
 # Overdetermined initialization with a redundant equation: two consistent initial
 # conditions on a single unknown. The analysis must report a redundant equation.
 @variables z(t)
-@named sys2 = System([D(z) ~ -z], t; initialization_eqs = [z ~ 1.0, z^2 ~ 1.0])
+@named sys2 = System([D(z) ~ -z], t; initialization_eqs = [log(exp(z)) ~ 1.0, z^2 ~ 1.0])
 sys2 = mtkcompile(sys2)
 prob2 = ODEProblem(sys2, [], (0.0, 1.0); guesses = [z => 0.9],
     warn_initialize_determined = false)

test/structural_transformation/index_reduction.jl

@@ -26,12 +26,12 @@ state = TearingState(pendulum)
 @test StructuralTransformations.maximal_matching(
     graph, eq -> true,
     v -> var_to_diff[v] === nothing
-) ==
-    map(
-    x -> x == 0 ? StructuralTransformations.unassigned : x,
-    [3, 4, 2, 5, 0, 0, 0, 0, 0]
-)
-
+) == map(state.fullvars) do v
+    if operation(v) isa Differential
+        return findfirst(eq -> isequal(eq.lhs, v), equations(state))
+    end
+    return StructuralTransformations.unassigned
+end
 eqs2 = [
     D(D(x)) ~ T * x,
     D(D(y)) ~ T * y - g,

test/structural_transformation/utils.jl

@@ -26,11 +26,12 @@ eqs = [
     0 ~ x^2 + y^2 - L^2,
 ]
 pendulum = System(eqs, t, [x, y, w, z, T], [L, g], name = :pendulum)
-state = TearingState(pendulum)
+state = TearingState(pendulum; sort_eqs = false)
 StateSelection.find_solvables!(state)
 sss = state.structure
 @unpack graph, solvable_graph, var_to_diff = sss
-@test sort(graph.fadjlist) == [[1, 7], [2, 8], [3, 5, 9], [4, 6, 9], [5, 6]]
+sym_incidence = [[D(x), w], [D(y), z], [D(w), T, x], [D(z), T, y], [x, y]]
+@test all([issetequal(state.fullvars[v], sym_incidence[i]) for (i, v) in enumerate(graph.fadjlist)])
 @test length(graph.badjlist) == 9
 @test ne(graph) == nnz(incidence_matrix(graph)) == 12
 @test nv(solvable_graph) == 9 + 5