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

Fixing comparison of floats

Browse Source
This commit is contained in:
DennisOSRM 2012-09-19 14:01:06 +02:00
parent ac588911ba
commit 1c415933da
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DataStructures/NNGrid.h
View File

@ -89,10 +89,10 @@ public:
ramInFile.close(); ramInFile.close();
} }
#ifndef ROUTED
template<typename EdgeT> template<typename EdgeT>
inline void ConstructGrid(DeallocatingVector<EdgeT> & edgeList, char * ramIndexOut, char * fileIndexOut) { inline void ConstructGrid(DeallocatingVector<EdgeT> & edgeList, char * ramIndexOut, char * fileIndexOut) {
//TODO: Implement this using STXXL-Streams //TODO: Implement this using STXXL-Streams
#ifndef ROUTED
Percent p(edgeList.size()); Percent p(edgeList.size());
BOOST_FOREACH(EdgeT & edge, edgeList) { BOOST_FOREACH(EdgeT & edge, edgeList) {
p.printIncrement(); p.printIncrement();
@ -147,8 +147,8 @@ public:
ramFile.write((char *)&ramIndexTable[0], sizeof(unsigned long)*1024*1024 ); ramFile.write((char *)&ramIndexTable[0], sizeof(unsigned long)*1024*1024 );
//close ram index file //close ram index file
ramFile.close(); ramFile.close();
#endif
} }
#endif
bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode, const unsigned zoomLevel) { bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode, const unsigned zoomLevel) {
bool ignoreTinyComponents = (zoomLevel <= 14); bool ignoreTinyComponents = (zoomLevel <= 14);
@ -450,15 +450,15 @@ private:
localStream->read(static_cast<char*>(static_cast<void*>(&result[currentSizeOfResult])), lengthOfBucket*sizeof(_GridEdge)); localStream->read(static_cast<char*>(static_cast<void*>(&result[currentSizeOfResult])), lengthOfBucket*sizeof(_GridEdge));
} }
inline void AddEdge(const _GridEdge & edge) {
#ifndef ROUTED #ifndef ROUTED
inline void AddEdge(const _GridEdge & edge) {
std::vector<BresenhamPixel> indexList; std::vector<BresenhamPixel> indexList;
GetListOfIndexesForEdgeAndGridSize(edge.startCoord, edge.targetCoord, indexList); GetListOfIndexesForEdgeAndGridSize(edge.startCoord, edge.targetCoord, indexList);
for(unsigned i = 0; i < indexList.size(); ++i) { for(unsigned i = 0; i < indexList.size(); ++i) {
entries.push_back(GridEntry(edge, indexList[i].first, indexList[i].second)); entries.push_back(GridEntry(edge, indexList[i].first, indexList[i].second));
} }
#endif
} }
#endif
inline double ComputeDistance(const _Coordinate& inputPoint, const _Coordinate& source, const _Coordinate& target, _Coordinate& nearest, double *r) { inline double ComputeDistance(const _Coordinate& inputPoint, const _Coordinate& source, const _Coordinate& target, _Coordinate& nearest, double *r) {
@ -469,7 +469,7 @@ private:
const double c = static_cast<double>(target.lat); const double c = static_cast<double>(target.lat);
const double d = static_cast<double>(target.lon); const double d = static_cast<double>(target.lon);
double p,q,mX,nY; double p,q,mX,nY;
if(fabs(a-c) < FLT_EPSILON){ if(fabs(a-c) > FLT_EPSILON){
const double m = (d-b)/(c-a); // slope const double m = (d-b)/(c-a); // slope
// Projection of (x,y) on line joining (a,b) and (c,d) // Projection of (x,y) on line joining (a,b) and (c,d)
p = ((x + (m*y)) + (m*m*a - m*b))/(1. + m*m); p = ((x + (m*y)) + (m*m*a - m*b))/(1. + m*m);