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

remove boolean parameter from C++ examples

Browse Source
This commit is contained in:
lperron@google.com
2012-01-16 11:03:56 +00:00
parent 451fb5d78a
commit c79d678107
7 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/costas_array.cc
View File

@@ -403,7 +403,7 @@ void CostasHard(const int dim) {
vars[m]->SetMin(1);
}
solver.AddConstraint(solver.MakeAllDifferent(matrix, false));
solver.AddConstraint(solver.MakeAllDifferent(matrix));
int index = dim;
@@ -417,7 +417,7 @@ void CostasHard(const int dim) {
subset[j] = diff;
}
solver.AddConstraint(solver.MakeAllDifferent(subset, false));
solver.AddConstraint(solver.MakeAllDifferent(subset));
}
DecisionBuilder* const db = solver.MakePhase(vars,

2
examples/cryptarithm.cc
View File

@@ -50,7 +50,7 @@ void Cryptoarithmetics() {
letters.push_back(r);
letters.push_back(y);
solver.AddConstraint(solver.MakeAllDifferent(letters, false));
solver.AddConstraint(solver.MakeAllDifferent(letters));
// carry variables
IntVar* c1 = solver.MakeIntVar(0, 1, "c1");

3
examples/golomb.cc
View File

@@ -33,7 +33,6 @@
#include "base/stringprintf.h"
#include "constraint_solver/constraint_solver.h"
DEFINE_bool(use_range, false, "If true, use AllDifferenceRange.");
DEFINE_bool(print, false, "If true, print the minimal solution.");
DEFINE_int32(size, 0,
"Size of the problem. If equal to 0, will test several increasing sizes.");
@@ -67,7 +66,7 @@ void GolombRuler(int size) {
diff->SetMin(1);
}
}
s.AddConstraint(s.MakeAllDifferent(diffs, FLAGS_use_range));
s.AddConstraint(s.MakeAllDifferent(diffs));
OptimizeVar* const length = s.MakeMinimize(ticks[size-1], 1);
SolutionCollector* const collector = s.MakeLastSolutionCollector();

2
examples/magic_square.cc
View File

@@ -50,7 +50,7 @@ void MagicSquare(int grid_size) {
// create the variables
std::vector<IntVar*> vars;
solver.MakeIntVarArray(total_size, 1, total_size, "", &vars);
solver.AddConstraint(solver.MakeAllDifferent(vars, true));
solver.AddConstraint(solver.MakeAllDifferent(vars));
// create the constraints
std::vector<IntVar*> diag1(grid_size);

4
examples/network_routing.cc
View File

@@ -432,8 +432,8 @@ class NetworkRoutingSolver {
solver.AddConstraint(solver.MakeEquality(node_vars[0], demand.source));
solver.AddConstraint(solver.MakeEquality(node_vars[max_length - 1],
demand.destination));
solver.AddConstraint(solver.MakeAllDifferent(arc_vars, true));
solver.AddConstraint(solver.MakeAllDifferent(node_vars, true));
solver.AddConstraint(solver.MakeAllDifferent(arc_vars));
solver.AddConstraint(solver.MakeAllDifferent(node_vars));
DecisionBuilder* const db = solver.MakePhase(node_vars,
Solver::CHOOSE_FIRST_UNBOUND,
Solver::ASSIGN_MIN_VALUE);

7
examples/nqueens.cc
View File

@@ -28,7 +28,6 @@
#include "base/map-util.h"
#include "constraint_solver/constraint_solveri.h"
DEFINE_bool(use_range, false, "If true, use AllDifferenceRange.");
DEFINE_bool(print, false, "If true, print one of the solution.");
DEFINE_bool(print_all, false, "If true, print all the solutions.");
DEFINE_int32(nb_loops, 1,
@@ -198,17 +197,17 @@ void NQueens(int size) {
for (int i = 0; i < size; ++i) {
queens.push_back(s.MakeIntVar(0, size - 1, StringPrintf("queen%04d", i)));
}
s.AddConstraint(s.MakeAllDifferent(queens, FLAGS_use_range));
s.AddConstraint(s.MakeAllDifferent(queens));
std::vector<IntVar*> vars(size);
for (int i = 0; i < size; ++i) {
vars[i] = s.MakeSum(queens[i], i)->Var();
}
s.AddConstraint(s.MakeAllDifferent(vars, FLAGS_use_range));
s.AddConstraint(s.MakeAllDifferent(vars));
for (int i = 0; i < size; ++i) {
vars[i] = s.MakeSum(queens[i], -i)->Var();
}
s.AddConstraint(s.MakeAllDifferent(vars, FLAGS_use_range));
s.AddConstraint(s.MakeAllDifferent(vars));
SolutionCollector* const solution_counter = s.MakeAllSolutionCollector(NULL);
SolutionCollector* const collector = s.MakeFirstSolutionCollector();

6
examples/sports_scheduling.cc
View File

@@ -137,7 +137,7 @@ void ComputeOneDayTuples(int num_teams, std::vector<std::vector<int> >* day_tupl
&signed_opponents);
// All Diff constraint.
solver.AddConstraint(solver.MakeAllDifferent(opponents, true));
solver.AddConstraint(solver.MakeAllDifferent(opponents));
// Cannot play against itself
for (int i = 0; i < num_teams; ++i) {
@@ -215,13 +215,13 @@ void AddOneTeamConstraints(Solver* const solver,
for (int day = 0; day < half_season; ++day) {
tmp_vars.push_back(opponents[half * half_season + day]);
}
solver->AddConstraint(solver->MakeAllDifferent(tmp_vars, true));
solver->AddConstraint(solver->MakeAllDifferent(tmp_vars));
}
}
// We meet each opponent once at home and once away per full season.
for (int team_index = 0; team_index < num_teams; ++team_index) {
solver->AddConstraint(solver->MakeAllDifferent(signed_opponents, true));
solver->AddConstraint(solver->MakeAllDifferent(signed_opponents));
}
// Constraint per team on home_aways;