Format and some clean up

Author: YingboMa

src/structural_transformation/symbolics_tearing.jl

@@ -217,7 +217,8 @@ function check_diff_graph(var_to_diff, fullvars)
 end
 =#
 
-function tearing_reassemble(state::TearingState, var_eq_matching, ag = nothing; simplify = false)
+function tearing_reassemble(state::TearingState, var_eq_matching, ag = nothing;
+                            simplify = false)
     @unpack fullvars, sys, structure = state
     @unpack solvable_graph, var_to_diff, eq_to_diff, graph = structure
 
@@ -555,9 +556,11 @@ function tearing_reassemble(state::TearingState, var_eq_matching, ag = nothing;
     if length(diff_vars_set) != length(diff_vars)
         error("Tearing internal error: lowering DAE into semi-implicit ODE failed!")
     end
+    solved_variables_set = BitSet(solved_variables)
+    ag === nothing || union!(solved_variables_set, keys(ag))
     invvarsperm = [diff_vars;
                    setdiff!(setdiff(1:ndsts(graph), diff_vars_set),
-                            union!(BitSet(solved_variables), keys(ag)))]
+                            solved_variables_set)]
     varsperm = zeros(Int, ndsts(graph))
     for (i, v) in enumerate(invvarsperm)
         varsperm[v] = i
@@ -689,7 +692,8 @@ end
 Perform index reduction and use the dummy derivative technique to ensure that
 the system is balanced.
 """
-function dummy_derivative(sys, state = TearingState(sys), ag = nothing; simplify = false, kwargs...)
+function dummy_derivative(sys, state = TearingState(sys), ag = nothing; simplify = false,
+                          kwargs...)
     jac = let state = state
         (eqs, vars) -> begin
             symeqs = EquationsView(state)[eqs]
@@ -711,6 +715,7 @@ function dummy_derivative(sys, state = TearingState(sys), ag = nothing; simplify
             p
         end
     end
-    var_eq_matching = dummy_derivative_graph!(state, jac, (ag, nothing); state_priority, kwargs...)
+    var_eq_matching = dummy_derivative_graph!(state, jac, (ag, nothing); state_priority,
+                                              kwargs...)
     tearing_reassemble(state, var_eq_matching, ag; simplify = simplify)
 end

src/structural_transformation/utils.jl

@@ -46,13 +46,9 @@ end
 function check_consistency(state::TearingState, ag = nothing)
     fullvars = state.fullvars
     @unpack graph, var_to_diff = state.structure
-    if ag === nothing
-        n_highest_vars = count(v -> length(outneighbors(var_to_diff, v)) == 0,
-                            vertices(var_to_diff))
-    else
-        n_highest_vars = count(v -> length(outneighbors(var_to_diff, v)) == 0 && !haskey(ag, v),
-                            vertices(var_to_diff))
-    end
+    n_highest_vars = count(v -> length(outneighbors(var_to_diff, v)) == 0 &&
+                               (ag === nothing || !haskey(ag, v)),
+                           vertices(var_to_diff))
     neqs = nsrcs(graph)
     is_balanced = n_highest_vars == neqs
 
@@ -74,11 +70,12 @@ function check_consistency(state::TearingState, ag = nothing)
     # details, check the equation (15) of the original paper.
     extended_graph = (@set graph.fadjlist = Vector{Int}[graph.fadjlist;
                                                         map(collect, edges(var_to_diff))])
-    extended_var_eq_matching = maximal_matching(extended_graph, eq->true, v->ag !== nothing || !haskey(ag, v))
+    extended_var_eq_matching = maximal_matching(extended_graph, eq -> true,
+                                                v -> ag === nothing || !haskey(ag, v))
 
     unassigned_var = []
     for (vj, eq) in enumerate(extended_var_eq_matching)
-        if eq === unassigned && !haskey(ag, vj)
+        if eq === unassigned && (ag === nothing || !haskey(ag, vj))
             push!(unassigned_var, fullvars[vj])
         end
     end

src/systems/alias_elimination.jl

@@ -53,7 +53,7 @@ function alias_elimination!(state::TearingState)
     complete!(state.structure)
     graph_orig = copy(state.structure.graph)
     ag, mm, complete_ag, complete_mm, updated_diff_vars = alias_eliminate_graph!(state)
-    isempty(ag) && return sys
+    isempty(ag) && return sys, ag
 
     fullvars = state.fullvars
     @unpack var_to_diff, graph, solvable_graph = state.structure
@@ -180,7 +180,6 @@ function alias_elimination!(state::TearingState)
     state.structure.graph = new_graph
     state.structure.solvable_graph = new_solvable_graph
     state.structure.eq_to_diff = new_eq_to_diff
-    @show length(new_eq_to_diff), nsrcs(new_graph), nsrcs(new_solvable_graph), length(eqs)
 
     #=
     new_graph = BipartiteGraph(n_new_eqs, n_new_vars)