rework ortools samples (#4590)

Author: Mizux

ortools/algorithms/samples/knapsack.cc

@@ -21,7 +21,10 @@
 #include <sstream>
 #include <vector>
 
+#include "absl/base/log_severity.h"
+#include "absl/log/globals.h"
 #include "ortools/algorithms/knapsack_solver.h"
+#include "ortools/base/init_google.h"
 // [END import]
 
 namespace operations_research {
@@ -86,6 +89,8 @@ void RunKnapsackExample() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
+  InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::RunKnapsackExample();
   return EXIT_SUCCESS;
 }

ortools/algorithms/samples/simple_knapsack_program.cc

@@ -21,8 +21,11 @@
 #include <sstream>
 #include <vector>
 
+#include "absl/base/log_severity.h"
+#include "absl/log/globals.h"
 #include "absl/log/log.h"
 #include "ortools/algorithms/knapsack_solver.h"
+#include "ortools/base/init_google.h"
 // [END import]
 
 namespace operations_research {
@@ -80,7 +83,9 @@ void SimpleKnapsackProgram() {
 }  // namespace algorithms
 }  // namespace operations_research
 
-int main() {
+int main(int argc, char* argv[]) {
+  InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::algorithms::SimpleKnapsackProgram();
   return EXIT_SUCCESS;
 }

ortools/base/init_google.h

@@ -14,11 +14,26 @@
 #ifndef OR_TOOLS_BASE_INIT_GOOGLE_H_
 #define OR_TOOLS_BASE_INIT_GOOGLE_H_
 
-#include "absl/flags/declare.h"
-#include "absl/flags/flag.h"
+#include "absl/flags/declare.h"  // IWYU pragma: keep
+#include "absl/flags/flag.h"     // IWYU pragma: keep
 #include "absl/flags/parse.h"
 #include "absl/flags/usage.h"
 #include "absl/log/initialize.h"
+#include "absl/strings/string_view.h"
+
+namespace google {
+
+inline void InitGoogleLogging(absl::string_view usage) {
+  absl::InitializeLog();
+  if (!usage.empty()) {
+    absl::SetProgramUsageMessage(usage);
+  }
+}
+
+inline void ShutdownGoogleLogging() {}  // No op.
+
+}  // namespace google
+
 // Initializes misc google-related things in the binary.
 //
 // Typically called early on in main() and must be called before other
@@ -31,22 +46,15 @@
 //         requirement for an element (*argv)[*argc] to exist or to have
 //         any particular value, unlike the similar array that is passed
 //         to the `main` function.
-inline void InitGoogle(const char* usage, int* argc, char*** argv,
+inline void InitGoogle(absl::string_view usage, int* argc, char*** argv,
                        bool deprecated) {
-  absl::InitializeLog();
-  absl::SetProgramUsageMessage(usage);
+  google::InitGoogleLogging(usage);
   absl::ParseCommandLine(*argc, *argv);
 }
 
-namespace google {
-
-inline void InitGoogleLogging(const std::string& usage) {
-  absl::InitializeLog();
-  absl::SetProgramUsageMessage(usage);
+inline void InitGoogle(const char* usage, int* argc, char*** argv,
+                       bool deprecated) {
+  InitGoogle(absl::NullSafeStringView(usage), argc, argv, deprecated);
 }
 
-inline void ShutdownGoogleLogging() {}  // No op.
-
-}  // namespace google
-
 #endif  // OR_TOOLS_BASE_INIT_GOOGLE_H_

ortools/constraint_solver/samples/cp_is_fun_cp.cc

@@ -148,8 +148,8 @@ void CPIsFunCp() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::CPIsFunCp();
   return EXIT_SUCCESS;
 }

ortools/constraint_solver/samples/minimal_jobshop_cp.cc

@@ -198,8 +198,8 @@ void SolveJobShopExample() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::SolveJobShopExample();
   return EXIT_SUCCESS;
 }

ortools/constraint_solver/samples/nqueens_cp.cc

@@ -19,6 +19,9 @@
 #include <sstream>
 #include <vector>
 
+#include "absl/base/log_severity.h"
+#include "absl/log/globals.h"
+#include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 // [END import]
@@ -102,7 +105,9 @@ void NQueensCp(const int board_size) {
 
 }  // namespace operations_research
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
+  InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   int board_size = 8;
   if (argc > 1) {
     board_size = std::atoi(argv[1]);

ortools/constraint_solver/samples/nurses_cp.cc

@@ -205,8 +205,8 @@ void SolveNursesExample() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::SolveNursesExample();
   return EXIT_SUCCESS;
 }

ortools/constraint_solver/samples/rabbits_and_pheasants_cp.cc

@@ -61,8 +61,8 @@ void RunConstraintProgrammingExample() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::RunConstraintProgrammingExample();
   return EXIT_SUCCESS;
 }

ortools/constraint_solver/samples/simple_cp_program.cc

@@ -16,6 +16,9 @@
 #include <ostream>
 #include <string>
 
+#include "absl/base/log_severity.h"
+#include "absl/log/globals.h"
+#include "ortools/base/init_google.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 // [END import]
 
@@ -73,7 +76,9 @@ void SimpleCpProgram() {
 
 }  // namespace operations_research
 
-int main(int /*argc*/, char* /*argv*/[]) {
+int main(int argc, char* argv[]) {
+  InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::SimpleCpProgram();
   return EXIT_SUCCESS;
 }

ortools/constraint_solver/samples/simple_ls_program.cc

@@ -202,8 +202,8 @@ void SolveProblem(SolveType solve_type) {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   InitGoogle(argv[0], &argc, &argv, true);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
   operations_research::SolveProblem(operations_research::LNS);
   operations_research::SolveProblem(operations_research::LS);
   operations_research::SolveProblem(operations_research::LS_WITH_FILTER);