fixed tests

Author: pkj-m

Project.toml

@@ -12,6 +12,7 @@ LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+SparsityDetection = "684fba80-ace3-11e9-3d08-3bc7ed6f96df"
 VertexSafeGraphs = "19fa3120-7c27-5ec5-8db8-b0b0aa330d6f"
 
 [compat]

src/coloring/backtracking_coloring.jl

@@ -130,7 +130,7 @@ end
     free_colors(x::Integer,
                 A::AbstractVector{<:Integer},
                 colors::AbstractVector{<:Integer},
-                F::Array{Integer64,1},
+                F::Array{Integer,1},
                 g::LightGraphs.AbstractGraph,
                 opt::Integer)
 
@@ -150,7 +150,7 @@ opt: Current optimal number of colors to be used in the coloring of graph g
 function free_colors(x::Integer,
                     A::AbstractVector{<:Integer},
                     colors::AbstractVector{<:Integer},
-                    F::Array{Integer64,1},
+                    F::Array{Integer,1},
                     g::LightGraphs.AbstractGraph,
                     opt::Integer)
     index = -1

test/runtests.jl

@@ -1,19 +1,3 @@
-<<<<<<< HEAD
-using SparseDiffTools
-using Test
-
-
-@testset "Exact coloring via contraction" begin include("test_contraction.jl") end
-@testset "Exact coloring via backtracking" begin include("test_bsc.jl") end
-@testset "Greedy distance-1 coloring" begin include("test_greedy_d1.jl") end
-@testset "Greedy star coloring" begin include("test_greedy_star.jl") end
-@testset "Matrix to graph conversion" begin include("test_matrix2graph.jl") end
-@testset "AD using color vector" begin include("test_ad.jl") end
-@testset "Integration test" begin include("test_integration.jl") end
-@testset "Special matrices" begin include("test_specialmatrices.jl") end
-@testset "Jacobian Vecs and Hessian Vecs" begin include("test_jaches_products.jl") end
-@testset "Program sparsity computation" begin include("program_sparsity/testall.jl") end
-=======
 using SafeTestsets
 
 @time @safetestset "Exact coloring via contraction" begin include("test_contraction.jl") end
@@ -24,4 +8,3 @@ using SafeTestsets
 @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
->>>>>>> 1b115b8d6dd386c46a0474c736e91aae710afd3d