restored tests

Author: pkj-m

test/runtests.jl

@@ -5,15 +5,15 @@ const is_APPVEYOR = ( Sys.iswindows() && haskey(ENV,"APPVEYOR") )
 const is_TRAVIS = haskey(ENV,"TRAVIS")
 
 if GROUP == "All"
-    #@time @safetestset "Exact coloring via contraction" begin include("test_contraction.jl") end
-    #@time @safetestset "Greedy distance-1 coloring" begin include("test_greedy_d1.jl") end
-    #@time @safetestset "Greedy star coloring" begin include("test_greedy_star.jl") end
+    @time @safetestset "Exact coloring via contraction" begin include("test_contraction.jl") end
+    @time @safetestset "Greedy distance-1 coloring" begin include("test_greedy_d1.jl") end
+    @time @safetestset "Greedy star coloring" begin include("test_greedy_star.jl") end
     @time @safetestset "Acyclic coloring" begin include("test_acyclic.jl") end
-    #@time @safetestset "Matrix to graph conversion" begin include("test_matrix2graph.jl") end
-    #@time @safetestset "AD using colorvec vector" begin include("test_ad.jl") end
-    ##@time @safetestset "Integration test" begin include("test_integration.jl") end
-    #@time @safetestset "Special matrices" begin include("test_specialmatrices.jl") end
-    #@time @safetestset "Jac Vecs and Hes Vecs" begin include("test_jaches_products.jl") end
+    @time @safetestset "Matrix to graph conversion" begin include("test_matrix2graph.jl") end
+    @time @safetestset "AD using colorvec vector" begin include("test_ad.jl") end
+    @time @safetestset "Integration test" begin include("test_integration.jl") end
+    @time @safetestset "Special matrices" begin include("test_specialmatrices.jl") end
+    @time @safetestset "Jac Vecs and Hes Vecs" begin include("test_jaches_products.jl") end
 end
 
 if GROUP == "GPU"

test/test_acyclic.jl

@@ -10,7 +10,7 @@ Random.seed!(45)
 test_graphs = Vector{SimpleGraph}(undef, 0)
 test_graphs_dir = Vector{SimpleDiGraph}(undef, 0)
 
-for _ in 1:6
+for _ in 1:5
     nv = rand(5:20)
     ne = rand(1:100)
     graph = SimpleGraph(nv)
@@ -98,17 +98,9 @@ end
 for i in 1:5
     g = test_graphs[i]
     dg = test_graphs_dir[i]
-    println("Testing graph $i")
-    n_v = nv(g)
-    n_e = ne(g)
-    println("Number of vertices = $n_v, Number of edges = $n_e")
-    println("Edges: ")
-    for e in edges(g)
-        println(e)
-    end
-    println()
+
     out_colors = SparseDiffTools.color_graph(g, SparseDiffTools.AcyclicColoring())
-    # println(out_colors)
+
     #test condition 1
     for v in vertices(g)
         color = out_colors[v]
@@ -121,9 +113,9 @@ end
 for i in 3:4
     g = test_graphs[i]
     dg = test_graphs_dir[i]
-    # println("testing graph $i")
+
     out_colors = SparseDiffTools.color_graph(g, SparseDiffTools.AcyclicColoring())
-    # println(out_colors)
+
     #test condition 2
     cycles = simplecycles(dg)
     for c in cycles