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

prefer smaller legs for equal weights in shortest path plugin

Browse Source
This commit is contained in:
Michael Krasnyk 2017-04-04 20:41:39 +02:00
parent cab83555e1
commit 2766c24b42
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/engine/routing_algorithms/shortest_path.cpp
View File

@ -456,20 +456,9 @@ shortestPathSearchImpl(SearchEngineData<Algorithm> &engine_working_data,
total_weight_to_reverse != INVALID_EDGE_WEIGHT); total_weight_to_reverse != INVALID_EDGE_WEIGHT);
// We make sure the fastest route is always in packed_legs_to_forward // We make sure the fastest route is always in packed_legs_to_forward
if (total_weight_to_forward > total_weight_to_reverse) if (total_weight_to_forward < total_weight_to_reverse ||
{ (total_weight_to_forward == total_weight_to_reverse &&
// insert sentinel total_packed_path_to_forward.size() < total_packed_path_to_reverse.size()))
packed_leg_to_reverse_begin.push_back(total_packed_path_to_reverse.size());
BOOST_ASSERT(packed_leg_to_reverse_begin.size() == phantom_nodes_vector.size() + 1);
unpackLegs(facade,
phantom_nodes_vector,
total_packed_path_to_reverse,
packed_leg_to_reverse_begin,
total_weight_to_reverse,
raw_route_data);
}
else
{ {
// insert sentinel // insert sentinel
packed_leg_to_forward_begin.push_back(total_packed_path_to_forward.size()); packed_leg_to_forward_begin.push_back(total_packed_path_to_forward.size());
@ -482,6 +471,19 @@ shortestPathSearchImpl(SearchEngineData<Algorithm> &engine_working_data,
total_weight_to_forward, total_weight_to_forward,
raw_route_data); raw_route_data);
} }
else
{
// insert sentinel
packed_leg_to_reverse_begin.push_back(total_packed_path_to_reverse.size());
BOOST_ASSERT(packed_leg_to_reverse_begin.size() == phantom_nodes_vector.size() + 1);
unpackLegs(facade,
phantom_nodes_vector,
total_packed_path_to_reverse,
packed_leg_to_reverse_begin,
total_weight_to_reverse,
raw_route_data);
}
return raw_route_data; return raw_route_data;
} }