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

speedup bacp

Browse Source
This commit is contained in:
lperron@google.com
2014-05-25 02:29:50 +00:00
parent a3bef694ab
commit 5224afc5cf
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/constraint_solver/expr_array.cc
View File

@@ -2824,24 +2824,26 @@ IntExpr* Solver::MakeSum(const std::vector<IntVar*>& vars) {
new_max = CapAdd(vars[i]->Max(), new_max);
}
}
IntVar* sum_var = nullptr;
IntExpr* sum_expr = nullptr;
const bool all_booleans = AreAllBooleans(vars);
if (all_booleans) {
const std::string name =
StringPrintf("BooleanSum([%s])", JoinNamePtr(vars, ", ").c_str());
sum_var = MakeIntVar(new_min, new_max, name);
AddConstraint(RevAlloc(new SumBooleanEqualToVar(this, vars, sum_var)));
sum_expr = MakeIntVar(new_min, new_max, name);
AddConstraint(
RevAlloc(new SumBooleanEqualToVar(this, vars, sum_expr->Var())));
} else if (new_min != kint64min && new_max != kint64max) {
sum_var = MakeSumFct(this, vars)->Var();
sum_expr = MakeSumFct(this, vars);
} else {
const std::string name =
StringPrintf("Sum([%s])", JoinNamePtr(vars, ", ").c_str());
sum_var = MakeIntVar(new_min, new_max, name);
AddConstraint(RevAlloc(new SafeSumConstraint(this, vars, sum_var)));
sum_expr = MakeIntVar(new_min, new_max, name);
AddConstraint(
RevAlloc(new SafeSumConstraint(this, vars, sum_expr->Var())));
}
model_cache_->InsertVarArrayExpression(sum_var, vars,
model_cache_->InsertVarArrayExpression(sum_expr, vars,
ModelCache::VAR_ARRAY_SUM);
return sum_var;
return sum_expr;
}
}
}

6
src/flatzinc2/solver.cc
View File

@@ -84,7 +84,11 @@ IntExpr* FzSolver::Extract(FzIntegerVariable* var) {
void FzSolver::SetExtracted(FzIntegerVariable* fz_var, IntExpr* expr) {
CHECK(!ContainsKey(extrated_map_, fz_var));
if (!expr->IsVar() && !fz_var->domain.is_interval) {
if (!expr->IsVar() &&
(!fz_var->domain.is_interval ||
(!fz_var->domain.values.empty() &&
(expr->Min() < fz_var->domain.values[0] ||
expr->Max() > fz_var->domain.values[1])))) {
FZVLOG << " - lift to var" << FZENDL;
expr = expr->Var();
}