From a9fdabf92668687827299968ca1da0592fbd69a6 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Sun, 22 Sep 2013 22:18:54 +0200 Subject: [PATCH] moving common code into function --- RoutingAlgorithms/ShortestPathRouting.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h index b5157fb1d..f3c4686b5 100644 --- a/RoutingAlgorithms/ShortestPathRouting.h +++ b/RoutingAlgorithms/ShortestPathRouting.h @@ -34,6 +34,10 @@ class ShortestPathRouting : public BasicRoutingInterface{ typedef SearchEngineData::QueryHeap QueryHeap; SearchEngineData & engine_working_data; + int ComputeEdgeOffset(const PhantomNode & phantom) { + return phantom.weight1 + (phantom.isBidirected() ? phantom.weight2 : 0); + } + public: ShortestPathRouting( DataFacadeT * facade, @@ -142,8 +146,12 @@ public: ); // INFO("rv2: " << phantom_node_pair.targetPhantom.edgeBasedNode+1 << ", w;" << phantom_node_pair.targetPhantom.weight2 ); } - const int forward_offset = phantom_node_pair.startPhantom.weight1 + (phantom_node_pair.startPhantom.isBidirected() ? phantom_node_pair.startPhantom.weight2 : 0); - const int reverse_offset = phantom_node_pair.targetPhantom.weight1 + (phantom_node_pair.targetPhantom.isBidirected() ? phantom_node_pair.targetPhantom.weight2 : 0); + const int forward_offset = ComputeEdgeOffset( + phantom_node_pair.startPhantom + ); + const int reverse_offset = ComputeEdgeOffset( + phantom_node_pair.targetPhantom + ); //run two-Target Dijkstra routing step. while(0 < (forward_heap1.Size() + reverse_heap1.Size() )){