From cf72696d00fe0805a5828af5cc18d5040f003159 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Tue, 4 Mar 2025 21:10:09 +0100 Subject: [PATCH] examples/cpp: backport from main --- examples/cpp/binpacking_2d_sat.cc | 4 ++-- examples/cpp/constraint_programming_cp.cc | 2 +- examples/cpp/costas_array_sat.cc | 2 +- examples/cpp/golomb_sat.cc | 2 +- examples/cpp/integer_programming.cc | 2 +- examples/cpp/jobshop_sat.cc | 2 +- examples/cpp/knapsack_2d_sat.cc | 2 +- examples/cpp/linear_programming.cc | 2 +- examples/cpp/magic_sequence_sat.cc | 2 +- examples/cpp/magic_square_sat.cc | 2 +- examples/cpp/max_flow.cc | 2 +- examples/cpp/min_cost_flow.cc | 2 +- examples/cpp/mps_driver.cc | 2 +- examples/cpp/multi_knapsack_sat.cc | 5 +++-- examples/cpp/network_routing_sat.cc | 2 +- examples/cpp/pdptw.cc | 2 +- examples/cpp/random_tsp.cc | 13 ++++++++++++- examples/cpp/shift_minimization_sat.cc | 2 +- examples/cpp/slitherlink_sat.cc | 2 +- examples/cpp/sports_scheduling_sat.cc | 2 +- examples/cpp/variable_intervals_sat.cc | 2 +- examples/cpp/weighted_tardiness_sat.cc | 2 +- 22 files changed, 36 insertions(+), 24 deletions(-) diff --git a/examples/cpp/binpacking_2d_sat.cc b/examples/cpp/binpacking_2d_sat.cc index c7b82751ac..94bdf73b15 100644 --- a/examples/cpp/binpacking_2d_sat.cc +++ b/examples/cpp/binpacking_2d_sat.cc @@ -30,11 +30,11 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/types/span.h" #include "google/protobuf/text_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/base/mathutil.h" #include "ortools/base/path.h" #include "ortools/packing/binpacking_2d_parser.h" @@ -50,7 +50,7 @@ ABSL_FLAG(std::string, params, "", "Sat parameters in text proto format."); ABSL_FLAG(int, max_bins, 0, "Maximum number of bins. The 0 default value implies the code will " "use some heuristics to compute this number."); -ABSL_FLAG(int, symmetry_breaking_level, 2, "Use symmetry breaking constraints"); +ABSL_FLAG(int, symmetry_breaking_level, 3, "Use symmetry breaking constraints"); ABSL_FLAG(bool, use_global_cumulative, true, "Use a global cumulative relaxation"); diff --git a/examples/cpp/constraint_programming_cp.cc b/examples/cpp/constraint_programming_cp.cc index b7541e619c..d2b2a38556 100644 --- a/examples/cpp/constraint_programming_cp.cc +++ b/examples/cpp/constraint_programming_cp.cc @@ -19,8 +19,8 @@ #include "absl/base/log_severity.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/constraint_solver/constraint_solver.h" namespace operations_research { diff --git a/examples/cpp/costas_array_sat.cc b/examples/cpp/costas_array_sat.cc index 4f96ec69d0..79c6bc75fd 100644 --- a/examples/cpp/costas_array_sat.cc +++ b/examples/cpp/costas_array_sat.cc @@ -31,11 +31,11 @@ #include "absl/base/log_severity.h" #include "absl/flags/flag.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/base/types.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/model.h" diff --git a/examples/cpp/golomb_sat.cc b/examples/cpp/golomb_sat.cc index 1847e10d58..f64da4d5d6 100644 --- a/examples/cpp/golomb_sat.cc +++ b/examples/cpp/golomb_sat.cc @@ -34,10 +34,10 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "google/protobuf/text_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/model.h" #include "ortools/util/sorted_interval_list.h" diff --git a/examples/cpp/integer_programming.cc b/examples/cpp/integer_programming.cc index c8a4ce812a..3b36bdbdcd 100644 --- a/examples/cpp/integer_programming.cc +++ b/examples/cpp/integer_programming.cc @@ -19,10 +19,10 @@ #include "absl/base/log_severity.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/linear_solver/linear_solver.h" namespace operations_research { diff --git a/examples/cpp/jobshop_sat.cc b/examples/cpp/jobshop_sat.cc index c156d31330..c8cbc78295 100644 --- a/examples/cpp/jobshop_sat.cc +++ b/examples/cpp/jobshop_sat.cc @@ -24,12 +24,12 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_join.h" #include "absl/types/span.h" #include "google/protobuf/text_format.h" #include "google/protobuf/wrappers.pb.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/graph/connected_components.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/cp_model.pb.h" diff --git a/examples/cpp/knapsack_2d_sat.cc b/examples/cpp/knapsack_2d_sat.cc index d29fa110e3..276b7fb4a8 100644 --- a/examples/cpp/knapsack_2d_sat.cc +++ b/examples/cpp/knapsack_2d_sat.cc @@ -24,10 +24,10 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/types/span.h" #include "google/protobuf/text_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/packing/binpacking_2d_parser.h" #include "ortools/packing/multiple_dimensions_bin_packing.pb.h" #include "ortools/sat/cp_model.h" diff --git a/examples/cpp/linear_programming.cc b/examples/cpp/linear_programming.cc index ab4d923d4b..c1962f8df1 100644 --- a/examples/cpp/linear_programming.cc +++ b/examples/cpp/linear_programming.cc @@ -19,11 +19,11 @@ #include "absl/base/log_severity.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "ortools/base/commandlineflags.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/linear_solver/linear_solver.h" #include "ortools/linear_solver/linear_solver.pb.h" diff --git a/examples/cpp/magic_sequence_sat.cc b/examples/cpp/magic_sequence_sat.cc index 092db422c2..ad128f1ee2 100644 --- a/examples/cpp/magic_sequence_sat.cc +++ b/examples/cpp/magic_sequence_sat.cc @@ -26,9 +26,9 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" ABSL_FLAG(int, size, 50, "Size of the problem."); diff --git a/examples/cpp/magic_square_sat.cc b/examples/cpp/magic_square_sat.cc index 41b8cc315d..80308645d1 100644 --- a/examples/cpp/magic_square_sat.cc +++ b/examples/cpp/magic_square_sat.cc @@ -18,9 +18,9 @@ #include "absl/base/log_severity.h" #include "absl/flags/flag.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/model.h" #include "ortools/util/sorted_interval_list.h" diff --git a/examples/cpp/max_flow.cc b/examples/cpp/max_flow.cc index f3c60bd707..550939f01b 100644 --- a/examples/cpp/max_flow.cc +++ b/examples/cpp/max_flow.cc @@ -17,8 +17,8 @@ #include "absl/base/log_severity.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/graph/generic_max_flow.h" #include "ortools/graph/graph.h" diff --git a/examples/cpp/min_cost_flow.cc b/examples/cpp/min_cost_flow.cc index fabecde571..865e321e6d 100644 --- a/examples/cpp/min_cost_flow.cc +++ b/examples/cpp/min_cost_flow.cc @@ -19,8 +19,8 @@ #include "absl/base/log_severity.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" namespace operations_research { struct Arc { diff --git a/examples/cpp/mps_driver.cc b/examples/cpp/mps_driver.cc index 5f3279e9c0..fe871642ac 100644 --- a/examples/cpp/mps_driver.cc +++ b/examples/cpp/mps_driver.cc @@ -24,13 +24,13 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_format.h" #include "google/protobuf/text_format.h" #include "ortools/base/helpers.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/base/options.h" #include "ortools/base/timer.h" #include "ortools/glop/lp_solver.h" diff --git a/examples/cpp/multi_knapsack_sat.cc b/examples/cpp/multi_knapsack_sat.cc index 2bc12a69b8..476165d8bf 100644 --- a/examples/cpp/multi_knapsack_sat.cc +++ b/examples/cpp/multi_knapsack_sat.cc @@ -20,19 +20,20 @@ // of each items. #include +#include #include #include #include "absl/base/log_severity.h" #include "absl/flags/flag.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" ABSL_FLAG(int, size, 16, "scaling factor of the model"); ABSL_FLAG(std::string, params, - "num_workers:8,log_search_progress:true,max_time_in_seconds:10.0", + "num_workers:8,log_search_progress:false,max_time_in_seconds:10.0", "Sat parameters"); namespace operations_research { namespace sat { diff --git a/examples/cpp/network_routing_sat.cc b/examples/cpp/network_routing_sat.cc index c28d7c36f0..dea1177834 100644 --- a/examples/cpp/network_routing_sat.cc +++ b/examples/cpp/network_routing_sat.cc @@ -41,11 +41,11 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/random/uniform_int_distribution.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/graph/graph.h" #include "ortools/graph/shortest_paths.h" #include "ortools/sat/cp_model.h" diff --git a/examples/cpp/pdptw.cc b/examples/cpp/pdptw.cc index 9d832a62d6..8dfeecf258 100644 --- a/examples/cpp/pdptw.cc +++ b/examples/cpp/pdptw.cc @@ -51,11 +51,11 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "google/protobuf/text_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/base/mathutil.h" #include "ortools/base/timer.h" #include "ortools/constraint_solver/routing.h" diff --git a/examples/cpp/random_tsp.cc b/examples/cpp/random_tsp.cc index dc0fbac89c..ca044f4bf8 100644 --- a/examples/cpp/random_tsp.cc +++ b/examples/cpp/random_tsp.cc @@ -25,14 +25,22 @@ // (forbidden arcs). #include +#include #include +#include #include +#include "absl/base/log_severity.h" +#include "absl/flags/flag.h" #include "absl/flags/parse.h" +#include "absl/log/check.h" +#include "absl/log/globals.h" +#include "absl/log/initialize.h" +#include "absl/log/log.h" #include "absl/random/random.h" #include "absl/strings/str_cat.h" #include "google/protobuf/text_format.h" -#include "ortools/base/logging.h" +#include "ortools/constraint_solver/constraint_solver.h" #include "ortools/constraint_solver/routing.h" #include "ortools/constraint_solver/routing_index_manager.h" #include "ortools/constraint_solver/routing_parameters.h" @@ -182,6 +190,9 @@ void Tsp() { } // namespace operations_research int main(int argc, char** argv) { + absl::InitializeLog(); + absl::EnableLogPrefix(false); + absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo); absl::ParseCommandLine(argc, argv); operations_research::Tsp(); return EXIT_SUCCESS; diff --git a/examples/cpp/shift_minimization_sat.cc b/examples/cpp/shift_minimization_sat.cc index f069e3967d..81d3123b73 100644 --- a/examples/cpp/shift_minimization_sat.cc +++ b/examples/cpp/shift_minimization_sat.cc @@ -36,11 +36,11 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/model.h" #include "ortools/util/filelineiter.h" diff --git a/examples/cpp/slitherlink_sat.cc b/examples/cpp/slitherlink_sat.cc index 5622ce7152..a0a9e7358a 100644 --- a/examples/cpp/slitherlink_sat.cc +++ b/examples/cpp/slitherlink_sat.cc @@ -20,9 +20,9 @@ #include "absl/flags/parse.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/cp_model.pb.h" #include "ortools/sat/cp_model_solver.h" diff --git a/examples/cpp/sports_scheduling_sat.cc b/examples/cpp/sports_scheduling_sat.cc index 44e933116e..ffc7c09251 100644 --- a/examples/cpp/sports_scheduling_sat.cc +++ b/examples/cpp/sports_scheduling_sat.cc @@ -51,10 +51,10 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/cp_model.pb.h" #include "ortools/sat/model.h" diff --git a/examples/cpp/variable_intervals_sat.cc b/examples/cpp/variable_intervals_sat.cc index c72d738009..3c5d8a25ea 100644 --- a/examples/cpp/variable_intervals_sat.cc +++ b/examples/cpp/variable_intervals_sat.cc @@ -13,7 +13,7 @@ #include -#include "ortools/base/logging.h" +#include "absl/log/log.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/cp_model_solver.h" #include "ortools/sat/sat_parameters.pb.h" diff --git a/examples/cpp/weighted_tardiness_sat.cc b/examples/cpp/weighted_tardiness_sat.cc index fef2d176f6..a91e53c101 100644 --- a/examples/cpp/weighted_tardiness_sat.cc +++ b/examples/cpp/weighted_tardiness_sat.cc @@ -22,12 +22,12 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/types/span.h" #include "ortools/base/init_google.h" -#include "ortools/base/logging.h" #include "ortools/sat/cp_model.h" #include "ortools/sat/cp_model.pb.h" #include "ortools/sat/cp_model_solver.h"