Merge pull request #1556 from SciML/myb/error_check

More robust error checking and better tests

Author: YingboMa

src/bipartite_graph.jl

@@ -66,20 +66,12 @@ function Base.push!(m::Matching{U}, v::Union{Integer, U}) where {U}
     end
 end
 
-function complete(m::Matching{U}) where {U}
+function complete(m::Matching{U}, N=length(m.match)) where {U}
     m.inv_match !== nothing && return m
-    N = length(m.match)
     inv_match = Union{U, Int}[unassigned for _ = 1:N]
     for (i, eq) in enumerate(m.match)
         isa(eq, Int) || continue
-        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
+        inv_match[eq] = i
     end
     return Matching{U}(collect(m.match), inv_match)
 end

src/structural_transformation/utils.jl

@@ -58,7 +58,7 @@ function check_consistency(state::TearingState)
         # Just use `error_reporting` to do conditional
         iseqs = n_highest_vars < neqs
         if iseqs
-            eq_var_matching = invview(complete(var_eq_matching)) # extra equations
+            eq_var_matching = invview(complete(var_eq_matching, nsrcs(graph))) # extra equations
             bad_idxs = findall(isequal(unassigned), @view eq_var_matching[1:nsrcs(graph)])
         else
             bad_idxs = findall(isequal(unassigned), var_eq_matching)

test/odesystem.jl

@@ -741,6 +741,7 @@ let
            spm ~ a
            sph ~ b
            spm ~ 0
+           sph ~ a
           ]
     @named sys = ODESystem(eqs, t, vars, pars)
     @test_throws ModelingToolkit.ExtraEquationsSystemException structural_simplify(sys)