Skip to content

Commit 7f0b66f

Browse files
lperronlperron
committed
Merge branch 'main' of github.com:google/or-tools
2 parents ed1fbc8 + 67de830 commit 7f0b66f

27 files changed

+200
-185
lines changed

‎examples/cpp/binpacking_2d_sat.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
#include "absl/flags/flag.h"
3131
#include "absl/log/check.h"
3232
#include "absl/log/globals.h"
33+
#include "absl/log/log.h"
3334
#include "absl/strings/str_cat.h"
3435
#include "absl/types/span.h"
3536
#include "google/protobuf/text_format.h"
3637
#include "ortools/base/init_google.h"
37-
#include "ortools/base/logging.h"
3838
#include "ortools/base/mathutil.h"
3939
#include "ortools/base/path.h"
4040
#include "ortools/packing/binpacking_2d_parser.h"
@@ -50,7 +50,7 @@ ABSL_FLAG(std::string, params, "", "Sat parameters in text proto format.");
5050
ABSL_FLAG(int, max_bins, 0,
5151
"Maximum number of bins. The 0 default value implies the code will "
5252
"use some heuristics to compute this number.");
53-
ABSL_FLAG(int, symmetry_breaking_level, 2, "Use symmetry breaking constraints");
53+
ABSL_FLAG(int, symmetry_breaking_level, 3, "Use symmetry breaking constraints");
5454
ABSL_FLAG(bool, use_global_cumulative, true,
5555
"Use a global cumulative relaxation");
5656

‎examples/cpp/constraint_programming_cp.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "absl/base/log_severity.h"
2121
#include "absl/log/globals.h"
22+
#include "absl/log/log.h"
2223
#include "ortools/base/init_google.h"
23-
#include "ortools/base/logging.h"
2424
#include "ortools/constraint_solver/constraint_solver.h"
2525

2626
namespace operations_research {

‎examples/cpp/costas_array_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#include "absl/base/log_severity.h"
3232
#include "absl/flags/flag.h"
3333
#include "absl/log/globals.h"
34+
#include "absl/log/log.h"
3435
#include "absl/strings/str_cat.h"
3536
#include "absl/strings/str_format.h"
3637
#include "absl/types/span.h"
3738
#include "ortools/base/init_google.h"
38-
#include "ortools/base/logging.h"
3939
#include "ortools/base/types.h"
4040
#include "ortools/sat/cp_model.h"
4141
#include "ortools/sat/model.h"

‎examples/cpp/golomb_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
#include "absl/flags/flag.h"
3535
#include "absl/log/check.h"
3636
#include "absl/log/globals.h"
37+
#include "absl/log/log.h"
3738
#include "absl/strings/str_format.h"
3839
#include "google/protobuf/text_format.h"
3940
#include "ortools/base/init_google.h"
40-
#include "ortools/base/logging.h"
4141
#include "ortools/sat/cp_model.h"
4242
#include "ortools/sat/model.h"
4343
#include "ortools/util/sorted_interval_list.h"

‎examples/cpp/integer_programming.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
#include "absl/base/log_severity.h"
2121
#include "absl/log/globals.h"
22+
#include "absl/log/log.h"
2223
#include "absl/strings/match.h"
2324
#include "absl/strings/string_view.h"
2425
#include "ortools/base/init_google.h"
25-
#include "ortools/base/logging.h"
2626
#include "ortools/linear_solver/linear_solver.h"
2727

2828
namespace operations_research {

‎examples/cpp/jobshop_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
#include "absl/flags/flag.h"
2525
#include "absl/log/check.h"
2626
#include "absl/log/globals.h"
27+
#include "absl/log/log.h"
2728
#include "absl/strings/str_join.h"
2829
#include "absl/types/span.h"
2930
#include "google/protobuf/text_format.h"
3031
#include "google/protobuf/wrappers.pb.h"
3132
#include "ortools/base/init_google.h"
32-
#include "ortools/base/logging.h"
3333
#include "ortools/graph/connected_components.h"
3434
#include "ortools/sat/cp_model.h"
3535
#include "ortools/sat/cp_model.pb.h"

‎examples/cpp/knapsack_2d_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
#include "absl/flags/flag.h"
2525
#include "absl/log/check.h"
2626
#include "absl/log/globals.h"
27+
#include "absl/log/log.h"
2728
#include "absl/types/span.h"
2829
#include "google/protobuf/text_format.h"
2930
#include "ortools/base/init_google.h"
30-
#include "ortools/base/logging.h"
3131
#include "ortools/packing/binpacking_2d_parser.h"
3232
#include "ortools/packing/multiple_dimensions_bin_packing.pb.h"
3333
#include "ortools/sat/cp_model.h"

‎examples/cpp/linear_programming.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
#include "absl/base/log_severity.h"
2121
#include "absl/log/globals.h"
22+
#include "absl/log/log.h"
2223
#include "absl/strings/match.h"
2324
#include "absl/strings/string_view.h"
2425
#include "ortools/base/commandlineflags.h"
2526
#include "ortools/base/init_google.h"
26-
#include "ortools/base/logging.h"
2727
#include "ortools/linear_solver/linear_solver.h"
2828
#include "ortools/linear_solver/linear_solver.pb.h"
2929

‎examples/cpp/magic_sequence_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include "absl/flags/flag.h"
2727
#include "absl/log/check.h"
2828
#include "absl/log/globals.h"
29+
#include "absl/log/log.h"
2930
#include "absl/strings/str_format.h"
3031
#include "ortools/base/init_google.h"
31-
#include "ortools/base/logging.h"
3232
#include "ortools/sat/cp_model.h"
3333

3434
ABSL_FLAG(int, size, 50, "Size of the problem.");

‎examples/cpp/magic_square_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "absl/base/log_severity.h"
1919
#include "absl/flags/flag.h"
2020
#include "absl/log/globals.h"
21+
#include "absl/log/log.h"
2122
#include "absl/strings/str_format.h"
2223
#include "ortools/base/init_google.h"
23-
#include "ortools/base/logging.h"
2424
#include "ortools/sat/cp_model.h"
2525
#include "ortools/sat/model.h"
2626
#include "ortools/util/sorted_interval_list.h"

‎examples/cpp/max_flow.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include "absl/base/log_severity.h"
1919
#include "absl/log/globals.h"
20+
#include "absl/log/log.h"
2021
#include "ortools/base/init_google.h"
21-
#include "ortools/base/logging.h"
2222
#include "ortools/graph/generic_max_flow.h"
2323
#include "ortools/graph/graph.h"
2424

‎examples/cpp/min_cost_flow.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "absl/base/log_severity.h"
2121
#include "absl/log/globals.h"
22+
#include "absl/log/log.h"
2223
#include "ortools/base/init_google.h"
23-
#include "ortools/base/logging.h"
2424

2525
namespace operations_research {
2626
struct Arc {

‎examples/cpp/mps_driver.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
#include "absl/flags/flag.h"
2525
#include "absl/log/check.h"
2626
#include "absl/log/globals.h"
27+
#include "absl/log/log.h"
2728
#include "absl/status/status.h"
2829
#include "absl/strings/match.h"
2930
#include "absl/strings/str_format.h"
3031
#include "google/protobuf/text_format.h"
3132
#include "ortools/base/helpers.h"
3233
#include "ortools/base/init_google.h"
33-
#include "ortools/base/logging.h"
3434
#include "ortools/base/options.h"
3535
#include "ortools/base/timer.h"
3636
#include "ortools/glop/lp_solver.h"

‎examples/cpp/multi_knapsack_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include "absl/base/log_severity.h"
2727
#include "absl/flags/flag.h"
2828
#include "absl/log/globals.h"
29+
#include "absl/log/log.h"
2930
#include "ortools/base/init_google.h"
30-
#include "ortools/base/logging.h"
3131
#include "ortools/sat/cp_model.h"
3232

3333
ABSL_FLAG(int, size, 16, "scaling factor of the model");

‎examples/cpp/network_routing_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
#include "absl/flags/flag.h"
4242
#include "absl/log/check.h"
4343
#include "absl/log/globals.h"
44+
#include "absl/log/log.h"
4445
#include "absl/random/uniform_int_distribution.h"
4546
#include "absl/strings/str_format.h"
4647
#include "absl/strings/string_view.h"
4748
#include "ortools/base/init_google.h"
48-
#include "ortools/base/logging.h"
4949
#include "ortools/graph/graph.h"
5050
#include "ortools/graph/shortest_paths.h"
5151
#include "ortools/sat/cp_model.h"

‎examples/cpp/pdptw.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
#include "absl/flags/flag.h"
5252
#include "absl/log/check.h"
5353
#include "absl/log/globals.h"
54+
#include "absl/log/log.h"
5455
#include "absl/strings/str_format.h"
5556
#include "absl/strings/string_view.h"
5657
#include "google/protobuf/text_format.h"
5758
#include "ortools/base/init_google.h"
58-
#include "ortools/base/logging.h"
5959
#include "ortools/base/mathutil.h"
6060
#include "ortools/base/timer.h"
6161
#include "ortools/constraint_solver/constraint_solver.h"

‎examples/cpp/random_tsp.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
#include <string>
3030

3131
#include "absl/flags/parse.h"
32+
#include "absl/log/log.h"
3233
#include "absl/random/random.h"
3334
#include "absl/strings/str_cat.h"
3435
#include "google/protobuf/text_format.h"
35-
#include "ortools/base/logging.h"
3636
#include "ortools/routing/index_manager.h"
3737
#include "ortools/routing/parameters.h"
3838
#include "ortools/routing/parameters.pb.h"

‎examples/cpp/shift_minimization_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
#include "absl/flags/flag.h"
3737
#include "absl/log/check.h"
3838
#include "absl/log/globals.h"
39+
#include "absl/log/log.h"
3940
#include "absl/strings/numbers.h"
4041
#include "absl/strings/str_split.h"
4142
#include "absl/strings/string_view.h"
4243
#include "ortools/base/init_google.h"
43-
#include "ortools/base/logging.h"
4444
#include "ortools/sat/cp_model.h"
4545
#include "ortools/sat/model.h"
4646
#include "ortools/util/filelineiter.h"

‎examples/cpp/slitherlink_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
#include "absl/flags/parse.h"
2222
#include "absl/log/check.h"
23+
#include "absl/log/log.h"
2324
#include "absl/strings/str_format.h"
2425
#include "absl/types/span.h"
25-
#include "ortools/base/logging.h"
2626
#include "ortools/sat/cp_model.h"
2727
#include "ortools/sat/cp_model.pb.h"
2828
#include "ortools/sat/cp_model_solver.h"

‎examples/cpp/sports_scheduling_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
#include "absl/flags/flag.h"
5252
#include "absl/log/check.h"
5353
#include "absl/log/globals.h"
54+
#include "absl/log/log.h"
5455
#include "absl/strings/str_cat.h"
5556
#include "absl/strings/str_format.h"
5657
#include "ortools/base/init_google.h"
57-
#include "ortools/base/logging.h"
5858
#include "ortools/sat/cp_model.h"
5959
#include "ortools/sat/cp_model.pb.h"
6060
#include "ortools/sat/model.h"

‎examples/cpp/variable_intervals_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <atomic>
1515

16-
#include "ortools/base/logging.h"
16+
#include "absl/log/log.h"
1717
#include "ortools/sat/cp_model.h"
1818
#include "ortools/sat/cp_model_solver.h"
1919
#include "ortools/sat/sat_parameters.pb.h"

‎examples/cpp/weighted_tardiness_sat.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
#include "absl/flags/flag.h"
2323
#include "absl/log/check.h"
2424
#include "absl/log/globals.h"
25+
#include "absl/log/log.h"
2526
#include "absl/strings/numbers.h"
2627
#include "absl/strings/str_cat.h"
2728
#include "absl/strings/str_split.h"
2829
#include "absl/types/span.h"
2930
#include "ortools/base/init_google.h"
30-
#include "ortools/base/logging.h"
3131
#include "ortools/sat/cp_model.h"
3232
#include "ortools/sat/cp_model.pb.h"
3333
#include "ortools/sat/cp_model_solver.h"

0 commit comments

Comments
 (0)