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

Do not create large boolean scal prod expr, crr, create the var instead

Browse Source
This commit is contained in:
lperron@google.com
2014-05-25 16:34:08 +00:00
parent c576b93e3e
commit 6eeb140ec6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/constraint_solver/expr_array.cc
View File

@@ -2702,10 +2702,17 @@ IntExpr* MakeScalProdAux(Solver* solver, const std::vector<IntVar*>& vars,
} else {
if (AreAllBooleans(vars)) {
if (AreAllPositive(coefs)) {
if (vars.size() > 8) {
return solver->MakeSum(
solver->RegisterIntExpr(solver->RevAlloc(
new PositiveBooleanScalProd(solver, vars, coefs))),
constant);
solver->RegisterIntExpr(solver->RevAlloc(
new PositiveBooleanScalProd(solver, vars, coefs)))->Var(),
constant);
} else {
return solver->MakeSum(
solver->RegisterIntExpr(solver->RevAlloc(
new PositiveBooleanScalProd(solver, vars, coefs))),
constant);
}
} else {
// If some coefficients are non-positive, partition coefficients in two
// sets, one for the positive coefficients P and one for the negative