From 5b47fb3188e593ea129ec8f7e58015eeca928114 Mon Sep 17 00:00:00 2001 From: Matt Amos Date: Tue, 14 Oct 2014 01:46:09 +0100 Subject: [PATCH] [extreme_points] s/kludge/factor/ when flipping side tests. --- .../geometry/algorithms/detail/extreme_points.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/extreme_points.hpp b/include/boost/geometry/algorithms/detail/extreme_points.hpp index 00a7c894d..61839d296 100644 --- a/include/boost/geometry/algorithms/detail/extreme_points.hpp +++ b/include/boost/geometry/algorithms/detail/extreme_points.hpp @@ -237,9 +237,9 @@ struct extreme_points_on_ring coordinate_type const other_coordinate = geometry::get<1 - Dimension>(*right); if (coordinate > min_value && other_coordinate > other_min && other_coordinate < other_max) { - int const kludge = geometry::point_order::value == geometry::clockwise ? 1 : -1; - int const first_side = side_strategy::apply(*right, extremes.front(), *(extremes.begin() + 1)) * kludge; - int const last_side = side_strategy::apply(*right, *(extremes.rbegin() + 1), extremes.back()) * kludge; + int const factor = geometry::point_order::value == geometry::clockwise ? 1 : -1; + int const first_side = side_strategy::apply(*right, extremes.front(), *(extremes.begin() + 1)) * factor; + int const last_side = side_strategy::apply(*right, *(extremes.rbegin() + 1), extremes.back()) * factor; // If not lying left from any of the extemes side if (first_side != 1 && last_side != 1) @@ -294,9 +294,9 @@ struct extreme_points_on_ring return false; } - int const kludge = geometry::point_order::value == geometry::clockwise ? 1 : -1; - int const first_side = side_strategy::apply(*(right - 1), *right, *left) * kludge; - int const last_side = side_strategy::apply(*left, *(left + 1), *right) * kludge; + int const factor = geometry::point_order::value == geometry::clockwise ? 1 : -1; + int const first_side = side_strategy::apply(*(right - 1), *right, *left) * factor; + int const last_side = side_strategy::apply(*left, *(left + 1), *right) * factor; //std::cout << "Candidate at " << geometry::wkt(*it) << " first=" << first_side << " last=" << last_side << std::endl;