Moving check of input data to node-based graph instead of edge-expanded
graph. Makes more tests pass.
This commit is contained in:
parent
1bef65bf2c
commit
87ff3f9b9b
@ -115,6 +115,9 @@ int main (int argc, char *argv[]) {
|
|||||||
NodeID nodeBasedNodeNumber = readBinaryOSRMGraphFromStream(in, edgeList, bollardNodes, trafficLightNodes, &internalToExternalNodeMapping, inputRestrictions);
|
NodeID nodeBasedNodeNumber = readBinaryOSRMGraphFromStream(in, edgeList, bollardNodes, trafficLightNodes, &internalToExternalNodeMapping, inputRestrictions);
|
||||||
in.close();
|
in.close();
|
||||||
INFO(inputRestrictions.size() << " restrictions, " << bollardNodes.size() << " bollard nodes, " << trafficLightNodes.size() << " traffic lights");
|
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")) {
|
if(!testDataFile("profile.lua")) {
|
||||||
ERR("Need profile.lua to apply traffic signal penalty");
|
ERR("Need profile.lua to apply traffic signal penalty");
|
||||||
@ -160,9 +163,6 @@ int main (int argc, char *argv[]) {
|
|||||||
NodeID edgeBasedNodeNumber = edgeBasedGraphFactory->GetNumberOfNodes();
|
NodeID edgeBasedNodeNumber = edgeBasedGraphFactory->GetNumberOfNodes();
|
||||||
DeallocatingVector<EdgeBasedEdge> edgeBasedEdgeList;
|
DeallocatingVector<EdgeBasedEdge> edgeBasedEdgeList;
|
||||||
edgeBasedGraphFactory->GetEdgeBasedEdges(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
|
* Writing info on original (node-based) nodes
|
||||||
|
Loading…
Reference in New Issue
Block a user