more fixes

Author: amontoison

docs/src/dev.md

@@ -26,8 +26,8 @@ SparseMatrixColorings.partial_distance2_coloring
 SparseMatrixColorings.star_coloring
 SparseMatrixColorings.acyclic_coloring
 SparseMatrixColorings.group_by_color
-SparseMatrixColorings.Forest
 SparseMatrixColorings.remap_colors
+SparseMatrixColorings.Forest
 SparseMatrixColorings.StarSet
 SparseMatrixColorings.TreeSet
 ```

src/decompression.jl

@@ -520,6 +520,7 @@ function decompress!(
     (; ag, color, reverse_bfs_orders, tree_edge_indices, nt, buffer) = result
     (; S) = ag
     uplo == :F && check_same_pattern(A, S)
+    R = eltype(A)
     fill!(A, zero(R))
 
     if eltype(buffer) == R

src/interface.jl

@@ -305,7 +305,9 @@ function _coloring(
     if speed_setting isa WithResult
         return StarSetBicoloringResult(A, ag, symmetric_color, star_set)
     else
-        row_color, column_color, _ = remap_colors(eltype(ag), color, maximum(color), size(A)...)
+        row_color, column_color, _ = remap_colors(
+            eltype(ag), color, maximum(color), size(A)...
+        )
         return row_color, column_color
     end
 end
@@ -324,7 +326,9 @@ function _coloring(
     if speed_setting isa WithResult
         return TreeSetBicoloringResult(A, ag, symmetric_color, tree_set, R)
     else
-        row_color, column_color, _ = remap_colors(eltype(ag), color, maximum(color), size(A)...)
+        row_color, column_color, _ = remap_colors(
+            eltype(ag), color, maximum(color), size(A)...
+        )
         return row_color, column_color
     end
 end

src/result.jl

@@ -581,14 +581,20 @@ $TYPEDFIELDS
 
 - [`AbstractColoringResult`](@ref)
 """
-struct StarSetBicoloringResult{M<:AbstractMatrix,G<:AdjacencyGraph,V} <:
-       AbstractColoringResult{:nonsymmetric,:bidirectional,:direct}
+struct StarSetBicoloringResult{
+    M<:AbstractMatrix,
+    T<:Integer,
+    G<:AdjacencyGraph{T},
+    GT<:AbstractGroups{T},
+    SR<:AbstractColoringResult{:symmetric,:column,:direct},
+    R,
+} <: AbstractColoringResult{:nonsymmetric,:bidirectional,:direct}
     "matrix that was colored"
     A::M
     "augmented adjacency graph that was used for bicoloring"
-    ag::G
+    abg::G
     "one integer color for each axis of the augmented matrix"
-    symmetric_color::Vector{Int}
+    color::Vector{T}
     "one integer color for each column"
     column_color::Vector{T}
     "one integer color for each row"
@@ -618,12 +624,15 @@ row_colors(result::BicoloringResult) = result.row_color
 row_groups(result::BicoloringResult) = result.row_group
 
 function StarSetBicoloringResult(
-    A::AbstractMatrix, ag::AdjacencyGraph, symmetric_color::Vector{Int}, star_set::StarSet
-)
+    A::AbstractMatrix,
+    ag::AdjacencyGraph{T},
+    color::Vector{<:Integer},
+    star_set::StarSet{<:Integer},
+) where T
     m, n = size(A)
-    num_sym_colors = maximum(symmetric_color)
+    num_sym_colors = maximum(color)
     row_color, column_color, symmetric_to_row, symmetric_to_column = remap_colors(
-        T, symmetric_color, num_sym_colors, m, n
+        T, color, num_sym_colors, m, n
     )
     column_group = group_by_color(column_color)
     row_group = group_by_color(row_color)
@@ -639,7 +648,7 @@ function StarSetBicoloringResult(
     for j in 1:n
         for k in nzrange(S, j)
             i = rv[k]
-            l, c = symmetric_coefficient(i, j, symmetric_color, star_set)
+            l, c = symmetric_coefficient(i, j, color, star_set)
             if l ≤ n
                 # A[i, j] = Br[symmetric_to_row[c], l]
                 pos_Br += 1
@@ -657,7 +666,7 @@ function StarSetBicoloringResult(
     return StarSetBicoloringResult(
         A,
         ag,
-        symmetric_color,
+        color,
         column_color,
         row_color,
         column_group,
@@ -684,55 +693,61 @@ $TYPEDFIELDS
 
 - [`AbstractColoringResult`](@ref)
 """
-struct TreeSetBicoloringResult{M<:AbstractMatrix,G<:AdjacencyGraph,V,R} <:
-       AbstractColoringResult{:nonsymmetric,:bidirectional,:substitution}
+struct TreeSetBicoloringResult{
+    M<:AbstractMatrix,
+    T<:Integer,
+    G<:AdjacencyGraph{T},
+    GT<:AbstractGroups{T},
+    SR<:AbstractColoringResult{:symmetric,:column,:substitution},
+    R,
+} <: AbstractColoringResult{:nonsymmetric,:bidirectional,:substitution}
     "matrix that was colored"
     A::M
     "augmented adjacency graph that was used for bicoloring"
-    ag::G
+    abg::G
     "one integer color for each axis of the augmented matrix"
-    symmetric_color::Vector{Int}
+    color::Vector{T}
     "one integer color for each column"
-    column_color::Vector{Int}
+    column_color::Vector{T}
     "one integer color for each row"
-    row_color::Vector{Int}
+    row_color::Vector{T}
     "color groups for columns"
-    column_group::V
+    column_group::GT
     "color groups for rows"
-    row_group::V
+    row_group::GT
     "maps symmetric colors to column colors"
-    symmetric_to_column::Vector{Int}
+    symmetric_to_column::Vector{T}
     "maps symmetric colors to row colors"
-    symmetric_to_row::Vector{Int}
+    symmetric_to_row::Vector{T}
     "indices of the nonzeros in A that can recovered with Br and Bc"
-    A_indices::Vector{Int}
+    A_indices::Vector{T}
     "reverse BFS orders of the trees"
-    reverse_bfs_orders::Vector{Vector{Tuple{Int,Int}}}
+    reverse_bfs_orders::Vector{Tuple{T,T}}
     "buffer needed during acyclic decompression"
     buffer::Vector{R}
 end
 
 function TreeSetBicoloringResult(
     A::AbstractMatrix,
-    ag::AdjacencyGraph,
-    symmetric_color::Vector{Int},
-    tree_set::TreeSet,
+    ag::AdjacencyGraph{T},
+    color::Vector{<:Integer},
+    tree_set::TreeSet{<:Integer},
     decompression_eltype::Type{R},
-) where {R<:Real}
+) where {T,R}
     (; reverse_bfs_orders) = tree_set
 
     m, n = size(A)
-    num_sym_colors = maximum(symmetric_color)
+    num_sym_colors = maximum(color)
     row_color, column_color, symmetric_to_row, symmetric_to_column = remap_colors(
-        symmetric_color, num_sym_colors, m, n
+        T, color, num_sym_colors, m, n
     )
     column_group = group_by_color(column_color)
     row_group = group_by_color(row_color)
 
     S = ag.S
     rv = rowvals(S)
     nnzA = nnz(S) ÷ 2
-    A_indices = Vector{Int}(undef, nnzA)
+    A_indices = Vector{T}(undef, nnzA)
 
     index = 0
     for k in eachindex(reverse_bfs_orders)
@@ -765,7 +780,7 @@ function TreeSetBicoloringResult(
     return TreeSetBicoloringResult(
         A,
         ag,
-        symmetric_color,
+        color,
         column_color,
         row_color,
         column_group,