Merge branch 'master' of https://github.com/Wikunia/ConstraintSolver.jl

Author: Wikunia

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ConstrainSolver.jl - Changelog
 
+## v0.6.8 (14th of June 2021)
+- support for xor and xnor constraints 
+- better bridge structure for boolean constraints
+
 ## v0.6.7 (18th of March 2021) 
 - different data structure for saving variable changes for a speedup of ~10-25% in most instances [PR #260](https://github.com/Wikunia/ConstraintSolver.jl/pull/260)
 

Project.toml

@@ -1,7 +1,7 @@
 name = "ConstraintSolver"
 uuid = "e0e52ebd-5523-408d-9ca3-7641f1cd1405"
 authors = ["Ole Kröger <[email protected]>"]
-version = "0.6.7"
+version = "0.6.8"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

benchmark/run_benchmarks.jl

@@ -1,6 +1,7 @@
 
 #!/usr/bin/env julia
 
+using Pkg
 using ArgParse
 
 function parse_commandline()
@@ -31,6 +32,9 @@ end
 
 
 if isinteractive() == false
+    Pkg.activate(".")
+    Pkg.instantiate()
+
     args = parse_commandline()
     using PkgBenchmark
     using ConstraintSolver, Cbc

src/ConstraintSolver.jl

@@ -66,9 +66,12 @@ include("objective.jl")
 include("constraints.jl")
 
 include("constraints/all_different.jl")
+include("constraints/complement.jl")
 include("constraints/boolset.jl")
 include("constraints/and.jl")
 include("constraints/or.jl")
+include("constraints/xor.jl")
+include("constraints/xnor.jl")
 include("constraints/linear_constraints.jl")
 include("constraints/svc.jl")
 include("constraints/equal_set.jl")