Moving check of input data to node-based graph instead of edge-expanded

graph. Makes more tests pass.
This commit is contained in:
DennisOSRM 2012-10-02 12:12:42 +02:00
parent 1bef65bf2c
commit 87ff3f9b9b

View File

@ -115,6 +115,9 @@ int main (int argc, char *argv[]) {
NodeID nodeBasedNodeNumber = readBinaryOSRMGraphFromStream(in, edgeList, bollardNodes, trafficLightNodes, &internalToExternalNodeMapping, inputRestrictions);
in.close();
INFO(inputRestrictions.size() << " restrictions, " << bollardNodes.size() << " bollard nodes, " << trafficLightNodes.size() << " traffic lights");
if(0 == edgeList.size())
ERR("The input data is broken. It is impossible to do any turns in this graph");
if(!testDataFile("profile.lua")) {
ERR("Need profile.lua to apply traffic signal penalty");
@ -160,9 +163,6 @@ int main (int argc, char *argv[]) {
NodeID edgeBasedNodeNumber = edgeBasedGraphFactory->GetNumberOfNodes();
DeallocatingVector<EdgeBasedEdge> edgeBasedEdgeList;
edgeBasedGraphFactory->GetEdgeBasedEdges(edgeBasedEdgeList);
if(0 == edgeBasedEdgeList.size())
ERR("The input data is broken. It is impossible to do any turns in this graph");
/***
* Writing info on original (node-based) nodes