Fix and clean-up tests

Author: bolognam

src/structural_transformation/utils.jl

@@ -50,10 +50,10 @@ end
 function error_reporting(sys, bad_idxs, n_highest_vars, iseqs)
     io = IOBuffer()
     if iseqs
-        error_title = "More equations than variables:\n"
+        error_title = "More equations than variables, here are the potential extra equation(s):\n"
         out_arr = equations(sys)[bad_idxs]
     else
-        error_title = "More variables than equations:\n"
+        error_title = "More variables than equations, here are the potential extra variable(s):\n"
         out_arr = structure(sys).fullvars[bad_idxs]
     end
 
@@ -94,12 +94,11 @@ function check_consistency(sys::AbstractSystem)
         assign = matching(graph, varwhitelist) # not assigned
         # Just use `error_reporting` to do conditional
         iseqs = n_highest_vars < neqs
-
         if iseqs
-            bad_idxs = findall(isequal(UNASSIGNED), assign)
-        else
             inv_assign = inverse_mapping(assign) # extra equations
-            bad_idxs = findall(iszero, inv_assign)
+            bad_idxs = findall(iszero, @view inv_assign[1:nsrcs(graph)])
+        else
+            bad_idxs = findall(isequal(UNASSIGNED), assign)
         end
         error_reporting(sys, bad_idxs, n_highest_vars, iseqs)
     end

test/error_handling.jl

@@ -1,12 +1,8 @@
 using Test
-using ModelingToolkit#, OrdinaryDiffEq
+using ModelingToolkit
 import ModelingToolkit: ExtraVariablesSystemException, ExtraEquationsSystemException
 
-@parameters t
-function Pin(;name)
-    @variables v(t) i(t)
-    ODESystem(Equation[], t, [v, i], [], name=name, defaults=[v=>1.0, i=>1.0])
-end
+include("../examples/electrical_components.jl")
 
 function UnderdefinedConstantVoltage(;name, V = 1.0)
     val = V
@@ -15,7 +11,8 @@ function UnderdefinedConstantVoltage(;name, V = 1.0)
     @parameters V
     eqs = [
            V ~ p.v - n.v
-           #0 ~ p.i + n.i
+           # Remove equation
+           # 0 ~ p.i + n.i
           ]
     ODESystem(eqs, t, [], [V], systems=[p, n], defaults=Dict(V => val), name=name)
 end
@@ -28,53 +25,13 @@ function OverdefinedConstantVoltage(;name, V = 1.0, I = 1.0)
     @parameters V I
     eqs = [
            V ~ p.v - n.v
+           # Overdefine p.i and n.i
            n.i ~ I
            p.i ~ I
           ]
     ODESystem(eqs, t, [], [V], systems=[p, n], defaults=Dict(V => val, I => val2), name=name)
 end
 
-function Resistor(;name, R = 1.0)
-    val = R
-    @named p = Pin()
-    @named n = Pin()
-    @variables v(t)
-    @parameters R
-    eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           v ~ p.i * R
-          ]
-    ODESystem(eqs, t, [v], [R], systems=[p, n], defaults=Dict(R => val), name=name)
-end
-
-function Capacitor(;name, C = 1.0)
-    val = C
-    @named p = Pin()
-    @named n = Pin()
-    @variables v(t)
-    @parameters C
-    D = Differential(t)
-    eqs = [
-           v ~ p.v - n.v
-           0 ~ p.i + n.i
-           D(v) ~ p.i / C
-          ]
-    ODESystem(eqs, t, [v], [C], systems=[p, n], defaults=Dict(C => val), name=name)
-end
-
-function ModelingToolkit.connect(ps...)
-    eqs = [
-           0 ~ sum(p->p.i, ps) # KCL
-          ]
-    # KVL
-    for i in 1:length(ps)-1
-        push!(eqs, ps[i].v ~ ps[i+1].v)
-    end
-
-    return eqs
-end
-
 R = 1.0
 C = 1.0
 V = 1.0
@@ -89,8 +46,6 @@ rc_eqs = [
          ]
 
 @named rc_model = ODESystem(rc_eqs, t, systems=[resistor, capacitor, source])
-
-
 @test_throws ModelingToolkit.ExtraVariablesSystemException structural_simplify(rc_model)
 
 

test/reduction.jl

@@ -233,7 +233,7 @@ eqs = [
       ]
 
 @named sys = ODESystem(eqs, t, [E, C, S, P], [k₁, k₂, k₋₁, E₀])
-@test_throws ModelingToolkit.InvalidSystemException structural_simplify(sys)
+@test_throws ModelingToolkit.ExtraEquationsSystemException structural_simplify(sys)
 
 # Example 5 from Pantelides' original paper
 @parameters t