Add QAP as an available model

Author: Azzaare

Project.toml

@@ -1,7 +1,7 @@
 name = "ConstraintModels"
 uuid = "841a6ec5-cac3-4c42-9a0a-4b21c9553698"
 authors = ["Jean-Francois Baffier"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 CBLS = "a3809bfe-37bb-4d48-a667-bac4c6be8d90"

src/ConstraintModels.jl

@@ -10,12 +10,14 @@ const LS = LocalSearchSolvers
 
 import LocalSearchSolvers: Options
 
+export qap
 export mincut
 export golomb
 export magic_square
 export n_queens
 export sudoku
 
+include("assignment.jl")
 include("cut.jl")
 include("golomb.jl")
 include("magic_square.jl")

src/assignment.jl

@@ -0,0 +1,13 @@
+function qap(n, W, D, ::Val{:JuMP})
+    model = JuMP.Model(CBLS.Optimizer)
+
+    @variable(model, X[1:n], DiscreteSet(1:n))
+    @constraint(model, X in AllDifferent())
+
+    Σwd = p -> sum(sum(W[p[i], p[j]] * D[i, j] for j in 1:n) for i in 1:n)
+    @objective(model, Min, ScalarFunction(Σwd))
+
+    return model, X
+end
+
+qap(n, weigths, distances; modeler = :JuMP) = qap(n, weigths, distances, Val(modeler))

test/JuMP.jl

@@ -18,30 +18,36 @@
     @constraint(m, X in Ordered())
 end
 
-# @testset "JuMP: sudoku 9x9" begin
-#     m, X = sudoku(3)
-#     optimize!(m)
-#     solution_ = value.(X)
-#     display(solution_, Val(:sudoku))
-# end
+@testset "JuMP: sudoku 9x9" begin
+    m, X = sudoku(3)
+    optimize!(m)
+    solution_ = value.(X)
+    display(solution_, Val(:sudoku))
+end
 
-# @testset "JuMP: golomb(5)" begin
-#     m, X = golomb(5)
-#     optimize!(m)
-#     @info "JuMP: golomb(5)" value.(X)
-# end
+@testset "JuMP: golomb(5)" begin
+    m, X = golomb(5)
+    optimize!(m)
+    @info "JuMP: golomb(5)" value.(X)
+end
 
-# @testset "JuMP: magic_square(3)" begin
-#     m, X = magic_square(3)
-#     optimize!(m)
-#     @info "JuMP: magic_square(3)" value.(X)
-# end
+@testset "JuMP: magic_square(3)" begin
+    m, X = magic_square(3)
+    optimize!(m)
+    @info "JuMP: magic_square(3)" value.(X)
+end
 
-# @testset "JuMP: n_queens(5)" begin
-#     m, X = n_queens(5)
-#     optimize!(m)
-#     @info "JuMP: n_queens(5)" value.(X)
-# end
+@testset "JuMP: n_queens(5)" begin
+    m, X = n_queens(5)
+    optimize!(m)
+    @info "JuMP: n_queens(5)" value.(X)
+end
+
+@testset "JuMP: qap(12)" begin
+    m, X = qap(12, qap_weights, qap_distances)
+    optimize!(m)
+    @info "JuMP: qap(12)" value.(X)
+end
 
 @testset "JuMP: basic opt" begin
     model = Model(CBLS.Optimizer)
@@ -62,4 +68,4 @@ end
     optimize!(model)
 
     @info "JuMP: basic opt" value(x) value(y) (12*value(x)+20*value(y))
-end
+end