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

delay hole creation in IsDiffCst and IsEqualCst

Browse Source
This commit is contained in:
Laurent Perron
2017-02-07 17:44:35 +01:00
parent 111e7af9c2
commit 6990c80085
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/constraint_solver/expr_cst.cc
View File

@@ -419,11 +419,14 @@ class IsEqualCstCt : public CastConstraint {
int64 l = inhibit ? u : 0;
target_var_->SetRange(l, u);
if (target_var_->Bound()) {
inhibit = true;
if (target_var_->Min() == 0) {
var_->RemoveValue(cst_);
if (var_->Size() <= 0xFFFFFF) {
var_->RemoveValue(cst_);
inhibit = true;
}
} else {
var_->SetValue(cst_);
inhibit = true;
}
}
if (inhibit) {
@@ -534,11 +537,14 @@ class IsDiffCstCt : public CastConstraint {
int64 u = inhibit ? l : 1;
target_var_->SetRange(l, u);
if (target_var_->Bound()) {
inhibit = true;
if (target_var_->Min() == 1) {
var_->RemoveValue(cst_);
if (var_->Size() <= 0xFFFFFF) {
var_->RemoveValue(cst_);
inhibit = true;
}
} else {
var_->SetValue(cst_);
inhibit = true;
}
}
if (inhibit) {