routing: fix namespace routing in wrappers

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

Hide file tree

Showing 13 changed files with 112 additions and 109 deletions.
diff --git a/ortools/routing/csharp/index_manager.i b/ortools/routing/csharp/index_manager.i
@@ -19,13 +19,13 @@
 #include "ortools/routing/index_manager.h"
 %}
 
-DEFINE_INDEX_TYPE_TYPEDEF(operations_research::RoutingNodeIndex,
-                          operations_research::RoutingIndexManager::NodeIndex);
+DEFINE_INDEX_TYPE_TYPEDEF(operations_research::routing::RoutingNodeIndex,
+                          operations_research::routing::RoutingIndexManager::NodeIndex);
 
 %ignoreall
 
-%unignore operations_research;
-namespace operations_research {
+%unignore operations_research::routing;
+namespace operations_research::routing {
 
 %unignore RoutingIndexManager;
 %unignore RoutingIndexManager::GetStartIndex;
@@ -45,7 +45,7 @@ namespace operations_research {
 %rename (GetNumberOfIndices) RoutingIndexManager::num_indices;
 %unignore RoutingIndexManager::~RoutingIndexManager;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %include "ortools/routing/index_manager.h"
 

diff --git a/ortools/routing/csharp/routing.i b/ortools/routing/csharp/routing.i
@@ -48,11 +48,11 @@ JAGGED_MATRIX_AS_CSHARP_ARRAY(int64_t, int64_t, long, Int64VectorVector);
 // We need to forward-declare the proto here, so that PROTO_INPUT involving it
 // works correctly. The order matters very much: this declaration needs to be
 // before the %{ #include ".../routing.h" %}.
-namespace operations_research {
+namespace operations_research::routing {
 class RoutingModelParameters;
 class RoutingSearchParameters;
 class RoutingSearchStatus;
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %module(directors="1") RoutingGlobals;
 
@@ -68,22 +68,22 @@ class RoutingSearchStatus;
 
 // RoutingModel methods.
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingCostClassIndex,
-    operations_research::RoutingModel::CostClassIndex);
+    operations_research::routing::RoutingCostClassIndex,
+    operations_research::routing::RoutingModel::CostClassIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingDimensionIndex,
-    operations_research::RoutingModel::DimensionIndex);
+    operations_research::routing::RoutingDimensionIndex,
+    operations_research::routing::RoutingModel::DimensionIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingDisjunctionIndex,
-    operations_research::RoutingModel::DisjunctionIndex);
+    operations_research::routing::RoutingDisjunctionIndex,
+    operations_research::routing::RoutingModel::DisjunctionIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingVehicleClassIndex,
-    operations_research::RoutingModel::VehicleClassIndex);
+    operations_research::routing::RoutingVehicleClassIndex,
+    operations_research::routing::RoutingModel::VehicleClassIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingResourceClassIndex,
-    operations_research::RoutingModel::ResourceClassIndex);
+    operations_research::routing::RoutingResourceClassIndex,
+    operations_research::routing::RoutingModel::ResourceClassIndex);
 
-namespace operations_research {
+namespace operations_research::routing {
 
 // GlobalVehicleBreaksConstraint
 %unignore GlobalVehicleBreaksConstraint;
@@ -219,7 +219,7 @@ using Google.OrTools.ConstraintSolver;
 %unignore TypeRegulationsChecker;
 %ignore TypeRegulationsChecker::CheckVehicle;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %rename("%(camelcase)s", %$isfunction) "";
 
@@ -230,17 +230,17 @@ using Google.OrTools.ConstraintSolver;
 %}
 
 // Protobuf support
-PROTO_INPUT(operations_research::RoutingSearchParameters,
+PROTO_INPUT(operations_research::routing::RoutingSearchParameters,
             Google.OrTools.Routing.RoutingSearchParameters,
             search_parameters)
-PROTO_INPUT(operations_research::RoutingModelParameters,
+PROTO_INPUT(operations_research::routing::RoutingModelParameters,
             Google.OrTools.Routing.RoutingModelParameters,
             parameters)
-PROTO2_RETURN(operations_research::RoutingSearchParameters,
+PROTO2_RETURN(operations_research::routing::RoutingSearchParameters,
               Google.OrTools.Routing.RoutingSearchParameters)
-PROTO2_RETURN(operations_research::RoutingModelParameters,
+PROTO2_RETURN(operations_research::routing::RoutingModelParameters,
               Google.OrTools.Routing.RoutingModelParameters)
-PROTO_ENUM_RETURN(operations_research::RoutingSearchStatus::Value,
+PROTO_ENUM_RETURN(operations_research::routing::RoutingSearchStatus::Value,
                   Google.OrTools.Routing.RoutingSearchStatus.Types.Value)
 
 // Add needed import to RoutingGlobals.cs

diff --git a/ortools/routing/csharp/types.i b/ortools/routing/csharp/types.i
@@ -70,22 +70,22 @@ JAGGED_MATRIX_AS_CSHARP_ARRAY(IndexT, int, int, IntVectorVector);
 %apply const std::vector<std::vector<IndexT> >& { const std::vector<std::vector<NewIndexT> >& };
 %enddef  // DEFINE_INDEX_TYPE_TYPEDEF
 
-DEFINE_INDEX_TYPE(operations_research::RoutingNodeIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingCostClassIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingDimensionIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingDisjunctionIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingVehicleClassIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingResourceClassIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingNodeIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingCostClassIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingDimensionIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingDisjunctionIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingVehicleClassIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingResourceClassIndex);
 
 %ignoreall
 
-%unignore operations_research;
-namespace operations_research {
+%unignore operations_research::routing;
+namespace operations_research::routing {
 
 // PickupDeliveryPair
 %unignore PickupDeliveryPair;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %include "ortools/routing/types.h"
 

diff --git a/ortools/routing/enums.proto b/ortools/routing/enums.proto
@@ -19,7 +19,7 @@ option java_package = "com.google.ortools.routing";
 option java_multiple_files = true;
 option csharp_namespace = "Google.OrTools.Routing";
 
-package operations_research;
+package operations_research.routing;
 
 // First solution strategies, used as starting point of local search.
 message FirstSolutionStrategy {

diff --git a/ortools/routing/ils.proto b/ortools/routing/ils.proto
@@ -27,7 +27,7 @@ option csharp_namespace = "Google.OrTools.Routing";
 
 import "ortools/routing/enums.proto";
 
-package operations_research;
+package operations_research.routing;
 
 // Ruin strategy that removes a number of spatially close routes.
 message SpatiallyCloseRoutesRuinStrategy {

diff --git a/ortools/routing/java/index_manager.i b/ortools/routing/java/index_manager.i
@@ -20,13 +20,13 @@
 #include "ortools/routing/index_manager.h"
 %}
 
-DEFINE_INDEX_TYPE_TYPEDEF(operations_research::RoutingNodeIndex,
-                          operations_research::RoutingIndexManager::NodeIndex);
+DEFINE_INDEX_TYPE_TYPEDEF(operations_research::routing::RoutingNodeIndex,
+                          operations_research::routing::RoutingIndexManager::NodeIndex);
 
 %ignoreall
 
-%unignore operations_research;
-namespace operations_research {
+%unignore operations_research::routing;
+namespace operations_research::routing {
 
 %unignore RoutingIndexManager;
 %unignore RoutingIndexManager::~RoutingIndexManager;
@@ -46,7 +46,7 @@ namespace operations_research {
 %rename (nodeToIndex) RoutingIndexManager::NodeToIndex;
 %rename (nodesToIndices) RoutingIndexManager::NodesToIndices;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %include "ortools/routing/index_manager.h"
 

diff --git a/ortools/routing/java/routing.i b/ortools/routing/java/routing.i
@@ -29,13 +29,13 @@
 // We need to forward-declare the proto here, so that PROTO_INPUT involving it
 // works correctly. The order matters very much: this declaration needs to be
 // before the %{ #include ".../routing.h" %}.
-namespace operations_research {
+namespace operations_research::routing {
 class RoutingModelParameters;
 class RoutingSearchParameters;
 
 class RoutingSearchStatus;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 // Include the files we want to wrap a first time.
 %{
@@ -49,22 +49,22 @@ class RoutingSearchStatus;
 
 // RoutingModel methods.
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingCostClassIndex,
-    operations_research::RoutingModel::CostClassIndex);
+    operations_research::routing::RoutingCostClassIndex,
+    operations_research::routing::RoutingModel::CostClassIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingDimensionIndex,
-    operations_research::RoutingModel::DimensionIndex);
+    operations_research::routing::RoutingDimensionIndex,
+    operations_research::routing::RoutingModel::DimensionIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingDisjunctionIndex,
-    operations_research::RoutingModel::DisjunctionIndex);
+    operations_research::routing::RoutingDisjunctionIndex,
+    operations_research::routing::RoutingModel::DisjunctionIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingVehicleClassIndex,
-    operations_research::RoutingModel::VehicleClassIndex);
+    operations_research::routing::RoutingVehicleClassIndex,
+    operations_research::routing::RoutingModel::VehicleClassIndex);
 DEFINE_INDEX_TYPE_TYPEDEF(
-    operations_research::RoutingResourceClassIndex,
-    operations_research::RoutingModel::ResourceClassIndex);
+    operations_research::routing::RoutingResourceClassIndex,
+    operations_research::routing::RoutingModel::ResourceClassIndex);
 
-namespace operations_research {
+namespace operations_research::routing {
 
 // GlobalVehicleBreaksConstraint
 %typemap(javaimports) GlobalVehicleBreaksConstraint %{
@@ -342,7 +342,7 @@ import com.google.ortools.constraintsolver.Constraint;
 %rename (getBoundCost) SimpleBoundCosts::bound_cost;
 %rename (getSize) SimpleBoundCosts::Size;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 // Generic rename rules.
 %rename (buildSolution) *::BuildSolution;
@@ -410,17 +410,17 @@ import java.lang.Runnable;
 %}
 
 // Protobuf support
-PROTO_INPUT(operations_research::RoutingSearchParameters,
+PROTO_INPUT(operations_research::routing::RoutingSearchParameters,
             com.google.ortools.routing.RoutingSearchParameters,
             search_parameters)
-PROTO_INPUT(operations_research::RoutingModelParameters,
+PROTO_INPUT(operations_research::routing::RoutingModelParameters,
             com.google.ortools.routing.RoutingModelParameters,
             parameters)
-PROTO2_RETURN(operations_research::RoutingSearchParameters,
+PROTO2_RETURN(operations_research::routing::RoutingSearchParameters,
               com.google.ortools.routing.RoutingSearchParameters)
-PROTO2_RETURN(operations_research::RoutingModelParameters,
+PROTO2_RETURN(operations_research::routing::RoutingModelParameters,
               com.google.ortools.routing.RoutingModelParameters)
-PROTO_ENUM_RETURN(operations_research::RoutingSearchStatus::Value,
+PROTO_ENUM_RETURN(operations_research::routing::RoutingSearchStatus::Value,
                   com.google.ortools.routing.RoutingSearchStatus.Value)
 
 // Wrap types.h, parameters.h according to the SWIG style guide.
@@ -437,15 +437,15 @@ import com.google.ortools.constraintsolver.Assignment;
 import com.google.ortools.constraintsolver.IntVar;
 %}
 
-namespace operations_research {
+namespace operations_research::routing {
 // Globals
 // IMPORTANT(user): These functions from parameters.h are global, so in Java
 // they are in the Globals.java (import com.[...].routing.Globals).
 %rename (defaultRoutingSearchParameters) DefaultRoutingSearchParameters;
 %rename (defaultRoutingModelParameters) DefaultRoutingModelParameters;
 %rename (findErrorInRoutingSearchParameters) FindErrorInRoutingSearchParameters;
 %rename (makeSetValuesFromTargets) MakeSetValuesFromTargets;
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %include "ortools/routing/types.h"
 %include "ortools/routing/parameters.h"

diff --git a/ortools/routing/java/types.i b/ortools/routing/java/types.i
@@ -81,9 +81,9 @@ MATRIX_AS_JAVA_ARRAY(IndexT, int, Int);
 %apply const std::vector<std::vector<IndexT> >& { const std::vector<std::vector<NewIndexT> >& };
 %enddef  // DEFINE_INDEX_TYPE_TYPEDEF
 
-DEFINE_INDEX_TYPE(operations_research::RoutingNodeIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingCostClassIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingDimensionIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingDisjunctionIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingVehicleClassIndex);
-DEFINE_INDEX_TYPE(operations_research::RoutingResourceClassIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingNodeIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingCostClassIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingDimensionIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingDisjunctionIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingVehicleClassIndex);
+DEFINE_INDEX_TYPE(operations_research::routing::RoutingResourceClassIndex);
diff --git a/ortools/routing/parameters.proto b/ortools/routing/parameters.proto
@@ -28,7 +28,7 @@ import "ortools/routing/ils.proto";
 import "ortools/sat/sat_parameters.proto";
 import "ortools/util/optional_boolean.proto";
 
-package operations_research;
+package operations_research.routing;
 
 // Parameters defining the search used to solve vehicle routing problems.
 //

diff --git a/ortools/routing/python/index_manager.i b/ortools/routing/python/index_manager.i
@@ -21,14 +21,13 @@
 #include "ortools/routing/index_manager.h"
 %}
 
-DEFINE_INDEX_TYPE_TYPEDEF(operations_research::RoutingNodeIndex,
-                          operations_research::RoutingIndexManager::NodeIndex);
+DEFINE_INDEX_TYPE_TYPEDEF(operations_research::routing::RoutingNodeIndex,
+                          operations_research::routing::RoutingIndexManager::NodeIndex);
 
 %ignoreall
 
-%unignore operations_research;
-
-namespace operations_research {
+%unignore operations_research::routing;
+namespace operations_research::routing {
 
 %unignore RoutingIndexManager;
 %unignore RoutingIndexManager::GetStartIndex;
@@ -47,7 +46,7 @@ namespace operations_research {
 %rename (GetNumberOfIndices) RoutingIndexManager::num_indices;
 %unignore RoutingIndexManager::~RoutingIndexManager;
 
-}  // namespace operations_research
+}  // namespace operations_research::routing
 
 %include "ortools/routing/index_manager.h"
 

diff --git a/ortools/routing/python/model.cc b/ortools/routing/python/model.cc
@@ -33,13 +33,13 @@
 #include "pybind11_protobuf/native_proto_caster.h"
 
 using ::operations_research::Assignment;
-using ::operations_research::DefaultRoutingModelParameters;
-using ::operations_research::DefaultRoutingSearchParameters;
-using ::operations_research::RoutingDimension;
-using ::operations_research::RoutingIndexManager;
-using ::operations_research::RoutingModel;
-using ::operations_research::RoutingModelParameters;
-using ::operations_research::RoutingSearchParameters;
+using ::operations_research::routing::DefaultRoutingModelParameters;
+using ::operations_research::routing::DefaultRoutingSearchParameters;
+using ::operations_research::routing::RoutingDimension;
+using ::operations_research::routing::RoutingIndexManager;
+using ::operations_research::routing::RoutingModel;
+using ::operations_research::routing::RoutingModelParameters;
+using ::operations_research::routing::RoutingSearchParameters;
 using ::pybind11::arg;
 
 PYBIND11_MODULE(model, m) {