rewrote constraint pvals (#283)

* rewrote constraint pvals
* v0.8.1

Author: Wikunia

CHANGELOG.md

@@ -1,5 +1,7 @@
 # ConstrainSolver.jl - Changelog
 
+## v0.8.1 (5th of February 2022)
+- bugfix when using `CS.Integers` together with an alldifferent constraint. [PR #283](https://github.com/Wikunia/ConstraintSolver.jl/pull/283)
 ## v0.8.0 (8th of January 2022)
 - Using [TableLogger.jl](https://github.com/Wikunia/TableLogger.jl)
 - Only support Julia v1.6 and above

Project.toml

@@ -1,7 +1,7 @@
 name = "ConstraintSolver"
 uuid = "e0e52ebd-5523-408d-9ca3-7641f1cd1405"
 authors = ["Ole Kröger <[email protected]>"]
-version = "0.8.0"
+version = "0.8.1"
 
 [deps]
 ConstraintProgrammingExtensions = "b65d079e-ed98-51d9-b0db-edee61a5c5f8"

src/ConstraintSolver.jl

@@ -135,32 +135,11 @@ function set_pvals!(com::CS.CoM, constraint::Constraint)
     # nothing to do i.e x <= x will be x-x <= 0 => 0 <= 0 without variables
     length(indices) == 0 && return
     variables = Variable[v for v in com.search_space[indices]]
-    pvals_intervals = Vector{NamedTuple}()
-    push!(pvals_intervals, (from = variables[1].lower_bound, to = variables[1].upper_bound))
-    for i in 1:length(indices)
-        extra_from = variables[i].min
-        extra_to = variables[i].max
-        comp_inside = false
-        for cpvals in pvals_intervals
-            if extra_from >= cpvals.from && extra_to <= cpvals.to
-                # completely inside the interval already
-                comp_inside = true
-                break
-            elseif extra_from >= cpvals.from && extra_from <= cpvals.to
-                extra_from = cpvals.to + 1
-            elseif extra_to <= cpvals.to && extra_to >= cpvals.from
-                extra_to = cpvals.from - 1
-            end
-        end
-        if !comp_inside && extra_to >= extra_from
-            push!(pvals_intervals, (from = extra_from, to = extra_to))
-        end
+    pvals_set = Set{Int}()
+    for variable in variables
+        union!(pvals_set, values(variable))
     end
-    pvals = collect((pvals_intervals[1].from):(pvals_intervals[1].to))
-    for interval in pvals_intervals[2:end]
-        pvals = vcat(pvals, collect((interval.from):(interval.to)))
-    end
-    constraint.pvals = pvals
+    constraint.pvals = collect(pvals_set)
     if constraint isa IndicatorConstraint || constraint isa ReifiedConstraint
         set_pvals!(com, constraint.inner_constraint)
     end
@@ -770,7 +749,6 @@ function solve!(com::CS.CoM)
     feasible = prune!(com; pre_backtrack = true, initial_check = true)
     # finished pruning will be called in second call a few lines down...
 
-
     if !feasible
         com.solve_time = time() - com.start_time
         return :Infeasible

test/unit/constraints/alldifferent.jl

@@ -235,4 +235,19 @@ end
     @constraint(model, [x[i] - i for i in 1:n] in CS.AllDifferent())
 
     @test_throws DomainError optimize!(model)
-end
+end
+
+@testset "CS.Integers in AllDifferent" begin
+    m = Model(optimizer_with_attributes(CS.Optimizer, "logging"=>[]))
+    @variable(m, 0 <= x[1:3] <= 20, Int)
+    @constraint(m, x[1] in CS.Integers([3,5]))
+    @constraint(m, x[2] in CS.Integers([3,5]))
+    @constraint(m, x in CS.AllDifferent())
+    optimize!(m)
+    @test JuMP.termination_status(m) == MOI.OPTIMAL
+    vals = convert.(Int, JuMP.value.(x))
+    @test allunique(vals)
+    @test vals[1] in [3,5]
+    @test vals[2] in [3,5]
+    @test vals[3] in collect(0:20)
+end