Fix some of the accidental forced loops in viaroute

This commit is contained in:
Patrick Niklaus 2016-04-01 00:18:59 +02:00
parent 8111baa8f9
commit 006a8833d3

View File

@ -160,18 +160,17 @@ class ShortestPathRouting final
reverse_core_heap.Clear(); reverse_core_heap.Clear();
BOOST_ASSERT(forward_core_heap.Size() == 0); BOOST_ASSERT(forward_core_heap.Size() == 0);
BOOST_ASSERT(reverse_core_heap.Size() == 0); BOOST_ASSERT(reverse_core_heap.Size() == 0);
super::SearchWithCore(forward_heap, reverse_heap, forward_core_heap, super::SearchWithCore(
reverse_core_heap, new_total_distance_to_forward, forward_heap, reverse_heap, forward_core_heap, reverse_core_heap,
leg_packed_path_forward, new_total_distance_to_forward, leg_packed_path_forward,
super::NeedsLoopForward(source_phantom, target_phantom), super::NeedsLoopForward(source_phantom, target_phantom), DO_NOT_FORCE_LOOP);
super::NeedsLoopBackwards(source_phantom, target_phantom));
} }
else else
{ {
super::Search(forward_heap, reverse_heap, new_total_distance_to_forward, super::Search(forward_heap, reverse_heap, new_total_distance_to_forward,
leg_packed_path_forward, leg_packed_path_forward,
super::NeedsLoopForward(source_phantom, target_phantom), super::NeedsLoopForward(source_phantom, target_phantom),
super::NeedsLoopBackwards(source_phantom, target_phantom)); DO_NOT_FORCE_LOOP);
} }
} }