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

remove c-style calls to fabs

Browse Source
This commit is contained in:
Dennis Luxen 2014-01-27 11:26:34 +01:00
parent 0649f6e607
commit b5b4280c3b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Contractor/Contractor.h
View File

@ -45,8 +45,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <ctime>
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include <vector> #include <vector>
@ -732,7 +730,7 @@ private:
if ( priority > targetPriority ) if ( priority > targetPriority )
return false; return false;
//tie breaking //tie breaking
if ( fabs(priority - targetPriority) < std::numeric_limits<double>::epsilon() && bias(node, target) ) { if ( std::abs(priority - targetPriority) < std::numeric_limits<double>::epsilon() && bias(node, target) ) {
return false; return false;
} }
neighbours.push_back( target ); neighbours.push_back( target );
@ -754,7 +752,7 @@ private:
if ( priority > targetPriority) if ( priority > targetPriority)
return false; return false;
//tie breaking //tie breaking
if ( fabs(priority - targetPriority) < std::numeric_limits<double>::epsilon() && bias(node, target) ) { if ( std::abs(priority - targetPriority) < std::numeric_limits<double>::epsilon() && bias(node, target) ) {
return false; return false;
} }
} }

2
DataStructures/StaticRTree.h
View File

@ -923,7 +923,7 @@ private:
} }
inline bool DoubleEpsilonCompare(const double d1, const double d2) const { inline bool DoubleEpsilonCompare(const double d1, const double d2) const {
return (std::fabs(d1 - d2) < std::numeric_limits<double>::epsilon() ); return (std::abs(d1 - d2) < std::numeric_limits<double>::epsilon() );
} }
}; };

2
Extractor/ExtractorCallbacks.cpp
View File

@ -87,7 +87,7 @@ void ExtractorCallbacks::wayFunction(ExtractionWay &parsed_way) {
parsed_way.speed = parsed_way.duration/(parsed_way.path.size()-1); parsed_way.speed = parsed_way.duration/(parsed_way.path.size()-1);
} }
if(std::numeric_limits<double>::epsilon() >= fabs(-1. - parsed_way.speed)){ if(std::numeric_limits<double>::epsilon() >= std::abs(-1. - parsed_way.speed)){
SimpleLogger().Write(logDEBUG) << SimpleLogger().Write(logDEBUG) <<
"found way with bogus speed, id: " << parsed_way.id; "found way with bogus speed, id: " << parsed_way.id;
return; return;