routing: Fix namespace change

google · Aug 9, 2024 · 4c5a620 · 4c5a620
1 parent ea802ab
commit 4c5a620
Show file tree

Hide file tree

Showing 27 changed files with 86 additions and 33 deletions.
diff --git a/examples/cpp/random_tsp.cc b/examples/cpp/random_tsp.cc
@@ -53,7 +53,7 @@ ABSL_FLAG(std::string, routing_search_parameters,
           "Text proto RoutingSearchParameters (possibly partial) that will "
           "override the DefaultRoutingSearchParameters()");
 
-namespace operations_research {
+namespace operations_research::routing {
 
 // Random seed generator.
 int32_t GetSeed() {
@@ -179,10 +179,10 @@ void Tsp() {
     LOG(INFO) << "Specify an instance size greater than 0.";
   }
 }
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 int main(int argc, char** argv) {
   absl::ParseCommandLine(argc, argv);
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
diff --git a/ortools/routing/ils.cc b/ortools/routing/ils.cc
@@ -103,7 +103,7 @@ std::unique_ptr<RuinProcedure> MakeRuinProcedure(
 std::vector<std::unique_ptr<RuinProcedure>> MakeRuinProcedures(
     RoutingModel* model, std::mt19937* rnd,
     const google::protobuf::RepeatedPtrField<
-        ::operations_research::RuinStrategy>& ruin_strategies,
+        ::operations_research::routing::RuinStrategy>& ruin_strategies,
     int num_neighbors_for_route_selection) {
   std::vector<std::unique_ptr<RuinProcedure>> ruin_procedures;
   for (const RuinStrategy& ruin : ruin_strategies) {

diff --git a/ortools/routing/routing.h b/ortools/routing/routing.h
@@ -1970,7 +1970,7 @@ class RoutingModel {
   int64_t GetNumberOfRejectsInFirstSolution(
       const RoutingSearchParameters& search_parameters) const;
   /// Returns the automatic first solution strategy selected.
-  operations_research::FirstSolutionStrategy::Value
+  operations_research::routing::FirstSolutionStrategy::Value
   GetAutomaticFirstSolutionStrategy() const {
     return automatic_first_solution_strategy_;
   }

diff --git a/ortools/routing/samples/simple_routing_program.cc b/ortools/routing/samples/simple_routing_program.cc
@@ -18,6 +18,8 @@
 #include <cstdlib>
 #include <sstream>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -91,7 +93,7 @@ void SimpleRoutingProgram() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::SimpleRoutingProgram();
+  operations_research::routing::SimpleRoutingProgram();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp.cc b/ortools/routing/samples/tsp.cc
@@ -155,7 +155,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_circuit_board.cc b/ortools/routing/samples/tsp_circuit_board.cc
@@ -15,9 +15,12 @@
 // [START import]
 #include <cmath>
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -181,7 +184,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_cities.cc b/ortools/routing/samples/tsp_cities.cc
@@ -13,11 +13,13 @@
 
 // [START program]
 // [START import]
-#include <cmath>
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -128,7 +130,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_cities_routes.cc b/ortools/routing/samples/tsp_cities_routes.cc
@@ -13,11 +13,13 @@
 
 // [START program]
 // [START import]
-#include <cmath>
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -131,7 +133,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/tsp_distance_matrix.cc b/ortools/routing/samples/tsp_distance_matrix.cc
@@ -14,9 +14,12 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -149,7 +152,7 @@ void Tsp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Tsp();
+  operations_research::routing::Tsp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp.cc b/ortools/routing/samples/vrp.cc
@@ -164,7 +164,7 @@ void Vrp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Vrp();
+  operations_research::routing::Vrp();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_breaks.cc b/ortools/routing/samples/vrp_breaks.cc
@@ -21,9 +21,12 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "absl/strings/str_cat.h"
+#include "ortools/base/logging.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
@@ -200,7 +203,7 @@ void VrpBreaks() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpBreaks();
+  operations_research::routing::VrpBreaks();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_capacity.cc b/ortools/routing/samples/vrp_capacity.cc
@@ -14,10 +14,13 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
 #include "google/protobuf/duration.pb.h"
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -186,7 +189,7 @@ void VrpCapacity() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpCapacity();
+  operations_research::routing::VrpCapacity();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_drop_nodes.cc b/ortools/routing/samples/vrp_drop_nodes.cc
@@ -14,10 +14,13 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
 #include "google/protobuf/duration.pb.h"
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -202,7 +205,7 @@ void VrpDropNodes() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpDropNodes();
+  operations_research::routing::VrpDropNodes();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_global_span.cc b/ortools/routing/samples/vrp_global_span.cc
@@ -15,9 +15,12 @@
 // [START import]
 #include <algorithm>
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -165,7 +168,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_initial_routes.cc b/ortools/routing/samples/vrp_initial_routes.cc
@@ -193,6 +193,6 @@ void VrpInitialRoutes() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpInitialRoutes();
+  operations_research::routing::VrpInitialRoutes();
   return EXIT_SUCCESS;
 }
diff --git a/ortools/routing/samples/vrp_pickup_delivery.cc b/ortools/routing/samples/vrp_pickup_delivery.cc
@@ -14,9 +14,12 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -197,7 +200,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_pickup_delivery_fifo.cc b/ortools/routing/samples/vrp_pickup_delivery_fifo.cc
@@ -14,9 +14,12 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -199,7 +202,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_pickup_delivery_lifo.cc b/ortools/routing/samples/vrp_pickup_delivery_lifo.cc
@@ -14,9 +14,12 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -199,7 +202,7 @@ void VrpGlobalSpan() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpGlobalSpan();
+  operations_research::routing::VrpGlobalSpan();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_resources.cc b/ortools/routing/samples/vrp_resources.cc
@@ -14,11 +14,14 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -221,7 +224,7 @@ void VrpTimeWindows() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::VrpTimeWindows();
+  operations_research::routing::VrpTimeWindows();
   return EXIT_SUCCESS;
 }
 // [END program]
diff --git a/ortools/routing/samples/vrp_routes.cc b/ortools/routing/samples/vrp_routes.cc
@@ -14,9 +14,12 @@
 // [START program]
 // [START import]
 #include <cstdint>
+#include <cstdlib>
 #include <sstream>
 #include <vector>
 
+#include "ortools/base/logging.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/routing/enums.pb.h"
 #include "ortools/routing/index_manager.h"
 #include "ortools/routing/parameters.h"
@@ -74,7 +77,7 @@ void PrintSolution(
   DataModel data;
   int64_t total_distance = 0;
   for (int i = 0; i < routes.size(); ++i) {
-    std::vector<RoutingIndexManager::NodeIndex> route = routes[i];
+    const std::vector<RoutingIndexManager::NodeIndex>& route = routes[i];
     int64_t route_distance{0};
     std::stringstream route_text;
     LOG(INFO) << "Route for Vehicle " << i << ":";
@@ -154,7 +157,7 @@ void Vrp() {
 }  // namespace operations_research::routing
 
 int main(int /*argc*/, char* /*argv*/[]) {
-  operations_research::Vrp();
+  operations_research::routing::Vrp();
   return EXIT_SUCCESS;
 }
 // [END program]