Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git

Browse Source
This commit is contained in:
DennisOSRM 2012-01-31 14:51:59 +01:00
commit c686d28675
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -146,7 +146,7 @@ void EdgeBasedGraphFactory::Run() {
} }
} }
++secondRestrictionIterator; ++secondRestrictionIterator;
} while(u == secondRestrictionIterator->fromNode); } while(secondRestrictionIterator != inputRestrictions.end() && u == secondRestrictionIterator->fromNode);
} }
if(_nodeBasedGraph->EndEdges(v) == _nodeBasedGraph->BeginEdges(v) + 1 && _nodeBasedGraph->GetEdgeData(e1).type != INT_MAX) { if(_nodeBasedGraph->EndEdges(v) == _nodeBasedGraph->BeginEdges(v) + 1 && _nodeBasedGraph->GetEdgeData(e1).type != INT_MAX) {
EdgeBasedNode currentNode; EdgeBasedNode currentNode;
@ -194,7 +194,7 @@ void EdgeBasedGraphFactory::Run() {
} }
} }
++secondRestrictionIterator; ++secondRestrictionIterator;
} while(u == secondRestrictionIterator->fromNode); } while(secondRestrictionIterator != inputRestrictions.end() && u == secondRestrictionIterator->fromNode);
} }
if( !isTurnRestricted || (isOnlyAllowed && w == onlyToNode) ) { //only add an edge if turn is not prohibited if( !isTurnRestricted || (isOnlyAllowed && w == onlyToNode) ) { //only add an edge if turn is not prohibited

2
Util/GraphLoader.h
View File

@ -364,7 +364,7 @@ template<typename NodeT, typename EdgeT>
unsigned readHSGRFromStream(istream &in, vector<NodeT>& nodeList, vector<EdgeT> & edgeList) { unsigned readHSGRFromStream(istream &in, vector<NodeT>& nodeList, vector<EdgeT> & edgeList) {
unsigned numberOfNodes = 0; unsigned numberOfNodes = 0;
in.read((char*) & numberOfNodes, sizeof(unsigned)); in.read((char*) & numberOfNodes, sizeof(unsigned));
nodeList.resize(numberOfNodes); nodeList.resize(numberOfNodes + 1);
NodeT currentNode; NodeT currentNode;
for(unsigned nodeCounter = 0; nodeCounter < numberOfNodes; ++nodeCounter ) { for(unsigned nodeCounter = 0; nodeCounter < numberOfNodes; ++nodeCounter ) {
in.read((char*) &currentNode, sizeof(NodeT)); in.read((char*) &currentNode, sizeof(NodeT));

3
createHierarchy.cpp
View File

@ -155,6 +155,7 @@ int main (int argc, char *argv[]) {
std::vector< ContractionCleanup::Edge > contractedEdges; std::vector< ContractionCleanup::Edge > contractedEdges;
contractor->GetEdges( contractedEdges ); contractor->GetEdges( contractedEdges );
delete contractor;
ContractionCleanup * cleanup = new ContractionCleanup(n, contractedEdges); ContractionCleanup * cleanup = new ContractionCleanup(n, contractedEdges);
contractedEdges.clear(); contractedEdges.clear();
@ -183,7 +184,7 @@ int main (int argc, char *argv[]) {
numberOfNodes+=1; numberOfNodes+=1;
std::vector< StaticGraph<EdgeData>::_StrNode > _nodes; std::vector< StaticGraph<EdgeData>::_StrNode > _nodes;
_nodes.resize( numberOfNodes); _nodes.resize( numberOfNodes + 1 );
StaticGraph<EdgeData>::EdgeIterator edge = 0; StaticGraph<EdgeData>::EdgeIterator edge = 0;
StaticGraph<EdgeData>::EdgeIterator position = 0; StaticGraph<EdgeData>::EdgeIterator position = 0;