Remove the field bicoloring in AdjacencyGraph

Author: amontoison

src/graph.jl

@@ -227,7 +227,6 @@ The adjacency graph of a symmetric matrix `A ∈ ℝ^{n × n}` is `G(A) = (V, E)
 struct AdjacencyGraph{T<:Integer,has_diagonal}
     S::SparsityPatternCSC{T}
     edge_to_index::Vector{T}
-    bicoloring::Bool
     original_size::Tuple{Int,Int}
 end
 
@@ -237,18 +236,17 @@ function AdjacencyGraph(
     S::SparsityPatternCSC{T},
     edge_to_index::Vector{T}=build_edge_to_index(S);
     has_diagonal::Bool=true,
-    bicoloring::Bool=false,
     original_size::Tuple{Int,Int}=size(S),
 ) where {T}
-    return AdjacencyGraph{T,has_diagonal}(S, edge_to_index, bicoloring, original_size)
+    return AdjacencyGraph{T,has_diagonal}(S, edge_to_index, original_size)
 end
 
-function AdjacencyGraph(A::SparseMatrixCSC; has_diagonal::Bool=true, bicoloring::Bool=false, original_size::Tuple{Int,Int}=size(A))
-    return AdjacencyGraph(SparsityPatternCSC(A); has_diagonal, bicoloring, original_size)
+function AdjacencyGraph(A::SparseMatrixCSC; has_diagonal::Bool=true, original_size::Tuple{Int,Int}=size(A))
+    return AdjacencyGraph(SparsityPatternCSC(A); has_diagonal, original_size)
 end
 
-function AdjacencyGraph(A::AbstractMatrix; has_diagonal::Bool=true, bicoloring::Bool=false, original_size::Tuple{Int,Int}=size(A))
-    return AdjacencyGraph(SparseMatrixCSC(A); has_diagonal, bicoloring, original_size)
+function AdjacencyGraph(A::AbstractMatrix; has_diagonal::Bool=true, original_size::Tuple{Int,Int}=size(A))
+    return AdjacencyGraph(SparseMatrixCSC(A); has_diagonal, original_size)
 end
 
 pattern(g::AdjacencyGraph) = g.S

src/postprocessing.jl

@@ -19,9 +19,15 @@ function postprocess!(
                 color_used[color[i]] = true
             end
         end
-    end
 
-    if g.bicoloring
+        if star_or_tree_set isa StarSet
+            # star_or_tree_set is a StarSet
+            postprocess_star_coloring!(g, color_used, color, star_or_tree_set)
+        else
+            # star_or_tree_set is a TreeSet
+            postprocess_acyclic_coloring!(color_used, color, star_or_tree_set)
+        end
+    else
         row_color_used = zeros(Bool, nb_colors)
         column_color_used = color_used
 
@@ -36,14 +42,6 @@ function postprocess!(
         # Identify colors that are used in either the row or column partition
         # color_used = row_color_used .| column_color_used
         color_used .|= row_color_used
-    else
-        if star_or_tree_set isa StarSet
-            # star_or_tree_set is a StarSet
-            postprocess_star_coloring!(g, color_used, color, star_or_tree_set)
-        else
-            # star_or_tree_set is a TreeSet
-            postprocess_acyclic_coloring!(color_used, color, star_or_tree_set)
-        end
     end
 
     # if at least one of the colors is useless, modify the color assignments of vertices
@@ -164,7 +162,6 @@ function postprocess_star_coloring!(
     return color_used
 end
 
-
 function postprocess_star_bicoloring!(
     g::AdjacencyGraph,
     row_color_used::Vector{Bool},