added tests for both functions

Author: pkj-m

src/SparseDiffTools.jl

@@ -13,6 +13,8 @@ import Core: SSAValue
 
 export  contract_color,
         greedy_d1,
+        greedy_star1_coloring,
+        greedy_star2_coloring,
         matrix2graph,
         matrix_colors,
         forwarddiff_color_jacobian!,
@@ -33,6 +35,8 @@ export  contract_color,
 include("coloring/high_level.jl")
 include("coloring/contraction_coloring.jl")
 include("coloring/greedy_d1_coloring.jl")
+include("coloring/greedy_star1_coloring.jl")
+include("coloring/greedy_star2_coloring.jl")
 include("coloring/matrix2graph.jl")
 include("differentiation/compute_jacobian_ad.jl")
 include("differentiation/jaches_products.jl")

src/coloring/greedy_star2_coloring.jl

@@ -24,7 +24,7 @@
     TODO: add text explaining the difference between star1 and
     star2
 """
-function greedy_star2_coloring(G::LightGraphs.AbstractGraph)
+function greedy_star2_coloring(g::LightGraphs.AbstractGraph)
     v = nv(g)
     color = zeros(Int64, v)
 
@@ -55,11 +55,3 @@ function greedy_star2_coloring(G::LightGraphs.AbstractGraph)
 
     color
 end
-
-function find_min_color(forbiddenColors::AbstractVector, vertex_i::Integer)
-    c = 1
-    while (forbiddenColors[c] == vertex_i)
-        c+=1
-    end
-    c
-end

test/test_greedy_star.jl

@@ -5,7 +5,7 @@ using Random
 Random.seed!(123)
 
 #= Test data =#
-test_graphs = Array{VSafeGraph, 1}(undef, 0)
+test_graphs = Array{SimpleGraph, 1}(undef, 0)
 
 for _ in 1:5
     nv = rand(5:20)
@@ -44,19 +44,39 @@ for i in 1:5
     for v = vertices(g)
         color = out_colors1[v]
         for j in inneighbors(g, v)
-            @test out_color[j] != color
+            @test out_colors1[j] != color
         end
     end
 
     #test condition 2
     for j = vertices(g)
         walk = saw(g, j, 4)
         walk_colors = zeros(Int64, 0)
-        if length(saw) >= 4
+        if length(walk) >= 4
             for t in walk
                 push!(walk_colors, out_colors1[t])
             end
-            @test unique(walk_colors) >= 3
+            @test length(unique(walk_colors)) >= 3
+        end
+    end
+
+    #test condition 1
+    for v = vertices(g)
+        color = out_colors2[v]
+        for j in inneighbors(g, v)
+            @test out_colors2[j] != color
+        end
+    end
+
+    #test condition 2
+    for j = vertices(g)
+        walk = saw(g, j, 4)
+        walk_colors = zeros(Int64, 0)
+        if length(walk) >= 4
+            for t in walk
+                push!(walk_colors, out_colors2[t])
+            end
+            @test length(unique(walk_colors)) >= 3
         end
     end