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

misc

Browse Source
This commit is contained in:
lperron@google.com
2012-07-06 07:24:41 +00:00
parent d30ef60505
commit af4e2e2b48
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/constraint_solver/expr_cst.cc
View File

@@ -408,7 +408,7 @@ IntVar* Solver::MakeIsEqualCstVar(IntExpr* const var, int64 value) {
return var->Var()->IsEqual(value);
} else {
IntVar* const boolvar =
MakeBoolVar(StringPrintf("Is(%s == %" GG_LL_FORMAT "d",
MakeBoolVar(StringPrintf("Is(%s == %" GG_LL_FORMAT "d)",
var->DebugString().c_str(),
value));
AddConstraint(MakeIsEqualCstCt(var, value, boolvar));
@@ -618,7 +618,7 @@ IntVar* Solver::MakeIsGreaterOrEqualCstVar(IntExpr* const var, int64 value) {
return var->Var()->IsGreaterOrEqual(value);
} else {
IntVar* const boolvar =
MakeBoolVar(StringPrintf("Is(%s >= %" GG_LL_FORMAT "d",
MakeBoolVar(StringPrintf("Is(%s >= %" GG_LL_FORMAT "d)",
var->DebugString().c_str(),
value));
AddConstraint(MakeIsGreaterOrEqualCstCt(var, value, boolvar));
@@ -723,7 +723,7 @@ IntVar* Solver::MakeIsLessOrEqualCstVar(IntExpr* const var, int64 value) {
return var->Var()->IsLessOrEqual(value);
} else {
IntVar* const boolvar =
MakeBoolVar(StringPrintf("Is(%s <= %" GG_LL_FORMAT "d",
MakeBoolVar(StringPrintf("Is(%s <= %" GG_LL_FORMAT "d)",
var->DebugString().c_str(),
value));
AddConstraint(MakeIsLessOrEqualCstCt(var, value, boolvar));

2
src/flatzinc/registry.cc
View File

@@ -909,7 +909,7 @@ void p_array_bool_or(FlatZincModel* const model, CtSpec* const spec) {
for (int i = 0; i < size; ++i) {
AST::Node* const a = array_variables->a[i];
IntVar* const to_add = model->GetIntExpr(a)->Var();
if (!ContainsKey(added, to_add)) {
if (!ContainsKey(added, to_add) && to_add->Max() != 0) {
variables.push_back(to_add);
added.insert(to_add);
}