Remove logging code; use absl one

Dependencies.txt

@@ -1,5 +1,5 @@
 Protobuf=v21.12
-abseil-cpp=20220623.1
+abseil-cpp=20230125.0
 Cbc=2.10.7
 Cgl=0.60.5
 Clp=1.17.7

cmake/dependencies/CMakeLists.txt

@@ -80,8 +80,8 @@ if(BUILD_absl)
   FetchContent_Declare(
     absl
     GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
-    GIT_TAG "20220623.1"
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20220623.1.patch")
+    GIT_TAG "20230125.0"
+  )
   FetchContent_MakeAvailable(absl)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")

cmake/deps.cmake

@@ -39,6 +39,11 @@ set(ABSL_DEPS
   absl::flags_commandlineflag
   absl::flags_parse
   absl::flags_usage
+  absl::log
+  absl::log_globals
+  absl::log_initialize
+  absl::check
+  absl::die_if_null
   absl::cord
   absl::random_random
   absl::raw_hash_set
@@ -144,4 +149,3 @@ if(BUILD_PYTHON)
     find_package(pybind11 REQUIRED)
   endif()
 endif()
-

cmake/glop.cmake

@@ -243,6 +243,11 @@ target_link_libraries(glop PUBLIC
   absl::memory
   absl::hash
   absl::flags
+  absl::log
+  absl::log_globals
+  absl::log_initialize
+  absl::check
+  absl::die_if_null
   absl::status
   absl::time
   absl::strings

examples/cpp/constraint_programming_cp.cc

@@ -13,6 +13,7 @@
 
 // Constraint programming example that shows how to use the API.
 
+#include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 

examples/cpp/course_scheduling.cc

@@ -21,12 +21,12 @@
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/status.h"
-#include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/mathutil.h"
+#include "ortools/base/numbers.h"
 #include "ortools/base/status_macros.h"
 #include "ortools/linear_solver/linear_solver.h"
 #include "ortools/scheduling/course_scheduling.pb.h"

examples/cpp/frequency_assignment_problem.cc

@@ -49,15 +49,17 @@
 #include <algorithm>
 #include <cstdint>
 #include <map>
+#include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/flags/parse.h"
-#include "absl/flags/usage.h"
+#include "absl/container/btree_map.h"
+#include "absl/strings/string_view.h"
 #include "examples/cpp/fap_model_printer.h"
 #include "examples/cpp/fap_parser.h"
 #include "examples/cpp/fap_utilities.h"
 #include "ortools/base/commandlineflags.h"
+#include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/map_util.h"
 #include "ortools/constraint_solver/constraint_solver.h"
@@ -174,7 +176,7 @@ class OrderingBuilder : public DecisionBuilder {
                   const std::vector<FapConstraint>& data_constraints,
                   const std::vector<IntVar*>& variables,
                   const std::vector<IntVar*>& violated_constraints,
-                  const std::map<int, int>& index_from_key)
+                  const absl::btree_map<int, int>& index_from_key)
       : data_variables_(data_variables),
         data_constraints_(data_constraints),
         variables_(variables),
@@ -312,7 +314,7 @@ class OrderingBuilder : public DecisionBuilder {
   const std::vector<FapConstraint> data_constraints_;
   const std::vector<IntVar*> variables_;
   const std::vector<IntVar*> violated_constraints_;
-  const std::map<int, int> index_from_key_;
+  const absl::btree_map<int, int> index_from_key_;
   // Used by Next() for monitoring decisions.
   const int size_;
   int iter_;
@@ -365,7 +367,7 @@ int64_t ValueEvaluator(
   }
   std::pair<int64_t, int64_t> new_value_ranking =
       std::make_pair(new_value, new_ranking);
-  gtl::InsertOrUpdate(value_evaluator_map, variable_index, new_value_ranking);
+  value_evaluator_map->insert_or_assign(variable_index, new_value_ranking);
 
   return new_ranking;
 }
@@ -384,7 +386,7 @@ int64_t VariableEvaluator(const std::vector<int>& key_from_index,
 // Creates the variables of the solver from the parsed data.
 void CreateModelVariables(const std::map<int, FapVariable>& data_variables,
                           Solver* solver, std::vector<IntVar*>* model_variables,
-                          std::map<int, int>* index_from_key,
+                          absl::btree_map<int, int>* index_from_key,
                           std::vector<int>* key_from_index) {
   CHECK(solver != nullptr);
   CHECK(model_variables != nullptr);
@@ -399,7 +401,7 @@ void CreateModelVariables(const std::map<int, FapVariable>& data_variables,
   for (const auto& it : data_variables) {
     CHECK_LT(index, model_variables->size());
     (*model_variables)[index] = solver->MakeIntVar(it.second.domain);
-    gtl::InsertOrUpdate(index_from_key, it.first, index);
+    index_from_key->insert_or_assign(it.first, index);
     (*key_from_index)[index] = it.first;
 
     if ((it.second.initial_position != -1) && (it.second.hard)) {
@@ -414,7 +416,7 @@ void CreateModelVariables(const std::map<int, FapVariable>& data_variables,
 // Creates the constraints of the instance from the parsed data.
 void CreateModelConstraints(const std::vector<FapConstraint>& data_constraints,
                             const std::vector<IntVar*>& variables,
-                            const std::map<int, int>& index_from_key,
+                            const absl::btree_map<int, int>& index_from_key,
                             Solver* solver) {
   CHECK(solver != nullptr);
 
@@ -516,14 +518,14 @@ void CreateAdditionalMonitors(OptimizeVar* const objective, Solver* solver,
 // of frequencies used to the solution.
 void HardFapSolver(const std::map<int, FapVariable>& data_variables,
                    const std::vector<FapConstraint>& data_constraints,
-                   const std::string& data_objective,
+                   absl::string_view data_objective,
                    const std::vector<int>& values) {
   Solver solver("HardFapSolver");
   std::vector<SearchMonitor*> monitors;
 
   // Create Model Variables.
   std::vector<IntVar*> variables;
-  std::map<int, int> index_from_key;
+  absl::btree_map<int, int> index_from_key;
   std::vector<int> key_from_index;
   CreateModelVariables(data_variables, &solver, &variables, &index_from_key,
                        &key_from_index);
@@ -636,10 +638,10 @@ void SplitVariablesHardSoft(const std::map<int, FapVariable>& data_variables,
     if (it.second.initial_position != -1) {
       if (it.second.hard) {
         CHECK_LT(it.second.mobility_cost, 0);
-        gtl::InsertOrUpdate(hard_variables, it.first, it.second);
+        hard_variables->insert_or_assign(it.first, it.second);
       } else {
         CHECK_GE(it.second.mobility_cost, 0);
-        gtl::InsertOrUpdate(soft_variables, it.first, it.second);
+        soft_variables->insert_or_assign(it.first, it.second);
       }
     }
   }
@@ -664,7 +666,7 @@ void SplitConstraintHardSoft(const std::vector<FapConstraint>& data_constraints,
 // the instance.
 void PenalizeVariablesViolation(
     const std::map<int, FapVariable>& soft_variables,
-    const std::map<int, int>& index_from_key,
+    const absl::btree_map<int, int>& index_from_key,
     const std::vector<IntVar*>& variables, std::vector<IntVar*>* cost,
     Solver* solver) {
   for (const auto& it : soft_variables) {
@@ -682,7 +684,7 @@ void PenalizeVariablesViolation(
 void PenalizeConstraintsViolation(
     const std::vector<FapConstraint>& constraints,
     const std::vector<FapConstraint>& soft_constraints,
-    const std::map<int, int>& index_from_key,
+    const absl::btree_map<int, int>& index_from_key,
     const std::vector<IntVar*>& variables, std::vector<IntVar*>* cost,
     std::vector<IntVar*>* violated_constraints, Solver* solver) {
   int violated_constraints_index = 0;
@@ -729,7 +731,7 @@ void PenalizeConstraintsViolation(
 // equal to 0 denotes that the instance is feasible.
 int SoftFapSolver(const std::map<int, FapVariable>& data_variables,
                   const std::vector<FapConstraint>& data_constraints,
-                  const std::string& data_objective,
+                  absl::string_view data_objective,
                   const std::vector<int>& values) {
   Solver solver("SoftFapSolver");
   std::vector<SearchMonitor*> monitors;
@@ -751,7 +753,7 @@ int SoftFapSolver(const std::map<int, FapVariable>& data_variables,
 
   // Create Model Variables.
   std::vector<IntVar*> variables;
-  std::map<int, int> index_from_key;
+  absl::btree_map<int, int> index_from_key;
   std::vector<int> key_from_index;
   CreateModelVariables(data_variables, &solver, &variables, &index_from_key,
                        &key_from_index);
@@ -860,8 +862,7 @@ void SolveProblem(const std::map<int, FapVariable>& variables,
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  google::InitGoogleLogging(argv[0]);
-  absl::ParseCommandLine(argc, argv);
+  InitGoogle(argv[0], &argc, &argv, true);
 
   CHECK(!absl::GetFlag(FLAGS_directory).empty())
       << "Requires --directory=<directory name>";

examples/cpp/linear_programming.cc

@@ -121,7 +121,6 @@ void RunAllExamples() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  absl::SetFlag(&FLAGS_alsologtostderr, true);
   InitGoogle(argv[0], &argc, &argv, true);
   operations_research::RunAllExamples();
   return EXIT_SUCCESS;

examples/cpp/max_flow.cc

@@ -13,6 +13,7 @@
 
 #include "ortools/graph/max_flow.h"
 
+#include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 
 namespace operations_research {

examples/cpp/min_cost_flow.cc

@@ -13,6 +13,7 @@
 
 #include "ortools/graph/min_cost_flow.h"
 
+#include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 
 namespace operations_research {

examples/cpp/mps_driver.cc

@@ -17,6 +17,7 @@
 #include <stdio.h>
 
 #include <string>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
@@ -25,6 +26,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/file.h"
+#include "ortools/base/helpers.h"
 #include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/timer.h"
@@ -68,6 +70,10 @@ using operations_research::glop::ToDouble;
 void ReadGlopParameters(GlopParameters* parameters) {
   if (!absl::GetFlag(FLAGS_params_file).empty()) {
     std::string params;
+    operations_research::file::GetContents(
+        absl::GetFlag(FLAGS_params_file), &params,
+        operations_research::file::Defaults())
+        .CheckSuccess();
     CHECK(TextFormat::ParseFromString(params, parameters)) << params;
   }
   if (!absl::GetFlag(FLAGS_params).empty()) {

examples/cpp/nqueens.cc

@@ -20,6 +20,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <map>
+#include <vector>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_format.h"

examples/cpp/sat_runner.cc

@@ -30,7 +30,6 @@
 #include "examples/cpp/sat_cnf_reader.h"
 #include "google/protobuf/text_format.h"
 #include "ortools/algorithms/sparse_permutation.h"
-#include "ortools/base/flags.h"
 #include "ortools/base/helpers.h"
 #include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
@@ -453,6 +452,6 @@ int main(int argc, char** argv) {
   // to be set before InitGoogle() which has the nice side-effect of allowing
   // the user to override it.
   InitGoogle(kUsage, &argc, &argv, /*remove_flags=*/true);
-  absl::SetFlag(&FLAGS_alsologtostderr, true);
+  absl::SetFlag(&FLAGS_logtostderr, true);
   return operations_research::sat::Run();
 }

examples/cpp/strawberry_fields_with_column_generation.cc

@@ -633,7 +633,6 @@ int main(int argc, char** argv) {
     found = true;
   }
 #endif
-
   if (!found) {
     LOG(ERROR) << "Unknown solver " << absl::GetFlag(FLAGS_colgen_solver);
     return 1;

examples/cpp/uncapacitated_facility_location.cc

@@ -28,6 +28,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/integral_types.h"
+#include "ortools/base/init_google.h"
 #include "ortools/base/logging.h"
 #include "ortools/linear_solver/linear_solver.h"
 #include "ortools/util/random_engine.h"

examples/tests/init_test.cc

@@ -25,7 +25,6 @@ void TestLogging() {
 void TestFlags() {
   LOG(INFO) << "Test Flags";
   auto cpp_flags = CppFlags();
-  cpp_flags.logtostderr = true;
   cpp_flags.log_prefix = true;
   cpp_flags.cp_model_dump_prefix = "init";
   cpp_flags.cp_model_dump_models = true;

examples/tests/lp_test.cc

@@ -13,6 +13,7 @@
 
 // Linear programming example that shows how to use the API.
 
+#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"

ortools/algorithms/BUILD.bazel

@@ -145,6 +145,7 @@ cc_library(
         "//ortools/graph:util",
         "//ortools/util:stats",
         "//ortools/util:time_limit",
+        "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
     ],

ortools/algorithms/find_graph_symmetries.cc

@@ -24,6 +24,7 @@
 
 #include "absl/algorithm/container.h"
 #include "absl/container/flat_hash_set.h"
+#include "absl/flags/flag.h"
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
@@ -34,7 +35,6 @@
 #include "ortools/algorithms/dynamic_partition.h"
 #include "ortools/algorithms/dynamic_permutation.h"
 #include "ortools/algorithms/sparse_permutation.h"
-#include "ortools/base/commandlineflags.h"
 #include "ortools/graph/iterators.h"
 #include "ortools/graph/util.h"