Merge remote-tracking branch 'origin/main' into gd/structured3

Author: gdalle

Project.toml

@@ -1,7 +1,7 @@
 name = "SparseMatrixColorings"
 uuid = "0a514795-09f3-496d-8182-132a7b665d35"
 authors = ["Guillaume Dalle", "Alexis Montoison"]
-version = "0.4.4"
+version = "0.4.6"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -31,6 +31,7 @@ Compat = "3.46,4.2"
 DataStructures = "0.18"
 DocStringExtensions = "0.8,0.9"
 LinearAlgebra = "<0.0.1, 1"
+DocStringExtensions = "0.8,0.9"
 Random = "<0.0.1, 1"
 Requires = "1.3.0"
 SparseArrays = "<0.0.1, 1"

src/SparseMatrixColorings.jl

@@ -52,6 +52,7 @@ include("result.jl")
 include("matrices.jl")
 include("interface.jl")
 include("constant.jl")
+include("adtypes.jl")
 include("decompression.jl")
 include("structured.jl")
 include("check.jl")

src/adtypes.jl

@@ -0,0 +1,21 @@
+function coloring(
+    A::AbstractMatrix,
+    ::ColoringProblem{:nonsymmetric,:column},
+    algo::ADTypes.NoColoringAlgorithm;
+    kwargs...,
+)
+    bg = BipartiteGraph(A)
+    color = convert(Vector{Int}, ADTypes.column_coloring(A, algo))
+    return ColumnColoringResult(A, bg, color)
+end
+
+function coloring(
+    A::AbstractMatrix,
+    ::ColoringProblem{:nonsymmetric,:row},
+    algo::ADTypes.NoColoringAlgorithm;
+    kwargs...,
+)
+    bg = BipartiteGraph(A)
+    color = convert(Vector{Int}, ADTypes.row_coloring(A, algo))
+    return RowColoringResult(A, bg, color)
+end

src/coloring.jl

@@ -240,7 +240,7 @@ function symmetric_coefficient(
     if h == j
         # i is the spoke
         return i, color[h]
-    elseif h == i
+    else
         # j is the spoke
         return j, color[h]
     end

test/adtypes.jl

@@ -0,0 +1,26 @@
+using ADTypes: ADTypes
+using SparseArrays
+using SparseMatrixColorings
+using Test
+
+@testset "Column coloring" begin
+    problem = ColoringProblem(; structure=:nonsymmetric, partition=:column)
+    algo = ADTypes.NoColoringAlgorithm()
+    A = sprand(10, 20, 0.1)
+    result = coloring(A, problem, algo)
+    B = compress(A, result)
+    @test size(B) == size(A)
+    @test column_colors(result) == ADTypes.column_coloring(A, algo)
+    @test decompress(B, result) == A
+end
+
+@testset "Row coloring" begin
+    problem = ColoringProblem(; structure=:nonsymmetric, partition=:row)
+    algo = ADTypes.NoColoringAlgorithm()
+    A = sprand(10, 20, 0.1)
+    result = coloring(A, problem, algo)
+    B = compress(A, result)
+    @test size(B) == size(A)
+    @test row_colors(result) == ADTypes.row_coloring(A, algo)
+    @test decompress(B, result) == A
+end

test/runtests.jl

@@ -45,6 +45,9 @@ include("utils.jl")
         @testset "Constant coloring" begin
             include("constant.jl")
         end
+        @testset "ADTypes coloring algorithms" begin
+            include("adtypes.jl")
+        end
     end
     @testset verbose = true "Correctness" begin
         @testset "Small instances" begin