always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CP-SAT] improve alldiff presolve

Browse Source
This commit is contained in:
Laurent Perron
2025-03-23 08:29:09 -07:00
parent c06a5b1652
commit d4e6393927
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ortools/sat/cp_model_presolve.cc
View File

@@ -5536,7 +5536,8 @@ bool CpModelPresolver::PresolveAllDiff(ConstraintProto* ct) {
// Detect duplicate expressions, and remove impossible values from expressions
// with the same variable.
absl::flat_hash_map<int, std::vector<std::pair<int64_t, int64_t>>> terms;
// We use btree_map to have a deterministic order.
absl::btree_map<int, std::vector<std::pair<int64_t, int64_t>>> terms;
std::vector<int64_t> forbidden_values;
for (const LinearExpressionProto& expr : all_diff.exprs()) {
if (expr.vars_size() != 1) continue;
@@ -5598,7 +5599,7 @@ bool CpModelPresolver::PresolveAllDiff(ConstraintProto* ct) {
}
if (all_diff.exprs_size() == union_of_domains.Size()) {
absl::flat_hash_map<int64_t, UniqueNonNegativeValue> value_to_index;
absl::btree_map<int64_t, UniqueNonNegativeValue> value_to_index;
for (int i = 0; i < all_diff.exprs_size(); ++i) {
const LinearExpressionProto& expr = all_diff.exprs(i);
DCHECK_EQ(expr.vars_size(), 1);