From dafd0e5db7e3283c09a3539dcdd4175e7c360ddd Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 10 Oct 2014 18:18:56 +0200 Subject: [PATCH] rewrite NumericUtils into floating_point.hpp --- DataStructures/StaticRTree.h | 8 +++---- Util/floating_point.hpp | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 Util/floating_point.hpp diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 05e560450..9b0bbbfdf 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -36,8 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SharedMemoryVectorWrapper.h" #include "../ThirdParty/variant/variant.hpp" +#include "../Util/floating_point.hpp" #include "../Util/MercatorUtil.h" -#include "../Util/NumericUtil.h" #include "../Util/OSRMException.h" #include "../Util/SimpleLogger.h" #include "../Util/TimingUtil.h" @@ -788,7 +788,7 @@ class StaticRTree BOOST_ASSERT(0. <= current_perpendicular_distance); if ((current_perpendicular_distance < current_min_dist) && - !EpsilonCompare(current_perpendicular_distance, current_min_dist)) + !osrm::epsilon_compare(current_perpendicular_distance, current_min_dist)) { // store phantom node in result vector result_phantom_node_vector.emplace_back( @@ -967,7 +967,7 @@ class StaticRTree BOOST_ASSERT(0. <= current_perpendicular_distance); if ((current_perpendicular_distance < current_min_dist) && - !EpsilonCompare(current_perpendicular_distance, current_min_dist)) + !osrm::epsilon_compare(current_perpendicular_distance, current_min_dist)) { // store phantom node in result vector result_phantom_node_vector.emplace_back( @@ -1067,7 +1067,7 @@ class StaticRTree BOOST_ASSERT(0. <= current_perpendicular_distance); if ((current_perpendicular_distance < min_dist) && - !EpsilonCompare(current_perpendicular_distance, min_dist)) + !osrm::epsilon_compare(current_perpendicular_distance, min_dist)) { // found a new minimum min_dist = current_perpendicular_distance; result_phantom_node = {current_edge.forward_edge_based_node_id, diff --git a/Util/floating_point.hpp b/Util/floating_point.hpp new file mode 100644 index 000000000..5c4810279 --- /dev/null +++ b/Util/floating_point.hpp @@ -0,0 +1,44 @@ +/* +Copyright (c) 2013, Project OSRM, Dennis Luxen, others +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ + +#ifndef FLOATING_POINT_HPP +#define FLOATING_POINT_HPP + +#include + +#include +#include + +namespace osrm +{ +template bool epsilon_compare(const FloatT number1, const FloatT number2) +{ + static_assert(std::is_floating_point::value, "type must be floating point"); + return (std::abs(number1 - number2) < std::numeric_limits::epsilon()); +} +} + +#endif // FLOATING_POINT_HPP