Minor glitch fixed
This commit is contained in:
parent
ddad5a0523
commit
054bffc0f6
@ -261,7 +261,6 @@ public:
|
||||
GetContentsOfFileBucket(fileIndex+i+j, candidates);
|
||||
}
|
||||
}
|
||||
|
||||
_Coordinate tmp;
|
||||
double dist = numeric_limits<double>::max();
|
||||
timestamp = get_timestamp();
|
||||
@ -279,7 +278,6 @@ public:
|
||||
routingStarts->startCoord.lon = tmp.lon;
|
||||
}
|
||||
}
|
||||
|
||||
fileIndex = getFileIndexForLatLon(targetCoord.lat, targetCoord.lon);
|
||||
candidates.clear();
|
||||
timestamp = get_timestamp();
|
||||
@ -288,7 +286,6 @@ public:
|
||||
GetContentsOfFileBucket(fileIndex+i+j, candidates);
|
||||
}
|
||||
}
|
||||
|
||||
dist = numeric_limits<double>::max();
|
||||
timestamp = get_timestamp();
|
||||
for(std::vector<_Edge>::iterator it = candidates.begin(); it != candidates.end(); it++)
|
||||
@ -318,7 +315,6 @@ public:
|
||||
GetContentsOfFileBucket(fileIndex+i+j, candidates);
|
||||
}
|
||||
}
|
||||
|
||||
_Coordinate nearest(numeric_limits<int>::max(), numeric_limits<int>::max()), tmp;
|
||||
double dist = numeric_limits<double>::max();
|
||||
timestamp = get_timestamp();
|
||||
@ -510,6 +506,7 @@ private:
|
||||
{
|
||||
for(int j = 0; j < 32; j++)
|
||||
{
|
||||
assert(cellMap->size() >= 0);
|
||||
unsigned fileIndex = lineBase + i*32768 + columnBase+j;
|
||||
unsigned cellIndex = i*32+j;
|
||||
cellMap->insert(std::make_pair(fileIndex, cellIndex));
|
||||
@ -551,6 +548,7 @@ private:
|
||||
result.push_back(e);
|
||||
numberOfEdgesInFileBucket++;
|
||||
} while(true);
|
||||
|
||||
delete cellMap;
|
||||
}
|
||||
|
||||
|
@ -54,7 +54,9 @@ public:
|
||||
|
||||
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) {
|
||||
g->FindRoutingStarts(start, target, phantomNodes);
|
||||
|
@ -168,7 +168,6 @@ int main (int argc, char *argv[])
|
||||
middle = it->data.middleName.middle;
|
||||
else {
|
||||
middle = it->data.middleName.nameID;
|
||||
assert (middle < 10000);
|
||||
}
|
||||
|
||||
NodeID source = it->source;
|
||||
|
Loading…
Reference in New Issue
Block a user