Add triangle to bidirectional visualization

docs/src/vis.md

@@ -74,7 +74,7 @@ problem_bi = ColoringProblem(; structure=:nonsymmetric, partition=:bidirectional
 algo_bi = GreedyColoringAlgorithm(RandomOrder(StableRNG(0)); postprocessing=true, decompression=:direct)
 result_bi = coloring(S, problem_bi, algo_bi)
 
-Ar_img, Ac_img, Br_img, Bc_img = show_colors(
+Arc_img, Ar_img, Ac_img, Br_img, Bc_img = show_colors(
     result_bi;
     colorscheme=ColorSchemes.progress,
     background_color=RGB(1, 1, 1),  # white
@@ -94,6 +94,12 @@ Ar_img
 Ac_img
 ```
 
+Together, this yields:
+
+```@example img
+Arc_img
+```
+
 And there are two associated compression results, one by row and one by column:
 
 ```@example img

ext/SparseMatrixColoringsColorsExt.jl

@@ -142,6 +142,7 @@ function allocate_outputs(
     hA, wA = size(A) .* (scale + 2border + pad) .+ (pad)
     hBr, wBr = size(Br) .* (scale + 2border + pad) .+ (pad)
     hBc, wBc = size(Bc) .* (scale + 2border + pad) .+ (pad)
+    Arc_img = fill(background_color, hA, wA)
     Ar_img = fill(background_color, hA, wA)
     Ac_img = fill(background_color, hA, wA)
     Br_img = fill(background_color, hBr, wBr)
@@ -150,8 +151,10 @@ function allocate_outputs(
         if !iszero(A[I])
             area = matrix_entry_area(I, scale, border, pad)
             barea = matrix_entry_plus_border_area(I, scale, border, pad)
+            Arc_img[barea] .= border_color
             Ar_img[barea] .= border_color
             Ac_img[barea] .= border_color
+            Arc_img[area] .= background_color
             Ar_img[area] .= background_color
             Ac_img[area] .= background_color
         end
@@ -172,7 +175,7 @@ function allocate_outputs(
             Bc_img[area] .= background_color
         end
     end
-    return Ar_img, Ac_img, Br_img, Bc_img
+    return Arc_img, Ar_img, Ac_img, Br_img, Bc_img
 end
 
 ## Implementations for different AbstractColoringResult types start here
@@ -247,7 +250,11 @@ function show_colors!(
     return A_img, B_img
 end
 
+mytriu(area) = [area[i, j] for i in axes(area, 1) for j in axes(area, 2) if i < j]
+mytril(area) = [area[i, j] for i in axes(area, 1) for j in axes(area, 2) if i > j]
+
 function show_colors!(
+    Arc_img::AbstractMatrix{<:Colorant},
     Ar_img::AbstractMatrix{<:Colorant},
     Ac_img::AbstractMatrix{<:Colorant},
     Br_img::AbstractMatrix{<:Colorant},
@@ -278,9 +285,11 @@ function show_colors!(
             r, c = Tuple(I)
             area = matrix_entry_area(I, scale, border, pad)
             if column_colors(res)[c] > 0
+                Arc_img[mytriu(area)] .= A_ccolors[c]
                 Ac_img[area] .= A_ccolors[c]
             end
             if row_colors(res)[r] > 0
+                Arc_img[mytril(area)] .= A_rcolors[r]
                 Ar_img[area] .= A_rcolors[r]
             end
         end
@@ -299,7 +308,7 @@ function show_colors!(
             Bc_img[area] .= B_ccolors[c]
         end
     end
-    return Ar_img, Ac_img, Br_img, Bc_img
+    return Arc_img, Ar_img, Ac_img, Br_img, Bc_img
 end
 
 end # module

test/show_colors.jl

@@ -52,11 +52,13 @@ algo = GreedyColoringAlgorithm(; decompression=:direct)
         Br, Bc = compress(A, result)
 
         scale = 3
-        Ar_img, Ac_img, Br_img, Bc_img = show_colors(result; scale=scale)
+        Arc_img, Ar_img, Ac_img, Br_img, Bc_img = show_colors(result; scale=scale)
+        @test size(Arc_img) == size(A) .* scale
         @test size(Ar_img) == size(A) .* scale
         @test size(Ac_img) == size(A) .* scale
         @test size(Br_img) == size(Br) .* scale
         @test size(Bc_img) == size(Bc) .* scale
+        @test Arc_img isa Matrix{<:Colorant}
         @test Ar_img isa Matrix{<:Colorant}
         @test Ac_img isa Matrix{<:Colorant}
         @test Br_img isa Matrix{<:Colorant}