Merge pull request #1555 from SciML/myb/error_check

Fix consistency checks

Author: YingboMa

src/bipartite_graph.jl

@@ -68,10 +68,18 @@ end
 
 function complete(m::Matching{U}) where {U}
     m.inv_match !== nothing && return m
-    inv_match = Union{U, Int}[unassigned for _ = 1:length(m.match)]
+    N = length(m.match)
+    inv_match = Union{U, Int}[unassigned for _ = 1:N]
     for (i, eq) in enumerate(m.match)
         isa(eq, Int) || continue
-        inv_match[eq] = i
+        if eq <= N
+            inv_match[eq] = i
+        else # this only happens when the system is imbalanced
+            for k in N+1:eq-1
+                push!(inv_match, unassigned)
+            end
+            push!(inv_match, i)
+        end
     end
     return Matching{U}(collect(m.match), inv_match)
 end

src/structural_transformation/utils.jl

@@ -59,7 +59,7 @@ function check_consistency(state::TearingState)
         iseqs = n_highest_vars < neqs
         if iseqs
             eq_var_matching = invview(complete(var_eq_matching)) # extra equations
-            bad_idxs = findall(isnothing, @view eq_var_matching[1:nsrcs(graph)])
+            bad_idxs = findall(isequal(unassigned), @view eq_var_matching[1:nsrcs(graph)])
         else
             bad_idxs = findall(isequal(unassigned), var_eq_matching)
         end

test/odesystem.jl

@@ -683,7 +683,7 @@ let
     @test length(equations(structural_simplify(sys))) == 2
 end
 
-let 
+let
     eq_to_lhs(eq) = eq.lhs - eq.rhs ~ 0
     eqs_to_lhs(eqs) = eq_to_lhs.(eqs)
 
@@ -708,7 +708,7 @@ let
         D2(u[2]) ~ u[1] * (rho - u[3]) - u[2],
         D2(u[3]) ~ u[1] * u[2] - beta * u[3]]
     eqs3 = eqs_to_lhs(eqs3)
-    
+
     eqs4 = [
         D2(y2) ~ x2 * (rho - z2) - y2,
         D2(x2) ~ sigma * (y2 - x2),
@@ -724,9 +724,24 @@ let
     @test ModelingToolkit.isisomorphic(sys1, sys2)
     @test !ModelingToolkit.isisomorphic(sys1, sys3)
     @test ModelingToolkit.isisomorphic(sys1, ssys3) # I don't call structural_simplify in isisomorphic
-    @test !ModelingToolkit.isisomorphic(sys1, sys4) 
+    @test !ModelingToolkit.isisomorphic(sys1, sys4)
 
     # 1281
     iv2 = only(independent_variables(sys2))
     @test isequal(only(independent_variables(convert_system(ODESystem, sys1, iv2))), iv2)
-end
+end
+
+let
+    @variables t
+    vars = @variables sP(t) spP(t) spm(t) sph(t)
+    pars = @parameters a b
+    eqs = [
+           sP ~ 1
+           spP ~ sP
+           spm ~ a
+           sph ~ b
+           spm ~ 0
+          ]
+    @named sys = ODESystem(eqs, t, vars, pars)
+    @test_throws ModelingToolkit.ExtraEquationsSystemException structural_simplify(sys)
+end