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

Fixes Alternative Routing when including loops

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-01-28 15:26:56 +01:00
parent a48f02e0da
commit 603b83e1c3
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
features/testbot/alternative_loop.feature Normal file
View File

@ -0,0 +1,29 @@
@routing @testbot @alternative
Feature: Alternative route
Background:
Given the profile "testbot"
Scenario: Alternative Loop Paths
Given the node map
| a | 2 | 1 | b |
| 7 | | | 4 |
| 8 | | | 3 |
| c | 5 | 6 | d |
And the ways
| nodes | oneway |
| ab | yes |
| bd | yes |
| dc | yes |
| ca | yes |
And the query options
| alt | true |
When I route I should get
| from | to | route | alternative |
| 1 | 2 | ab,bd,dc,ca,ab | |
| 3 | 4 | bd,dc,ca,ab,bd | |
| 5 | 6 | dc,ca,ab,bd,dc | |
| 7 | 8 | ca,ab,bd,dc,ca | |

11
include/engine/routing_algorithms/alternative_path.hpp
View File

@ -156,8 +156,10 @@ class AlternativeRouting final
std::vector<NodeID> packed_forward_path; std::vector<NodeID> packed_forward_path;
std::vector<NodeID> packed_reverse_path; std::vector<NodeID> packed_reverse_path;
if (upper_bound_to_shortest_path_distance != const bool path_is_a_loop =
forward_heap1.GetKey(middle_node) + reverse_heap1.GetKey(middle_node)) upper_bound_to_shortest_path_distance !=
forward_heap1.GetKey(middle_node) + reverse_heap1.GetKey(middle_node);
if (path_is_a_loop)
{ {
// Self Loop // Self Loop
BOOST_ASSERT(forward_heap1.GetData(middle_node).parent == middle_node && BOOST_ASSERT(forward_heap1.GetData(middle_node).parent == middle_node &&
@ -239,6 +241,8 @@ class AlternativeRouting final
std::vector<NodeID> preselected_node_list; std::vector<NodeID> preselected_node_list;
for (const NodeID node : via_node_candidate_list) for (const NodeID node : via_node_candidate_list)
{ {
if (node == middle_node)
continue;
const auto fwd_iterator = approximated_forward_sharing.find(node); const auto fwd_iterator = approximated_forward_sharing.find(node);
const int fwd_sharing = const int fwd_sharing =
(fwd_iterator != approximated_forward_sharing.end()) ? fwd_iterator->second : 0; (fwd_iterator != approximated_forward_sharing.end()) ? fwd_iterator->second : 0;
@ -265,10 +269,13 @@ class AlternativeRouting final
} }
std::vector<NodeID> &packed_shortest_path = packed_forward_path; std::vector<NodeID> &packed_shortest_path = packed_forward_path;
if (!path_is_a_loop)
{
std::reverse(packed_shortest_path.begin(), packed_shortest_path.end()); std::reverse(packed_shortest_path.begin(), packed_shortest_path.end());
packed_shortest_path.emplace_back(middle_node); packed_shortest_path.emplace_back(middle_node);
packed_shortest_path.insert(packed_shortest_path.end(), packed_reverse_path.begin(), packed_shortest_path.insert(packed_shortest_path.end(), packed_reverse_path.begin(),
packed_reverse_path.end()); packed_reverse_path.end());
}
std::vector<RankedCandidateNode> ranked_candidates_list; std::vector<RankedCandidateNode> ranked_candidates_list;
// prioritizing via nodes for deep inspection // prioritizing via nodes for deep inspection