From b865bea48227f92add430f416af47c90dd9a164c Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 10 Feb 2015 12:29:52 +0100 Subject: [PATCH] fix floating point comparison, remove superflous inline keywords --- data_structures/rectangle.hpp | 138 ++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 65 deletions(-) diff --git a/data_structures/rectangle.hpp b/data_structures/rectangle.hpp index 110f22794..06c4b08ed 100644 --- a/data_structures/rectangle.hpp +++ b/data_structures/rectangle.hpp @@ -39,15 +39,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // TODO: Make template type, add tests struct RectangleInt2D { - RectangleInt2D() : min_lon(std::numeric_limits::max()), - max_lon(std::numeric_limits::min()), - min_lat(std::numeric_limits::max()), - max_lat(std::numeric_limits::min()) {} + RectangleInt2D() + : min_lon(std::numeric_limits::max()), + max_lon(std::numeric_limits::min()), + min_lat(std::numeric_limits::max()), max_lat(std::numeric_limits::min()) + { + } int32_t min_lon, max_lon; int32_t min_lat, max_lat; - inline void MergeBoundingBoxes(const RectangleInt2D &other) + void MergeBoundingBoxes(const RectangleInt2D &other) { min_lon = std::min(min_lon, other.min_lon); max_lon = std::max(max_lon, other.max_lon); @@ -59,7 +61,7 @@ struct RectangleInt2D BOOST_ASSERT(max_lon != std::numeric_limits::min()); } - inline FixedPointCoordinate Centroid() const + FixedPointCoordinate Centroid() const { FixedPointCoordinate centroid; // The coordinates of the midpoints are given by: @@ -69,7 +71,7 @@ struct RectangleInt2D return centroid; } - inline bool Intersects(const RectangleInt2D &other) const + bool Intersects(const RectangleInt2D &other) const { FixedPointCoordinate upper_left(other.max_lat, other.min_lon); FixedPointCoordinate upper_right(other.max_lat, other.max_lon); @@ -80,7 +82,7 @@ struct RectangleInt2D Contains(lower_left)); } - inline float GetMinDist(const FixedPointCoordinate &location) const + float GetMinDist(const FixedPointCoordinate &location) const { const bool is_contained = Contains(location); if (is_contained) @@ -90,66 +92,74 @@ struct RectangleInt2D enum Direction { - INVALID = 0, - NORTH = 1, - SOUTH = 2, - EAST = 4, + INVALID = 0, + NORTH = 1, + SOUTH = 2, + EAST = 4, NORTH_EAST = 5, SOUTH_EAST = 6, - WEST = 8, + WEST = 8, NORTH_WEST = 9, SOUTH_WEST = 10 }; Direction d = INVALID; if (location.lat > max_lat) - d = (Direction) (d | NORTH); + d = (Direction)(d | NORTH); else if (location.lat < min_lat) - d = (Direction) (d | SOUTH); + d = (Direction)(d | SOUTH); if (location.lon > max_lon) - d = (Direction) (d | EAST); + d = (Direction)(d | EAST); else if (location.lon < min_lon) - d = (Direction) (d | WEST); + d = (Direction)(d | WEST); BOOST_ASSERT(d != INVALID); float min_dist = std::numeric_limits::max(); switch (d) { - case NORTH: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(max_lat, location.lon)); - break; - case SOUTH: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(min_lat, location.lon)); - break; - case WEST: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(location.lat, min_lon)); - break; - case EAST: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(location.lat, max_lon)); - break; - case NORTH_EAST: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(max_lat, max_lon)); - break; - case NORTH_WEST: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(max_lat, min_lon)); - break; - case SOUTH_EAST: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(min_lat, max_lon)); - break; - case SOUTH_WEST: - min_dist = coordinate_calculation::euclidean_distance(location, FixedPointCoordinate(min_lat, min_lon)); - break; - default: - break; + case NORTH: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(max_lat, location.lon)); + break; + case SOUTH: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(min_lat, location.lon)); + break; + case WEST: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(location.lat, min_lon)); + break; + case EAST: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(location.lat, max_lon)); + break; + case NORTH_EAST: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(max_lat, max_lon)); + break; + case NORTH_WEST: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(max_lat, min_lon)); + break; + case SOUTH_EAST: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(min_lat, max_lon)); + break; + case SOUTH_WEST: + min_dist = coordinate_calculation::euclidean_distance( + location, FixedPointCoordinate(min_lat, min_lon)); + break; + default: + break; } - BOOST_ASSERT(min_dist != std::numeric_limits::max()); + BOOST_ASSERT(min_dist < std::numeric_limits::max()); return min_dist; } - inline float GetMinMaxDist(const FixedPointCoordinate &location) const + float GetMinMaxDist(const FixedPointCoordinate &location) const { float min_max_dist = std::numeric_limits::max(); // Get minmax distance to each of the four sides @@ -158,38 +168,36 @@ struct RectangleInt2D const FixedPointCoordinate lower_right(min_lat, max_lon); const FixedPointCoordinate lower_left(min_lat, min_lon); - min_max_dist = std::min( - min_max_dist, - std::max( - coordinate_calculation::euclidean_distance(location, upper_left), - coordinate_calculation::euclidean_distance(location, upper_right))); + min_max_dist = + std::min(min_max_dist, + std::max(coordinate_calculation::euclidean_distance(location, upper_left), + coordinate_calculation::euclidean_distance(location, upper_right))); - min_max_dist = std::min( - min_max_dist, - std::max( - coordinate_calculation::euclidean_distance(location, upper_right), - coordinate_calculation::euclidean_distance(location, lower_right))); + min_max_dist = + std::min(min_max_dist, + std::max(coordinate_calculation::euclidean_distance(location, upper_right), + coordinate_calculation::euclidean_distance(location, lower_right))); - min_max_dist = std::min( - min_max_dist, - std::max(coordinate_calculation::euclidean_distance(location, lower_right), - coordinate_calculation::euclidean_distance(location, lower_left))); + min_max_dist = + std::min(min_max_dist, + std::max(coordinate_calculation::euclidean_distance(location, lower_right), + coordinate_calculation::euclidean_distance(location, lower_left))); - min_max_dist = std::min( - min_max_dist, - std::max(coordinate_calculation::euclidean_distance(location, lower_left), - coordinate_calculation::euclidean_distance(location, upper_left))); + min_max_dist = + std::min(min_max_dist, + std::max(coordinate_calculation::euclidean_distance(location, lower_left), + coordinate_calculation::euclidean_distance(location, upper_left))); return min_max_dist; } - inline bool Contains(const FixedPointCoordinate &location) const + bool Contains(const FixedPointCoordinate &location) const { const bool lats_contained = (location.lat >= min_lat) && (location.lat <= max_lat); const bool lons_contained = (location.lon >= min_lon) && (location.lon <= max_lon); return lats_contained && lons_contained; } - inline friend std::ostream &operator<<(std::ostream &out, const RectangleInt2D &rect) + friend std::ostream &operator<<(std::ostream &out, const RectangleInt2D &rect) { out << rect.min_lat / COORDINATE_PRECISION << "," << rect.min_lon / COORDINATE_PRECISION << " " << rect.max_lat / COORDINATE_PRECISION << ","