diff --git a/src/constraint_solver/expr_cst.cc b/src/constraint_solver/expr_cst.cc index b0e3cbde39..aa0ee0cf9f 100644 --- a/src/constraint_solver/expr_cst.cc +++ b/src/constraint_solver/expr_cst.cc @@ -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)); diff --git a/src/flatzinc/registry.cc b/src/flatzinc/registry.cc index 696b1c021c..f89537ce16 100644 --- a/src/flatzinc/registry.cc +++ b/src/flatzinc/registry.cc @@ -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); }