Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Generalize manyToManySearch and remove duplications

Browse Source
This commit is contained in:
Michael Krasnyk
2017-06-30 23:45:00 +02:00
committed by Patrick Niklaus
parent 517cb5f094
commit 3534203083
3 changed files with 79 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/routing_algorithms.hpp
+2 -1
View File
@@ -157,7 +157,8 @@ RoutingAlgorithms<Algorithm>::ManyToManySearch(const std::vector<PhantomNode> &p
const std::vector<std::size_t> &source_indices,
const std::vector<std::size_t> &target_indices) const
{
return manyToManySearch(heaps, facade, phantom_nodes, source_indices, target_indices);
return routing_algorithms::manyToManySearch(
heaps, facade, phantom_nodes, source_indices, target_indices);
}
template <typename Algorithm>
include/engine/routing_algorithms/many_to_many.hpp
+1 -13
View File
@@ -16,25 +16,13 @@ namespace engine
namespace routing_algorithms
{
namespace ch
{
template <typename Algorithm>
std::vector<EdgeWeight>
manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
const datafacade::ContiguousInternalMemoryDataFacade<Algorithm> &facade,
const std::vector<PhantomNode> &phantom_nodes,
const std::vector<std::size_t> &source_indices,
const std::vector<std::size_t> &target_indices);
} // namespace ch
namespace mld
{
std::vector<EdgeWeight>
manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
const datafacade::ContiguousInternalMemoryDataFacade<Algorithm> &facade,
const std::vector<PhantomNode> &phantom_nodes,
const std::vector<std::size_t> &source_indices,
const std::vector<std::size_t> &target_indices);
} // namespace mld
} // namespace routing_algorithms
} // namespace engine