Merge pull request #4 from JuliaConstraints/dev

New release for the `check!` function

.github/workflows/CI.yml

@@ -1,10 +1,16 @@
 name: CI
 on:
+  pull_request:
+    branches:
+      - main
+      - dev
+    paths-ignore:
+      - "docs/**"
   push:
     branches:
       - main
-    tags: ["*"]
-  pull_request:
+    paths-ignore:
+      - "docs/**"
   workflow_dispatch:
 concurrency:
   # Skip intermediate builds: always.

Project.toml

@@ -1,7 +1,7 @@
 name = "ConstraintExplorer"
 uuid = "798c8aff-73f8-4b88-855c-426d3d936206"
 authors = ["Jean-François BAFFIER (@Azzaare)"]
-version = "0.0.1"
+version = "0.0.2"
 
 [deps]
 ConstraintCommons = "e37357d9-0691-492f-a822-e5ea6a920954"
@@ -17,7 +17,7 @@ TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
 [compat]
 Aqua = "0.8"
 ConstraintCommons = "0.2"
-ConstraintDomains = "0.3.14"
+ConstraintDomains = "0.3.15"
 Constraints = "0.5"
 ExplicitImports = "1"
 Intervals = "1"

src/ConstraintExplorer.jl

@@ -4,7 +4,7 @@ module ConstraintExplorer
 import ConstraintCommons
 import ConstraintDomains: AbstractDomain, RangeDomain
 import ConstraintDomains: intersect_domains, domain
-import ConstraintDomains: Explorer, ExploreSettings, ExplorerState, explore!
+import ConstraintDomains: Explorer, ExploreSettings, ExplorerState, explore!, _check!
 import Constraints: concept, USUAL_CONSTRAINTS
 import JuMP
 import MathOptInterface as MOI
@@ -56,7 +56,7 @@ export Regular
 export Sum
 
 #Exports: Explorer
-export configurations, solutions, non_solutions
+export configurations, solutions, non_solutions, check!
 
 #SECTION - Includes
 include("MOI_wrapper.jl")
@@ -103,6 +103,23 @@ include("constraints/sum.jl")
 
     X, X̅ = configurations(explorer)
     @info "All Different" X X̅
+
+    x = first(X)
+
+    checker = Model(ConstraintExplorer.Optimizer)
+
+    @variable(checker, 1≤X[1:4]≤4, Int)
+
+    @constraint(checker, X in AllDifferent())
+    @constraint(checker, X in DistDifferent())
+
+    check!(checker, [x])
+
+    Y, Y̅ = configurations(checker)
+
+    @test x ∈ Y
+    @test length(Y) == 1
+    @test isempty(Y̅)
 end
 
 #SECTION - Main function (optional)

src/MOI_wrapper.jl

@@ -121,3 +121,8 @@ solutions(model) = model.moi_backend.optimizer.model.explorer.state.solutions
 non_solutions(model) = model.moi_backend.optimizer.model.explorer.state.non_solutions
 
 configurations(model) = solutions(model), non_solutions(model)
+
+function check!(model, configurations)
+    checker = model.moi_backend.optimizer.model.explorer
+    return _check!(checker, configurations)
+end

test/Aqua.jl

@@ -2,14 +2,14 @@
     # TODO: Fix the broken tests and remove the `broken = true` flag
     Aqua.test_all(
         ConstraintExplorer;
-        ambiguities = (broken = true,),
+        ambiguities = (broken = false,),
         deps_compat = true,
         piracies = (broken = false,),
     )
 
-    @testset "Ambiguities: ConstraintExplorer" begin
-        Aqua.test_ambiguities(ConstraintExplorer;)
-    end
+    # @testset "Ambiguities: ConstraintExplorer" begin
+    #     Aqua.test_ambiguities(ConstraintExplorer;)
+    # end
 
     @testset "Piracies: ConstraintExplorer" begin
         Aqua.test_piracies(ConstraintExplorer;)