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

Some mild refactoring

Browse Source
This commit is contained in:
DennisOSRM 2013-07-19 15:02:45 +02:00
parent 4961b819f3
commit 9a02421091
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Util/GraphLoader.h
View File

@ -202,7 +202,7 @@ NodeID readDTMPGraphFromStream(std::istream &in, std::vector<EdgeT>& edgeList, s
ExternalNodeMap ext2IntNodeMap; ExternalNodeMap ext2IntNodeMap;
in >> n; in >> n;
DEBUG("Importing n = " << n << " nodes "); DEBUG("Importing n = " << n << " nodes ");
for (NodeID i=0; i<n;++i) { for (NodeID i=0; i<n; ++i) {
in >> id >> ycoord >> xcoord; in >> id >> ycoord >> xcoord;
int2ExtNodeMap->push_back(NodeInfo(xcoord, ycoord, id)); int2ExtNodeMap->push_back(NodeInfo(xcoord, ycoord, id));
ext2IntNodeMap.insert(std::make_pair(id, i)); ext2IntNodeMap.insert(std::make_pair(id, i));
@ -219,9 +219,9 @@ NodeID readDTMPGraphFromStream(std::istream &in, std::vector<EdgeT>& edgeList, s
int length; int length;
in >> source >> target >> length >> dir >> speedType; in >> source >> target >> length >> dir >> speedType;
if(dir == 3) if(dir == 3) {
dir = 0; dir = 0;
}
switch(speedType) { switch(speedType) {
case 1: case 1:
weight = 130; weight = 130;
@ -271,8 +271,9 @@ NodeID readDTMPGraphFromStream(std::istream &in, std::vector<EdgeT>& edgeList, s
} }
weight = length*weight/3.6; weight = length*weight/3.6;
if(speedType == 13) if(speedType == 13) {
weight = length; weight = length;
}
assert(length > 0); assert(length > 0);
assert(weight > 0); assert(weight > 0);
if(dir <0 || dir > 2) if(dir <0 || dir > 2)
@ -281,8 +282,12 @@ NodeID readDTMPGraphFromStream(std::istream &in, std::vector<EdgeT>& edgeList, s
bool forward = true; bool forward = true;
bool backward = true; bool backward = true;
if (dir == 1) backward = false; if (dir == 1) {
if (dir == 2) forward = false; backward = false;
}
if (dir == 2) {
forward = false;
}
if(length == 0) { ERR("loaded null length edge"); } if(length == 0) { ERR("loaded null length edge"); }