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

Use duration and not weight for sharing

Browse Source
This commit is contained in:
Patrick Niklaus 2018-04-22 16:34:08 +00:00 committed by Patrick Niklaus
parent b51632a2fb
commit 61101db8cf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,21 +473,21 @@ RandIt filterUnpackedPathsBySharing(RandIt first,
return false; return false;
} }
EdgeWeight total_weight = 0; EdgeWeight total_duration = 0;
const auto add_if_seen = [&](const EdgeWeight weight, const EdgeID edge) { const auto add_if_seen = [&](const EdgeWeight duration, const EdgeID edge) {
auto edge_weight = facade.GetEdgeData(edge).weight; auto edge_duration = facade.GetEdgeData(edge).duration;
total_weight += edge_weight; total_duration += edge_duration;
if (edges.count(edge) > 0) if (edges.count(edge) > 0)
{ {
return weight + edge_weight; return duration + edge_duration;
} }
return weight; return duration;
}; };
const auto shared_weight = const auto shared_weight =
std::accumulate(begin(unpacked.edges), end(unpacked.edges), 0, add_if_seen); std::accumulate(begin(unpacked.edges), end(unpacked.edges), 0, add_if_seen);
const auto sharing = shared_weight / static_cast<double>(total_weight); const auto sharing = shared_weight / static_cast<double>(total_duration);
BOOST_ASSERT(sharing >= 0.); BOOST_ASSERT(sharing >= 0.);
BOOST_ASSERT(sharing <= 1.); BOOST_ASSERT(sharing <= 1.);