diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h index 6d8e442d4..2a80ab124 100644 --- a/Contractor/Contractor.h +++ b/Contractor/Contractor.h @@ -143,8 +143,6 @@ public: forwardEdge.target = backwardEdge.target = target; forwardEdge.data.forward = backwardEdge.data.backward = true; forwardEdge.data.backward = backwardEdge.data.forward = false; -// forwardEdge.data.turnInstruction = backwardEdge.data.turnInstruction = turnType; -// forwardEdge.data.nameID = backwardEdge.data.nameID = edges[i].data.nameID; forwardEdge.data.shortcut = backwardEdge.data.shortcut = false; forwardEdge.data.id = backwardEdge.data.id = id; forwardEdge.data.originalEdges = backwardEdge.data.originalEdges = 1; diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index bc3b8677f..89f57c4a3 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -129,7 +129,7 @@ EdgeBasedGraphFactory::EdgeBasedGraphFactory(int nodes, std::vector& outputEdgeList ) { +void EdgeBasedGraphFactory::GetEdgeBasedEdges(std::vector< EdgeBasedEdge >& outputEdgeList ) { GUARANTEE(0 == outputEdgeList.size(), "Vector passed to EdgeBasedGraphFactory::GetEdgeBasedEdges(..) is not empty"); GUARANTEE(0 != edgeBasedEdges.size(), "No edges in edge based graph"); diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index 2f85cc903..32520d655 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -103,7 +103,7 @@ private: RestrictionMap _restrictionMap; - stxxl::vector edgeBasedEdges; + std::vector edgeBasedEdges; std::vector edgeBasedNodes; std::vector originalEdgeData; std::vector inputNodeInfoList; @@ -127,7 +127,7 @@ public: explicit EdgeBasedGraphFactory(int nodes, std::vector & inputEdges, std::vector & _bollardNodes, std::vector & trafficLights, std::vector<_Restriction> & inputRestrictions, std::vector & nI, boost::property_tree::ptree speedProfile, std::string & srtm); void Run(); - void GetEdgeBasedEdges( stxxl::vector< EdgeBasedEdge >& edges ); + void GetEdgeBasedEdges( std::vector< EdgeBasedEdge >& edges ); void GetEdgeBasedNodes( std::vector< EdgeBasedNode> & nodes); void GetOriginalEdgeData( std::vector< OriginalEdgeData> & originalEdgeData); short AnalyzeTurn(const NodeID u, const NodeID v, const NodeID w) const;