Format and clean up

Author: YingboMa

src/structural_transformation/partial_state_selection.jl

@@ -148,7 +148,6 @@ function partial_state_selection_graph!(structure::SystemStructure, var_eq_match
 end
 
 function dummy_derivative_graph!(state::TransformationState, jac = nothing; kwargs...)
-    Main._state[] = state
     state.structure.solvable_graph === nothing && find_solvables!(state; kwargs...)
     var_eq_matching = complete(pantelides!(state))
     complete!(state.structure)
@@ -192,7 +191,6 @@ function dummy_derivative_graph!(structure::SystemStructure, var_eq_matching, ja
         iszero(maxlevel) && continue
 
         rank_matching = Matching(nvars)
-        isfirst = true
         for _ in maxlevel:-1:1
             eqs = filter(eq -> diff_to_eq[eq] !== nothing, eqs)
             nrows = length(eqs)
@@ -207,10 +205,6 @@ function dummy_derivative_graph!(structure::SystemStructure, var_eq_matching, ja
             # state selection.)
             #
             # 3. If the Jacobian is a polynomial matrix, use Gröbner basis (?)
-            if isfirst
-                vars = sort(vars, by=i->occursin("A", string(Main._state[].fullvars[i])))
-            end
-            isfirst = false
             if jac !== nothing && (_J = jac(eqs, vars); all(x -> unwrap(x) isa Integer, _J))
                 J = Int.(unwrap.(_J))
                 N = ModelingToolkit.nullspace(J; col_order) # modifies col_order
@@ -235,7 +229,6 @@ function dummy_derivative_graph!(structure::SystemStructure, var_eq_matching, ja
             if rank != nrows
                 @warn "The DAE system is structurally singular!"
             end
-            @info Main._state[].fullvars[vars]
 
             # prepare the next iteration
             eqs = map(eq -> diff_to_eq[eq], eqs)

src/systems/alias_elimination.jl

@@ -243,7 +243,8 @@ function Base.setindex!(ag::AliasGraph, v::Integer, i::Integer)
     return 0 => 0
 end
 
-function Base.setindex!(ag::AliasGraph, p::Union{Pair{Int, Int}, Tuple{Int, Int}}, i::Integer)
+function Base.setindex!(ag::AliasGraph, p::Union{Pair{Int, Int}, Tuple{Int, Int}},
+                        i::Integer)
     (c, v) = p
     if c == 0 || v == 0
         ag[i] = 0
@@ -323,7 +324,9 @@ struct DiffLevelState <: Traversals.AbstractTraversalState
     visited::BitSet
 end
 
-DiffLevelState(g::SimpleDiGraph, var_to_diff) = DiffLevelState(fill(typemax(Int), nv(g)), var_to_diff, BitSet())
+function DiffLevelState(g::SimpleDiGraph, var_to_diff)
+    DiffLevelState(fill(typemax(Int), nv(g)), var_to_diff, BitSet())
+end
 
 @inline function Traversals.initfn!(s::DiffLevelState, u)
     push!(s.visited, u)
@@ -601,7 +604,7 @@ function alias_eliminate_graph!(graph, var_to_diff, mm_orig::SparseMatrixCLIL)
             end
             if r === nothing
                 isempty(reach₌) && break
-                idx = findfirst(x->x[1] == 1, reach₌)
+                idx = findfirst(x -> x[1] == 1, reach₌)
                 if idx === nothing
                     c, dr = reach₌[1]
                     @assert c == -1
@@ -640,9 +643,9 @@ function alias_eliminate_graph!(graph, var_to_diff, mm_orig::SparseMatrixCLIL)
         # edges.
         weighted_transitiveclosure!(eqg)
         # Canonicalize by preferring the lower differentiated variable
-        for i in 1:length(stem) - 1
+        for i in 1:(length(stem) - 1)
             r = stem[i]
-            for dr in @view stem[i+1:end]
+            for dr in @view stem[(i + 1):end]
                 if has_edge(eqg, r, dr)
                     c = get_weight(eqg, r, dr)
                     dag[dr] = c => r