[extreme_points] s/kludge/factor/ when flipping side tests.

This commit is contained in:
Matt Amos
2014-10-14 01:46:09 +01:00
committed by Adam Wulkiewicz
parent 1bc7382cea
commit 5b47fb3188

View File

@@ -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<Ring>::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<Ring>::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<Ring>::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<Ring>::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;