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

fix potential missing propagation in NotBetweenCt

Browse Source
This commit is contained in:
Laurent Perron
2016-07-29 11:04:36 -07:00
parent 13e4a066a2
commit b1c14bd6ec
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/constraint_solver/expr_cst.cc
View File

@@ -862,10 +862,8 @@ class NotBetweenCt : public Constraint {
: Constraint(s), expr_(v), min_(l), max_(u), demon_(nullptr) {}
void Post() override {
if (!expr_->IsVar()) {
demon_ = solver()->MakeConstraintInitialPropagateCallback(this);
expr_->WhenRange(demon_);
}
demon_ = solver()->MakeConstraintInitialPropagateCallback(this);
expr_->WhenRange(demon_);
}
void InitialPropagate() override {
@@ -878,7 +876,7 @@ class NotBetweenCt : public Constraint {
expr_->SetMax(min_ - 1);
}
if (demon_ != nullptr && (emax < min_ || emin > max_)) {
if (!expr_->IsVar() && (emax < min_ || emin > max_)) {
demon_->inhibit(solver());
}
}