diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index 994c4cc07..4126cff01 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -108,10 +108,6 @@ void EdgeBasedGraphFactory::GetEdgeBasedNodes( DeallocatingVector< EdgeBasedNode nodes.swap(edgeBasedNodes); } -void EdgeBasedGraphFactory::GetOriginalEdgeData( std::vector< OriginalEdgeData> & oed) { - oed.swap(originalEdgeData); -} - NodeID EdgeBasedGraphFactory::CheckForEmanatingIsOnlyTurn(const NodeID u, const NodeID v) const { std::pair < NodeID, NodeID > restrictionSource = std::make_pair(u, v); RestrictionMap::const_iterator restrIter = _restrictionMap.find(restrictionSource); diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index 2b4c18d7f..0b909b264 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -127,8 +127,6 @@ private: bool belongsToTinyComponent); template double GetAngleBetweenTwoEdges(const CoordinateT& A, const CoordinateT& C, const CoordinateT& B) const; -// SRTMLookup srtmLookup; - public: template< class InputEdgeT > @@ -137,7 +135,6 @@ public: void Run(const char * originalEdgeDataFilename); void GetEdgeBasedEdges( DeallocatingVector< EdgeBasedEdge >& edges ); void GetEdgeBasedNodes( DeallocatingVector< EdgeBasedNode> & nodes); - void GetOriginalEdgeData( std::vector< OriginalEdgeData> & originalEdgeData); TurnInstruction AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w) const; unsigned GetNumberOfNodes() const; }; diff --git a/createHierarchy.cpp b/createHierarchy.cpp index a638fcd18..87e9105c4 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -171,10 +171,6 @@ int main (int argc, char *argv[]) { /*** * Writing info on original (node-based) edges */ - INFO("writing info on original edges"); - std::vector originalEdgeData; - edgeBasedGraphFactory->GetOriginalEdgeData(originalEdgeData); - DeallocatingVector nodeBasedEdgeList; edgeBasedGraphFactory->GetEdgeBasedNodes(nodeBasedEdgeList); delete edgeBasedGraphFactory; @@ -274,5 +270,7 @@ int main (int argc, char *argv[]) { //cleanedEdgeList.clear(); _nodes.clear(); INFO("finished preprocessing"); + + INFO("Edgebased edge list size " << edgeBasedEdgeList.size()); return 0; }