fix docs + small fixes

src/GraphsOptim.jl

@@ -31,7 +31,7 @@ include("utils.jl")
 include("flow.jl")
 include("assignment.jl")
 include("graph_matching.jl")
-include("vertex_cover.jl")
+include("min_vertex_cover.jl")
 include("fractional_coloring.jl")
 include("shortest_path.jl")
 

src/vertex_cover.jl → src/min_vertex_cover.jl

@@ -1,5 +1,5 @@
 """
-    vertex_cover!(
+    min_vertex_cover!(
         model, g;
         var_name
     )
@@ -8,24 +8,23 @@ Modify a JuMP model by adding the variable, constraints and objective necessary
 
 The vertex cover indicator variable will be named `var_name`
 """
-function min_vertex_cover!(model::Model, g::AbstractGraph; var_name)
+function min_vertex_cover!(model::Model, g::AbstractGraph; integer::Bool, var_name)
     if is_directed(g)
         throw(ArgumentError("The graph must not be directed"))
     end
 
     ver = collect(vertices(g))
-    edge_tuples = [(src(ed), dst(ed)) for ed in edges(g)]
 
-    f = @variable(model, [ver]; integer=true, base_name=String(var_name))
+    f = @variable(model, [ver]; integer=integer, base_name=String(var_name))
     model[Symbol(var_name)] = f
 
     for v in ver
         @constraint(model, f[v] >= 0)
         @constraint(model, f[v] <= 1)
     end
 
-    for (u, v) in edge_tuples
-        @constraint(model, f[u] + f[v] >= 1)
+    for e in edges(g)
+        @constraint(model, f[src(e)] + f[dst(e)] >= 1)
     end
 
     obj = objective_function(model)
@@ -38,7 +37,7 @@ function min_vertex_cover!(model::Model, g::AbstractGraph; var_name)
 end
 
 """
-    vertex_cover(
+    min_vertex_cover(
         g, optimizer
     )
 
@@ -52,11 +51,11 @@ Compute a minimum vertex cover of an undirected graph.
 
 - `optimizer`: JuMP-compatible solver (default is `HiGHS.Optimizer`)
 """
-function min_vertex_cover(g::AbstractGraph; optimizer=HiGHS.Optimizer)
+function min_vertex_cover(g::AbstractGraph; integer::Bool=true, optimizer=HiGHS.Optimizer)
     model = Model(optimizer)
     set_silent(model)
 
-    min_vertex_cover!(model, g; var_name=:cover)
+    min_vertex_cover!(model, g; integer=integer, var_name=:cover)
 
     optimize!(model)
     @assert termination_status(model) == OPTIMAL

test/vertex_cover.jl → test/min_vertex_cover.jl

@@ -11,7 +11,7 @@ adj_matrix = [
     0 1 0 0 0 0
 ]
 
-expected_ans_options = Set([Set([1, 2]), Set([2, 3])])
+expected_ans_options = [Set([1, 2]), Set([2, 3])]
 
 graph = SimpleGraph(adj_matrix)
 

test/runtests.jl

@@ -41,7 +41,7 @@ using Test
     end
 
     @testset verbose = true "Vertex cover" begin
-        include("vertex_cover.jl")
+        include("min_vertex_cover.jl")
     end
 
     @testset verbose = true "Fractional coloring" begin