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

small speedup in CP-SAT integer expressions

Browse Source
This commit is contained in:
Laurent Perron
2019-01-07 15:41:24 +01:00
parent 581bd2e751
commit 295ffdbfcf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ortools/sat/integer_expr.cc
View File

@@ -137,9 +137,11 @@ bool IntegerSumLE::Propagate() {
for (int i = rev_num_fixed_vars_; i < num_vars; ++i) {
const IntegerVariable var = vars_[i];
const IntegerValue coeff = coeffs_[i];
const IntegerValue div = slack / coeff;
const IntegerValue new_ub = integer_trail_->LowerBound(var) + div;
if (new_ub < integer_trail_->UpperBound(var)) {
const IntegerValue domain_size =
integer_trail_->UpperBound(var) - integer_trail_->LowerBound(var);
if (domain_size * coeff > slack) {
const IntegerValue div = slack / coeff;
const IntegerValue new_ub = integer_trail_->LowerBound(var) + div;
const IntegerValue propagation_slack = (div + 1) * coeff - slack - 1;
if (!integer_trail_->Enqueue(
IntegerLiteral::LowerOrEqual(var, new_ub),