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

[CP-SAT] deprecate BooleanSum and BooleanScalProd in favor of Sum and ScalProd

Browse Source
This commit is contained in:
Laurent Perron
2021-12-08 16:29:40 +01:00
parent da59aadfe1
commit 2d22667f30
11 changed files with 149 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/cpp/magic_sequence_sat.cc
View File

@@ -47,7 +47,7 @@ void MagicSequence(int size) {
// Domain constraint on each position.
for (int i = 0; i < size; ++i) {
cp_model.AddEquality(LinearExpr::BooleanSum(var_domains[i]), 1);
cp_model.AddEquality(LinearExpr::Sum(var_domains[i]), 1);
}
// The number of variables equal to j shall be the value of vars[j].
@@ -60,8 +60,8 @@ void MagicSequence(int size) {
for (int i = 0; i < size; ++i) {
vars_equal_to_j.push_back(var_domains[i][j]);
}
cp_model.AddEquality(LinearExpr::BooleanScalProd(var_domains[j], values),
LinearExpr::BooleanSum(vars_equal_to_j));
cp_model.AddEquality(LinearExpr::ScalProd(var_domains[j], values),
LinearExpr::Sum(vars_equal_to_j));
}
const CpSolverResponse response =