always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

routing: Export from Google to GitHub

Browse Source
This commit is contained in:
Corentin Le Molgat
2021-02-19 10:34:31 +01:00
parent 27e4fdb01d
commit 241d79d698
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ortools/constraint_solver/csharp/routing_index_manager.i
View File

@@ -30,17 +30,22 @@ DEFINE_INDEX_TYPE_TYPEDEF(operations_research::RoutingNodeIndex,
namespace operations_research {
%unignore RoutingIndexManager;
%unignore RoutingIndexManager::RoutingIndexManager(int, int, NodeIndex);
%unignore RoutingIndexManager::RoutingIndexManager(int, int, const std::vector<NodeIndex>&, const std::vector<NodeIndex>&);
%unignore RoutingIndexManager::~RoutingIndexManager;
%unignore RoutingIndexManager::GetStartIndex;
%unignore RoutingIndexManager::GetEndIndex;
%rename (GetNumberOfNodes) RoutingIndexManager::num_nodes;
%rename (GetNumberOfVehicles) RoutingIndexManager::num_vehicles;
%rename (GetNumberOfIndices) RoutingIndexManager::num_indices;
%unignore RoutingIndexManager::IndexToNode;
%unignore RoutingIndexManager::NodeToIndex;
%unignore RoutingIndexManager::NodesToIndices;
%unignore RoutingIndexManager::RoutingIndexManager(
int, int,
NodeIndex);
%unignore RoutingIndexManager::RoutingIndexManager(
int, int,
const std::vector<NodeIndex>&,
const std::vector<NodeIndex>&);
%rename (GetNumberOfNodes) RoutingIndexManager::num_nodes;
%rename (GetNumberOfVehicles) RoutingIndexManager::num_vehicles;
%rename (GetNumberOfIndices) RoutingIndexManager::num_indices;
%unignore RoutingIndexManager::~RoutingIndexManager;
} // namespace operations_research

9
ortools/constraint_solver/java/routing_index_manager.i
View File

@@ -30,9 +30,14 @@ DEFINE_INDEX_TYPE_TYPEDEF(operations_research::RoutingNodeIndex,
namespace operations_research {
%unignore RoutingIndexManager;
%unignore RoutingIndexManager::RoutingIndexManager(int, int, NodeIndex);
%unignore RoutingIndexManager::RoutingIndexManager(int, int, const std::vector<NodeIndex>&, const std::vector<NodeIndex>&);
%unignore RoutingIndexManager::~RoutingIndexManager;
%unignore RoutingIndexManager::RoutingIndexManager(
int, int,
NodeIndex);
%unignore RoutingIndexManager::RoutingIndexManager(
int, int,
const std::vector<NodeIndex>&,
const std::vector<NodeIndex>&);
%rename (getStartIndex) RoutingIndexManager::GetStartIndex;
%rename (getEndIndex) RoutingIndexManager::GetEndIndex;
%rename (getNumberOfNodes) RoutingIndexManager::num_nodes;

6
ortools/constraint_solver/python/routing_index_manager.i
View File

@@ -36,9 +36,11 @@ namespace operations_research {
%unignore RoutingIndexManager::IndexToNode;
%unignore RoutingIndexManager::NodeToIndex;
%unignore RoutingIndexManager::RoutingIndexManager(
int, int, NodeIndex);
int, int,
NodeIndex);
%unignore RoutingIndexManager::RoutingIndexManager(
int, int, const std::vector<NodeIndex>&,
int, int,
const std::vector<NodeIndex>&,
const std::vector<NodeIndex>&);
%rename (GetNumberOfNodes) RoutingIndexManager::num_nodes;
%rename (GetNumberOfVehicles) RoutingIndexManager::num_vehicles;

4
ortools/constraint_solver/routing.cc
View File

@@ -771,7 +771,7 @@ int RegisterUnaryCallback(RoutingTransitCallback1 callback, bool is_positive,
int RoutingModel::RegisterUnaryTransitVector(std::vector<int64> values) {
return RegisterUnaryCallback(
[this, values](int64 i) {
[this, values = std::move(values)](int64 i) {
return values[manager_.IndexToNode(i).value()];
},
/*is_positive=*/
@@ -800,7 +800,7 @@ int RoutingModel::RegisterTransitMatrix(
}
}
return RegisterCallback(
[this, values](int64 i, int64 j) {
[this, values = std::move(values)](int64 i, int64 j) {
return values[manager_.IndexToNode(i).value()]
[manager_.IndexToNode(j).value()];
},