Switch parameters to proto3, propagate to all code, offer support in all languages

This commit is contained in:
Laurent Perron
2016-02-03 15:15:58 +01:00
parent 801aff49bf
commit bb6e091027
63 changed files with 4407 additions and 2875 deletions

View File

@@ -36,7 +36,7 @@ DEFINE_int32(
size, 0,
"Size of the problem. If equal to 0, will test several increasing sizes.");
DEFINE_bool(use_symmetry, false, "Use Symmetry Breaking methods");
DECLARE_bool(cp_no_solve);
DECLARE_bool(cp_disable_solve);
static const int kNumSolutions[] = {
1, 0, 0, 2, 10, 4, 40, 92, 352, 724, 2680, 14200, 73712, 365596, 2279184};
@@ -174,13 +174,13 @@ void CheckNumberOfSolutions(int size, int num_solutions) {
if (FLAGS_use_symmetry) {
if (size - 1 < kKnownUniqueSolutions) {
CHECK_EQ(num_solutions, kNumUniqueSolutions[size - 1]);
} else if (!FLAGS_cp_no_solve) {
} else if (!FLAGS_cp_disable_solve) {
CHECK_GT(num_solutions, 0);
}
} else {
if (size - 1 < kKnownSolutions) {
CHECK_EQ(num_solutions, kNumSolutions[size - 1]);
} else if (!FLAGS_cp_no_solve) {
} else if (!FLAGS_cp_disable_solve) {
CHECK_GT(num_solutions, 0);
}
}