removed GLPK dep, solver mandatory (#4)

Author: matbesancon

REQUIRE

@@ -3,4 +3,3 @@ LightGraphs 0.9.0
 JuMP 0.13.2
 MatrixDepot
 BlossomV 0.1
-GLPKMathProgInterface 0.3.2

src/LightGraphsMatching.jl

@@ -24,9 +24,8 @@ end
 import BlossomV
 include("blossomv.jl")
 
-using GLPKMathProgInterface: GLPKSolverMIP
-
 using JuMP
+using MathProgBase: AbstractMathProgSolver
 include("lp.jl")
 include("maximum_weight_matching.jl")
 

src/lp.jl

@@ -20,19 +20,18 @@ The returned object is of type `MatchingResult`.
 """
 function maximum_weight_maximal_matching end
 
-function maximum_weight_maximal_matching(g::Graph, w::Dict{Edge,T}, cutoff; solver = GLPKSolverMIP) where {T<:Real}
+function maximum_weight_maximal_matching(g::Graph, solver::AbstractMathProgSolver, w::Dict{Edge,T}, cutoff::R) where {T<:Real, R<:Real}
     wnew = Dict{Edge,T}()
     for (e,x) in w
         if x >= cutoff
             wnew[e] = x
         end
     end
-
-    return maximum_weight_maximal_matching(g, wnew)
+    return maximum_weight_maximal_matching(g, solver, wnew)
 end
 
 
-function maximum_weight_maximal_matching(g::Graph, w::Dict{Edge,T}; solver = GLPKSolverMIP) where {T<:Real}
+function maximum_weight_maximal_matching(g::Graph, solver::AbstractMathProgSolver, w::Dict{Edge,T}) where {T<:Real}
 # TODO support for graphs with zero degree nodes
 # TODO apply separately on each connected component
     bpmap = bipartite_map(g)
@@ -51,7 +50,7 @@ function maximum_weight_maximal_matching(g::Graph, w::Dict{Edge,T}; solver = GLP
         edgemap[reverse(e)] = nedg
     end
 
-    model = Model(solver=solver())
+    model = Model(solver=solver)
     @variable(model, x[1:length(w)] >= 0)
 
     for i in v1

src/maximum_weight_matching.jl

@@ -22,10 +22,10 @@ Returns MatchingResult containing:
 function maximum_weight_matching end
 
 function maximum_weight_matching(g::Graph,
-          w::Dict{Edge,T} = Dict{Edge,Int64}(i => 1 for i in collect(edges(g)));
-          solver = GLPKSolverMIP) where {T <:Real}
+          solver::AbstractMathProgSolver,
+          w::Dict{Edge,T} = Dict{Edge,Int64}(i => 1 for i in collect(edges(g)))) where {T <:Real}
 
-    model = Model(solver = solver())
+    model = Model(solver = solver)
     n = nv(g)
     edge_list = collect(edges(g))
 

test/REQUIRE

@@ -0,0 +1 @@
+Cbc

test/runtests.jl

@@ -2,14 +2,15 @@ include("../src/LightGraphsMatching.jl")
 using LightGraphs
 using LightGraphsMatching
 using Base.Test
+using Cbc: CbcSolver
 
 g =CompleteBipartiteGraph(2,2)
 w =Dict{Edge,Float64}()
 w[Edge(1,3)] = 10.
 w[Edge(1,4)] = 1.
 w[Edge(2,3)] = 2.
 w[Edge(2,4)] = 11.
-match = maximum_weight_maximal_matching(g,w)
+match = maximum_weight_maximal_matching(g, CbcSolver(), w)
 @test match.weight == 21
 @test match.mate[1] == 3
 @test match.mate[3] == 1
@@ -22,7 +23,7 @@ w[Edge(1,3)] = 10
 w[Edge(1,4)] = 0.5
 w[Edge(2,3)] = 11
 w[Edge(2,4)] = 1
-match = maximum_weight_maximal_matching(g,w)
+match = maximum_weight_maximal_matching(g, CbcSolver(), w)
 @test match.weight == 11.5
 @test match.mate[1] == 4
 @test match.mate[4] == 1
@@ -37,7 +38,7 @@ w[Edge(2,3)] = 11
 w[Edge(2,4)] = 1
 w[Edge(2,5)] = -1
 w[Edge(2,6)] = -1
-match = maximum_weight_maximal_matching(g,w,0)
+match = maximum_weight_maximal_matching(g,CbcSolver(),w,0)
 @test match.weight == 11.5
 @test match.mate[1] == 4
 @test match.mate[4] == 1
@@ -52,7 +53,7 @@ w[Edge(2,5)] = 11
 w[Edge(1,6)] = 1
 w[Edge(1,5)] = -1
 
-match = maximum_weight_maximal_matching(g,w,0)
+match = maximum_weight_maximal_matching(g,CbcSolver(),w,0)
 @test match.weight == 12
 @test match.mate[1] == 6
 @test match.mate[2] == 5
@@ -64,11 +65,11 @@ match = maximum_weight_maximal_matching(g,w,0)
 g = CompleteGraph(3)
 w =Dict{Edge,Float64}()
 w[Edge(1,2)] = 1
-@test_throws ErrorException maximum_weight_matching(g,w)
+@test_throws ErrorException maximum_weight_matching(g,CbcSolver(),w)
 
 w[Edge(3,2)] = 1
 w[Edge(1,3)] = 1
-match = maximum_weight_matching(g,w)
+match = maximum_weight_matching(g,CbcSolver(),w)
 @test match.weight == 1
 
 
@@ -80,7 +81,7 @@ add_edge!(g, 2,4)
 w[Edge(1,3)] = 1
 w[Edge(1,4)] = 3
 w[Edge(2,4)] = 1
-match = maximum_weight_matching(g,w)
+match = maximum_weight_matching(g,CbcSolver(),w)
 @test match.weight == 3
 @test match.mate[1] == 4
 @test match.mate[2] == -1
@@ -92,7 +93,7 @@ add_edge!(g, 1,2)
 add_edge!(g, 2,3)
 add_edge!(g, 3,1)
 add_edge!(g, 3,4)
-match = maximum_weight_matching(g)
+match = maximum_weight_matching(g,CbcSolver())
 @test match.weight == 2
 @test match.mate[1] == 2
 @test match.mate[2] == 1
@@ -104,7 +105,7 @@ w[Edge(1,2)] = 1
 w[Edge(2,3)] = 1
 w[Edge(1,3)] = 1
 w[Edge(3,4)] = 1
-match = maximum_weight_matching(g,w)
+match = maximum_weight_matching(g,CbcSolver(), w)
 @test match.weight == 2
 @test match.mate[1] == 2
 @test match.mate[2] == 1
@@ -115,7 +116,7 @@ w[Edge(1,2)] = 1
 w[Edge(2,3)] = 1
 w[Edge(1,3)] = 5
 w[Edge(3,4)] = 1
-match = maximum_weight_matching(g,w)
+match = maximum_weight_matching(g,CbcSolver(),w)
 @test match.weight == 5
 @test match.mate[1] == 3
 @test match.mate[2] == -1