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

Minor glitch fixed

Browse Source
This commit is contained in:
Dennis Luxen 2010-11-17 13:37:17 +00:00
parent ddad5a0523
commit 054bffc0f6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataStructures/NNGrid.h
View File

@ -261,7 +261,6 @@ public:
GetContentsOfFileBucket(fileIndex+i+j, candidates); GetContentsOfFileBucket(fileIndex+i+j, candidates);
} }
} }
_Coordinate tmp; _Coordinate tmp;
double dist = numeric_limits<double>::max(); double dist = numeric_limits<double>::max();
timestamp = get_timestamp(); timestamp = get_timestamp();
@ -279,7 +278,6 @@ public:
routingStarts->startCoord.lon = tmp.lon; routingStarts->startCoord.lon = tmp.lon;
} }
} }
fileIndex = getFileIndexForLatLon(targetCoord.lat, targetCoord.lon); fileIndex = getFileIndexForLatLon(targetCoord.lat, targetCoord.lon);
candidates.clear(); candidates.clear();
timestamp = get_timestamp(); timestamp = get_timestamp();
@ -288,7 +286,6 @@ public:
GetContentsOfFileBucket(fileIndex+i+j, candidates); GetContentsOfFileBucket(fileIndex+i+j, candidates);
} }
} }
dist = numeric_limits<double>::max(); dist = numeric_limits<double>::max();
timestamp = get_timestamp(); timestamp = get_timestamp();
for(std::vector<_Edge>::iterator it = candidates.begin(); it != candidates.end(); it++) for(std::vector<_Edge>::iterator it = candidates.begin(); it != candidates.end(); it++)
@ -318,7 +315,6 @@ public:
GetContentsOfFileBucket(fileIndex+i+j, candidates); GetContentsOfFileBucket(fileIndex+i+j, candidates);
} }
} }
_Coordinate nearest(numeric_limits<int>::max(), numeric_limits<int>::max()), tmp; _Coordinate nearest(numeric_limits<int>::max(), numeric_limits<int>::max()), tmp;
double dist = numeric_limits<double>::max(); double dist = numeric_limits<double>::max();
timestamp = get_timestamp(); timestamp = get_timestamp();
@ -510,6 +506,7 @@ private:
{ {
for(int j = 0; j < 32; j++) for(int j = 0; j < 32; j++)
{ {
assert(cellMap->size() >= 0);
unsigned fileIndex = lineBase + i*32768 + columnBase+j; unsigned fileIndex = lineBase + i*32768 + columnBase+j;
unsigned cellIndex = i*32+j; unsigned cellIndex = i*32+j;
cellMap->insert(std::make_pair(fileIndex, cellIndex)); cellMap->insert(std::make_pair(fileIndex, cellIndex));
@ -551,6 +548,7 @@ private:
result.push_back(e); result.push_back(e);
numberOfEdgesInFileBucket++; numberOfEdgesInFileBucket++;
} while(true); } while(true);
delete cellMap; delete cellMap;
} }

4
DataStructures/NodeInformationHelpDesk.h
View File

@ -54,7 +54,9 @@ public:
NodeID getNumberOfNodes() const { return numberOfNodes; } NodeID getNumberOfNodes() const { return numberOfNodes; }
inline void findNearestNodeCoordForLatLon(const _Coordinate coord, _Coordinate& result) { result = g->FindNearestPointOnEdge(coord); } inline void findNearestNodeCoordForLatLon(const _Coordinate coord, _Coordinate& result) {
result = g->FindNearestPointOnEdge(coord);
}
inline bool FindRoutingStarts(const _Coordinate start, const _Coordinate target, PhantomNodes * phantomNodes) { inline bool FindRoutingStarts(const _Coordinate start, const _Coordinate target, PhantomNodes * phantomNodes) {
g->FindRoutingStarts(start, target, phantomNodes); g->FindRoutingStarts(start, target, phantomNodes);

1
createHierarchy.cpp
View File

@ -168,7 +168,6 @@ int main (int argc, char *argv[])
middle = it->data.middleName.middle; middle = it->data.middleName.middle;
else { else {
middle = it->data.middleName.nameID; middle = it->data.middleName.nameID;
assert (middle < 10000);
} }
NodeID source = it->source; NodeID source = it->source;