From 006a8833d3e186596d1b4f50492ff77eaeacacf9 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Fri, 1 Apr 2016 00:18:59 +0200 Subject: [PATCH] Fix some of the accidental forced loops in viaroute --- include/engine/routing_algorithms/shortest_path.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/engine/routing_algorithms/shortest_path.hpp b/include/engine/routing_algorithms/shortest_path.hpp index 488c16522..972093174 100644 --- a/include/engine/routing_algorithms/shortest_path.hpp +++ b/include/engine/routing_algorithms/shortest_path.hpp @@ -160,18 +160,17 @@ class ShortestPathRouting final reverse_core_heap.Clear(); BOOST_ASSERT(forward_core_heap.Size() == 0); BOOST_ASSERT(reverse_core_heap.Size() == 0); - super::SearchWithCore(forward_heap, reverse_heap, forward_core_heap, - reverse_core_heap, new_total_distance_to_forward, - leg_packed_path_forward, - super::NeedsLoopForward(source_phantom, target_phantom), - super::NeedsLoopBackwards(source_phantom, target_phantom)); + super::SearchWithCore( + forward_heap, reverse_heap, forward_core_heap, reverse_core_heap, + new_total_distance_to_forward, leg_packed_path_forward, + super::NeedsLoopForward(source_phantom, target_phantom), DO_NOT_FORCE_LOOP); } else { super::Search(forward_heap, reverse_heap, new_total_distance_to_forward, leg_packed_path_forward, super::NeedsLoopForward(source_phantom, target_phantom), - super::NeedsLoopBackwards(source_phantom, target_phantom)); + DO_NOT_FORCE_LOOP); } }