add tests

Author: samuelsonric

test/core.jl

@@ -1,8 +1,8 @@
 using AbstractTrees
-using Base: oneto
+using Base: @kwdef, oneto
 using Base.Order
 using CliqueTrees
-using CliqueTrees: DoublyLinkedList, sympermute, cliquetree!
+using CliqueTrees: DoublyLinkedList, EliminationAlgorithm, sympermute, cliquetree!
 using Graphs
 using Graphs: SimpleEdge
 using JET
@@ -35,6 +35,26 @@ const TYPES = (
     (Catlab.SymmetricGraph, Int, Int),
 )
 
+@kwdef struct SafeFlowCutter <: EliminationAlgorithm
+    time::Int = 5
+    seed::Int = 0
+end
+
+function CliqueTrees.permutation(graph, alg::SafeFlowCutter)
+    time = alg.time
+    seed = alg.seed
+
+    for i in 1:4
+        try
+            return permutation(graph, FlowCutter(; time, seed))
+        catch
+            @warn "FlowCutter failed (attempt $i)."
+        end
+    end
+
+    return permutation(graph, FlowCutter(; time, seed))
+end
+
 @testset "errors" begin
     matrix = [
         0 1 1 0 0 0 0 0
@@ -54,10 +74,10 @@ const TYPES = (
     @test_throws ArgumentError permutation(matrix; alg = BT())
 end
 
-using AMD: AMD as AMDJL
-using Laplacians: Laplacians
-using Metis: Metis
-using TreeWidthSolver: TreeWidthSolver
+import AMD as AMDLib
+import Laplacians
+import Metis
+import TreeWidthSolver
 
 @testset "trees" begin
     @testset "interface" begin
@@ -421,16 +441,16 @@ end
             ND{1}(; limit = 5),
             ND{2}(; limit = 5),
             Spectral(),
-            FlowCutter(; time=1),
+            SafeFlowCutter(; time=1),
             BT(),
             SAT{CryptoMiniSat_jll}(),
             MinimalChordal(),
             CompositeRotations([1, 2, 3]),
             SafeRules(),
             SafeSeparators(),
             ConnectedComponents(),
-            BestWidth(MMD(), MF()),
-            BestFill(MMD(), MF()),
+            BestWidth(MCS(), MF()),
+            BestFill(MCS(), MF()),
         )
         @test isa(repr("text/plain", alg), String)
     end
@@ -492,14 +512,14 @@ end
             MMD(),
             # METIS(),
             # Spectral(),
-            FlowCutter(; time=1),
+            SafeFlowCutter(; time=1),
             BT(),
             MinimalChordal(),
             CompositeRotations([]),
             SafeRules(),
             SafeSeparators(),
             ConnectedComponents(),
-            BestWidth(MMD(), MF()),
+            BestWidth(MCS(), MF()),
         )
         @test permutation(graph; alg) == ([], [])
     end
@@ -540,14 +560,14 @@ end
             ND{1}(; limit = 5),
             ND{2}(; limit = 5),
             # Spectral,
-            FlowCutter(; time=1),
+            SafeFlowCutter(; time=1),
             BT(),
             CompositeRotations([1]),
             SafeRules(),
             SafeSeparators(),
             ConnectedComponents(),
-            BestWidth(MMD(), MF()),
-            BestFill(MMD(), MF()),
+            BestWidth(MCS(), MF()),
+            BestFill(MCS(), MF()),
         )
         @test permutation(graph; alg) == ([1], [1])
     end
@@ -799,15 +819,15 @@ end
                         ND{1}(; limit = 5),
                         ND{2}(; limit = 5),
                         Spectral(),
-                        FlowCutter(; time=1),
+                        SafeFlowCutter(; time=1),
                         BT(),
                         MinimalChordal(),
                         CompositeRotations([1, 3]),
                         SafeRules(),
                         SafeSeparators(),
                         ConnectedComponents(),
-                        BestWidth(MMD(), MF()),
-                        BestFill(MMD(), MF()),
+                        BestWidth(MCS(), MF()),
+                        BestFill(MCS(), MF()),
                     )
                     order, index = permutation(graph; alg)
                     order, index = permutation(ones(17), graph; alg)
@@ -1055,15 +1075,16 @@ end
     end
 end
 
-@testset "greedy" begin
+@testset "fill" begin
     ssmc = ssmc_db()
 
-    greedy = (
+    algs = (
         MMD(),
         MMD(; delta=5),
         AMF(; speed=1),
         AMF(; speed=2),
         AMF(; speed=3),
+        ND{2}(),
         MF(),
     )
 
@@ -1076,7 +1097,7 @@ end
     for (name, fill) in matrices
         matrix = mmread(joinpath(fetch_ssmc(ssmc[ssmc.name .== name, :]; format="MM")[1], "$(name).mtx"))
 
-        for alg in greedy
+        for alg in algs
             @test treefill(matrix; alg) <= fill
         end
     end
@@ -1087,7 +1108,32 @@ end
 end
 
 @testset "exact treewidth" begin
-    __graph1 = BipartiteGraph(
+    lalgs = (
+        MMW{1}(),
+        MMW{2}(),
+        MMW{3}(),
+    )
+
+    ualgs = (
+        SAT{libpicosat_jll}(),
+        SAT{Lingeling_jll}(),
+        SAT{PicoSAT_jll}(),
+        SAT{CryptoMiniSat_jll}(),
+        SafeRules(SAT{CryptoMiniSat_jll}()),
+        SafeSeparators(SAT{CryptoMiniSat_jll}()),
+        SafeRules(SafeSeparators(BT())),
+        SafeSeparators(BT()),
+    )
+
+    walgs = (
+        SafeRules(SafeSeparators(BT())),
+        SafeSeparators(BT()),
+    )
+
+    weights1 = log2.([2, 2, 4, 2, 4, 2, 2, 2, 2, 2, 4, 2, 4, 2, 4, 2])
+    weights2 = log2.([4, 3, 4, 3, 4, 4, 3, 4, 4, 3, 4, 3, 4, 4, 3, 4, 4, 3, 4, 3, 4, 4, 3, 4, 4, 3, 4, 3, 4, 4, 3, 4])
+
+    graph1 = BipartiteGraph(
         [
             0 1 0 1 0 1 1 0 0 0 0 0 0 0 0 0
             1 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0
@@ -1108,7 +1154,7 @@ end
         ]
     )
 
-    __graph2 = BipartiteGraph(
+    graph2 = BipartiteGraph(
         [
             0 1 1 0 1 1 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
             1 0 1 1 1 1 1 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1145,125 +1191,46 @@ end
         ]
     )
 
-    weights1 = log2.([2, 2, 4, 2, 4, 2, 2, 2, 2, 2, 4, 2, 4, 2, 4, 2])
-    weights2 = log2.([4, 3, 4, 3, 4, 4, 3, 4, 4, 3, 4, 3, 4, 4, 3, 4, 4, 3, 4, 3, 4, 4, 3, 4, 4, 3, 4, 3, 4, 4, 3, 4])
+    graphs = (
+        (weights1, graph1, 4, 0,  0,  5.0,                0,  0 ),
+        (weights2, graph2, 9, 21, 94, 19.169925001442312, 21, 94),
+    )
 
     for (G, V, E) in TYPES
         @testset "$(nameof(G))" begin
-            graph1 = G(__graph1)
-            graph2 = G(__graph2)
-
-            kernel1, rest1... = CliqueTrees.pr4(graph1, lowerbound(graph1))
-            @test nv(kernel1) === V(0)
-            @test ne(kernel1) === 0
-
-            kernel1, rest1... = CliqueTrees.pr4(weights1, graph1, lowerbound(weights1, graph1))
-            @test nv(kernel1) === V(0)
-            @test ne(kernel1) === 0
-
-            kernel2, rest2... = CliqueTrees.pr4(graph2, lowerbound(graph2))
-            @test nv(kernel2) === V(21)
-            @test ne(kernel2) === 94
-
-            kernel2, rest2... = CliqueTrees.pr4(weights2, graph2, lowerbound(weights2, graph2))
-            @test nv(kernel2) === V(21)
-            @test ne(kernel2) === 94
-
-            width1 = V(4)
-            lb11 = lowerbound(graph1, MMW{1}())
-            lb12 = lowerbound(graph1, MMW{2}())
-            lb13 = lowerbound(graph1, MMW{3}())
-            ub1 = treewidth(graph1)
-
-            @test isa(lb11, V)
-            @test isa(lb12, V)
-            @test isa(lb13, V)
-            @test isa(ub1, V)
-            @test lb11 <= width1
-            @test lb12 <= width1
-            @test lb13 <= width1
-            @test width1 <= ub1
-            #@test treewidth(graph1; alg=ConnectedComponents(BT())) === width1
-            @test treewidth(graph1; alg = SAT{libpicosat_jll}()) === width1
-            @test treewidth(graph1; alg = SAT{Lingeling_jll}()) === width1
-            @test treewidth(graph1; alg = SAT{PicoSAT_jll}()) === width1
-            @test treewidth(graph1; alg = SAT{CryptoMiniSat_jll}()) === width1
-            #@test treewidth(graph1; alg=SafeRules(ConnectedComponents(BT()))) === width1
-            @test treewidth(graph1; alg = SafeRules(SAT{libpicosat_jll}())) === width1
-            @test treewidth(graph1; alg = SafeRules(SAT{Lingeling_jll}())) === width1
-            @test treewidth(graph1; alg = SafeRules(SAT{PicoSAT_jll}())) === width1
-            @test treewidth(graph1; alg = SafeRules(SAT{CryptoMiniSat_jll}())) === width1
-            @test treewidth(graph1; alg = SafeSeparators(BT())) === width1
-            @test treewidth(graph1; alg = SafeSeparators(SAT{libpicosat_jll}())) === width1
-            @test treewidth(graph1; alg = SafeSeparators(SAT{Lingeling_jll}())) === width1
-            @test treewidth(graph1; alg = SafeSeparators(SAT{PicoSAT_jll}())) === width1
-            @test treewidth(graph1; alg = SafeSeparators(SAT{CryptoMiniSat_jll}())) === width1
-
-            width1 = 5.0
-            lb11 = lowerbound(weights1, graph1, MMW{1}())
-            lb12 = lowerbound(weights1, graph1, MMW{2}())
-            lb13 = lowerbound(weights1, graph1, MMW{3}())
-            ub1 = treewidth(weights1, graph1)
-
-            @test isa(lb11, Float64)
-            @test isa(lb12, Float64)
-            @test isa(lb13, Float64)
-            @test isa(ub1, Float64)
-            @test lb11 <= width1
-            @test lb12 <= width1
-            @test lb13 <= width1
-            @test width1 <= ub1
-            #@test treewidth(weights1, graph1; alg=ConnectedComponents(BT())) === width1
-            #@test treewidth(weights1, graph1; alg=SafeRules(ConnectedComponents(BT()))) === width1
-            @test treewidth(weights1, graph1; alg = SafeSeparators(BT())) === width1
-
-            width2 = V(9)
-            lb21 = lowerbound(graph2, MMW{1}())
-            lb22 = lowerbound(graph2, MMW{2}())
-            lb23 = lowerbound(graph2, MMW{3}())
-            ub2 = treewidth(graph2)
-
-            @test isa(lb21, V)
-            @test isa(lb22, V)
-            @test isa(lb23, V)
-            @test isa(ub2, V)
-            @test lb21 <= width2
-            @test lb22 <= width2
-            @test lb23 <= width2
-            @test width2 <= ub2
-            @test treewidth(graph2; alg = BT()) === width2
-            @test treewidth(graph2; alg = SAT{libpicosat_jll}()) === width2
-            @test treewidth(graph2; alg = SAT{Lingeling_jll}()) === width2
-            @test treewidth(graph2; alg = SAT{PicoSAT_jll}()) === width2
-            @test treewidth(graph2; alg = SAT{CryptoMiniSat_jll}()) === width2
-            @test treewidth(graph2; alg = SafeRules(BT())) === width2
-            @test treewidth(graph2; alg = SafeRules(SAT{libpicosat_jll}())) === width2
-            @test treewidth(graph2; alg = SafeRules(SAT{Lingeling_jll}())) === width2
-            @test treewidth(graph2; alg = SafeRules(SAT{PicoSAT_jll}())) === width2
-            @test treewidth(graph2; alg = SafeRules(SAT{CryptoMiniSat_jll}())) === width2
-            @test treewidth(graph2; alg = SafeSeparators(BT())) === width2
-            @test treewidth(graph2; alg = SafeSeparators(SAT{libpicosat_jll}())) === width2
-            @test treewidth(graph2; alg = SafeSeparators(SAT{Lingeling_jll}())) === width2
-            @test treewidth(graph2; alg = SafeSeparators(SAT{PicoSAT_jll}())) === width2
-            @test treewidth(graph2; alg = SafeSeparators(SAT{CryptoMiniSat_jll}())) === width2
-
-            width2 = 19.169925001442312
-            lb21 = lowerbound(weights2, graph2, MMW{1}())
-            lb22 = lowerbound(weights2, graph2, MMW{2}())
-            lb23 = lowerbound(weights2, graph2, MMW{3}())
-            ub2 = treewidth(weights2, graph2)
-
-            @test isa(lb21, Float64)
-            @test isa(lb22, Float64)
-            @test isa(lb23, Float64)
-            @test isa(ub2, Float64)
-            @test lb21 <= width2
-            @test lb22 <= width2
-            @test lb23 <= width2
-            @test width2 <= ub2
-            @test treewidth(weights2, graph2; alg = BT()) === width2
-            @test treewidth(weights2, graph2; alg = SafeRules(BT())) === width2
-            @test treewidth(weights2, graph2; alg = SafeSeparators(BT())) === width2
+            for (weights, graph, uwidth, un, um, wwidth, wn, wm) in graphs
+                graph = G(graph); uwidth = V(uwidth); un = V(un); wn = V(wn)
+            
+                ukernel, urest... = CliqueTrees.pr4(graph, lowerbound(graph))
+                wkernel, wrest... = CliqueTrees.pr4(weights, graph, lowerbound(weights, graph))
+                @test nv(ukernel) === un
+                @test nv(wkernel) === wn
+                @test ne(ukernel) === um
+                @test ne(wkernel) === wm
+
+                for alg in lalgs
+                    u = lowerbound(graph; alg)
+                    w = lowerbound(weights, graph; alg)
+                    @test isa(u, V)
+                    @test isa(w, Float64)
+                    @test u <= uwidth
+                    @test w <= wwidth
+                end
+               
+                for alg in ualgs
+                    order, tree = cliquetree(graph; alg)
+                    @test treewidth(graph; alg=order) == uwidth
+                    @test treewidth(tree) == uwidth
+                    @test treefill(graph; alg=order) == treefill(tree)
+                end
+ 
+                 for alg in walgs
+                    order, tree = cliquetree(weights, graph; alg)
+                    @test treewidth(weights, graph; alg=order) == wwidth
+                    @test treewidth(view(weights, order), tree) == wwidth
+                    @test treefill(weights, graph; alg=order) == treefill(view(weights, order), tree)
+                end
+            end
         end
     end
 end