From c93623d87bf5db310c34ca700cd6615381aa417b Mon Sep 17 00:00:00 2001 From: "lperron@google.com" Date: Mon, 16 Jan 2012 10:34:51 +0000 Subject: [PATCH] add MakeAllDifferent api without range parameter --- constraint_solver/alldiff_cst.cc | 4 ++++ constraint_solver/constraint_solver.h | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/constraint_solver/alldiff_cst.cc b/constraint_solver/alldiff_cst.cc index 778752d58f..f21f44fa88 100644 --- a/constraint_solver/alldiff_cst.cc +++ b/constraint_solver/alldiff_cst.cc @@ -423,6 +423,10 @@ bool BoundsAllDifferent::PropagateMax() { } } // namespace +Constraint* Solver::MakeAllDifferent(const std::vector& vars) { + return MakeAllDifferent(vars.data(), vars.size(), true); +} + Constraint* Solver::MakeAllDifferent(const std::vector& vars, bool range) { return MakeAllDifferent(vars.data(), vars.size(), range); } diff --git a/constraint_solver/constraint_solver.h b/constraint_solver/constraint_solver.h index b2b80155f7..349b45045f 100644 --- a/constraint_solver/constraint_solver.h +++ b/constraint_solver/constraint_solver.h @@ -1534,8 +1534,12 @@ class Solver { int64 total_sum); // All variables are pairwise different. + Constraint* MakeAllDifferent(const std::vector& vars); + // All variables are pairwise different. If 'range' is true, + // stronger , and potentially slower propagation will occur. Constraint* MakeAllDifferent(const std::vector& vars, bool range); - // All variables are pairwise different. + // All variables are pairwise different. If 'range' is true, + // stronger , and potentially slower propagation will occur. Constraint* MakeAllDifferent(const IntVar* const* vars, int size, bool range);