From be29c7fca00e003ebadc5d870b85dae31ba76067 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 23 Sep 2013 18:59:43 +0200 Subject: [PATCH] call facade where appropriate --- RoutingAlgorithms/AlternativePathRouting.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RoutingAlgorithms/AlternativePathRouting.h b/RoutingAlgorithms/AlternativePathRouting.h index 6953171ef..11817bb24 100644 --- a/RoutingAlgorithms/AlternativePathRouting.h +++ b/RoutingAlgorithms/AlternativePathRouting.h @@ -41,7 +41,7 @@ const double VIAPATH_GAMMA = 0.75; //alternative shares at most 75% with the s template class AlternativeRouting : private BasicRoutingInterface { typedef BasicRoutingInterface super; - typedef SearchEngineData::QueryGraph SearchGraph; + // typedef SearchEngineData::QueryGraph SearchGraph; typedef SearchEngineData::QueryHeap QueryHeap; typedef std::pair SearchSpaceEdge; @@ -379,7 +379,7 @@ private: } for ( EdgeID edge = facade->BeginEdges( node ); edge < facade->EndEdges(node); edge++ ) { - const typename SearchGraph::EdgeData & data = facade->GetEdgeData(edge); + const typename DataFacadeT::EdgeData & data = facade->GetEdgeData(edge); bool forwardDirectionFlag = (forwardDirection ? data.forward : data.backward ); if(forwardDirectionFlag) { @@ -469,7 +469,7 @@ private: EdgeID edgeIDInViaPath = facade->FindEdgeInEitherDirection(viaPathEdge.first, viaPathEdge.second); if(UINT_MAX == edgeIDInViaPath) return false; - typename SearchGraph::EdgeData currentEdgeData = facade->GetEdgeData(edgeIDInViaPath); + typename DataFacadeT::EdgeData currentEdgeData = facade->GetEdgeData(edgeIDInViaPath); bool IsViaEdgeShortCut = currentEdgeData.shortcut; if (IsViaEdgeShortCut) { const NodeID middleOfViaPath = currentEdgeData.id; @@ -510,7 +510,7 @@ private: EdgeID edgeIDInViaPath = facade->FindEdgeInEitherDirection(viaPathEdge.first, viaPathEdge.second); if(UINT_MAX == edgeIDInViaPath) return false; - typename SearchGraph::EdgeData currentEdgeData = facade->GetEdgeData(edgeIDInViaPath); + typename DataFacadeT::EdgeData currentEdgeData = facade->GetEdgeData(edgeIDInViaPath); const bool IsViaEdgeShortCut = currentEdgeData.shortcut; if (IsViaEdgeShortCut) { const NodeID middleOfViaPath = currentEdgeData.id;