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

Sort unpacked paths by sharing

Browse Source
This commit is contained in:
Patrick Niklaus 2018-04-23 20:54:18 +00:00 committed by Patrick Niklaus
parent 7a260dc2ba
commit 16f53ff81a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/engine/routing_algorithms/alternative_path_mld.cpp
View File

@ -76,6 +76,7 @@ struct WeightedViaNodePackedPath
// its total weight and the via node used to construct the path. // its total weight and the via node used to construct the path.
struct WeightedViaNodeUnpackedPath struct WeightedViaNodeUnpackedPath
{ {
double sharing;
WeightedViaNode via; WeightedViaNode via;
UnpackedNodes nodes; UnpackedNodes nodes;
UnpackedEdges edges; UnpackedEdges edges;
@ -474,7 +475,7 @@ RandIt filterUnpackedPathsBySharing(RandIt first,
edges.insert(begin(shortest_path.edges), end(shortest_path.edges)); edges.insert(begin(shortest_path.edges), end(shortest_path.edges));
const auto over_sharing_limit = [&](const auto &unpacked) { const auto over_sharing_limit = [&](auto &unpacked) {
if (unpacked.edges.empty()) if (unpacked.edges.empty())
{ // don't remove routes with single-node (empty) path { // don't remove routes with single-node (empty) path
return false; return false;
@ -494,11 +495,11 @@ RandIt filterUnpackedPathsBySharing(RandIt first,
const auto shared_weight = const auto shared_weight =
std::accumulate(begin(unpacked.edges), end(unpacked.edges), EdgeWeight{0}, add_if_seen); std::accumulate(begin(unpacked.edges), end(unpacked.edges), EdgeWeight{0}, add_if_seen);
const auto sharing = shared_weight / static_cast<double>(total_duration); unpacked.sharing = shared_weight / static_cast<double>(total_duration);
BOOST_ASSERT(sharing >= 0.); BOOST_ASSERT(unpacked.sharing >= 0.);
BOOST_ASSERT(sharing <= 1.); BOOST_ASSERT(unpacked.sharing <= 1.);
if (sharing > parameters.kAtMostSameBy) if (unpacked.sharing > parameters.kAtMostSameBy)
{ {
return true; return true;
} }
@ -509,7 +510,10 @@ RandIt filterUnpackedPathsBySharing(RandIt first,
} }
}; };
return std::remove_if(first + 1, last, over_sharing_limit); auto end = std::remove_if(first + 1, last, over_sharing_limit);
std::sort(
first + 1, end, [](const auto &lhs, const auto &rhs) { return lhs.sharing < rhs.sharing; });
return end;
} }
// Filters annotated routes by stretch based on duration. Mutates range in-place. // Filters annotated routes by stretch based on duration. Mutates range in-place.
@ -637,6 +641,7 @@ void unpackPackedPaths(InputIt first,
} }
WeightedViaNodeUnpackedPath unpacked_path{ WeightedViaNodeUnpackedPath unpacked_path{
0.0,
WeightedViaNode{packed_path_via, packed_path_weight}, WeightedViaNode{packed_path_via, packed_path_weight},
std::move(unpacked_nodes), std::move(unpacked_nodes),
std::move(unpacked_edges)}; std::move(unpacked_edges)};