From c79b9a60b7e4b076495cb48858da724e1d12f11c Mon Sep 17 00:00:00 2001 From: Vissarion Fysikopoulos Date: Thu, 8 Oct 2020 17:48:48 +0300 Subject: [PATCH] [strategies] Remove Geometry parameter from side in convex_hull strategies --- .../algorithms/detail/convex_hull/graham_andrew.hpp | 2 +- .../boost/geometry/strategies/convex_hull/cartesian.hpp | 3 +-- .../boost/geometry/strategies/convex_hull/geographic.hpp | 3 +-- .../boost/geometry/strategies/convex_hull/spherical.hpp | 3 +-- test/algorithms/convex_hull/test_convex_hull.hpp | 9 +++------ 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/convex_hull/graham_andrew.hpp b/include/boost/geometry/algorithms/detail/convex_hull/graham_andrew.hpp index 58cd7a763..b264665c8 100644 --- a/include/boost/geometry/algorithms/detail/convex_hull/graham_andrew.hpp +++ b/include/boost/geometry/algorithms/detail/convex_hull/graham_andrew.hpp @@ -215,7 +215,7 @@ public: container_type lower_points, upper_points; - auto side_strategy = strategy.side(geometry); + auto side_strategy = strategy.side(); // Bounding left/right points // Second pass, now that extremes are found, assign all points diff --git a/include/boost/geometry/strategies/convex_hull/cartesian.hpp b/include/boost/geometry/strategies/convex_hull/cartesian.hpp index 66e17735b..4f4dc2778 100644 --- a/include/boost/geometry/strategies/convex_hull/cartesian.hpp +++ b/include/boost/geometry/strategies/convex_hull/cartesian.hpp @@ -25,8 +25,7 @@ template class cartesian : strategies::detail::cartesian_base { public: - template - static auto side(Geometry const&) + static auto side() { return strategy::side::side_robust(); } diff --git a/include/boost/geometry/strategies/convex_hull/geographic.hpp b/include/boost/geometry/strategies/convex_hull/geographic.hpp index 665cd7864..82580a2bb 100644 --- a/include/boost/geometry/strategies/convex_hull/geographic.hpp +++ b/include/boost/geometry/strategies/convex_hull/geographic.hpp @@ -41,8 +41,7 @@ public: : base_t(spheroid) {} - template - static auto side(Geometry const&) + static auto side() { return strategy::side::geographic < diff --git a/include/boost/geometry/strategies/convex_hull/spherical.hpp b/include/boost/geometry/strategies/convex_hull/spherical.hpp index acbee9c1b..db93a9f85 100644 --- a/include/boost/geometry/strategies/convex_hull/spherical.hpp +++ b/include/boost/geometry/strategies/convex_hull/spherical.hpp @@ -30,8 +30,7 @@ template class spherical : strategies::detail::spherical_base { public: - template - static auto side(Geometry const&) + static auto side() { return strategy::side::spherical_side_formula(); } diff --git a/test/algorithms/convex_hull/test_convex_hull.hpp b/test/algorithms/convex_hull/test_convex_hull.hpp index 22e8d51df..b7912075b 100644 --- a/test/algorithms/convex_hull/test_convex_hull.hpp +++ b/test/algorithms/convex_hull/test_convex_hull.hpp @@ -40,8 +40,7 @@ struct robust_cartesian : boost::geometry::strategies::detail::cartesian_base { - template - static auto side(Geometry const&) + static auto side() { return boost::geometry::strategy::side::side_robust<>(); } @@ -49,8 +48,7 @@ struct robust_cartesian : boost::geometry::strategies::detail::cartesian_base struct non_robust_cartesian_fast : boost::geometry::strategies::detail::cartesian_base { - template - static auto side(Geometry const&) + static auto side() { return boost::geometry::strategy::side::side_non_robust<>(); } @@ -58,8 +56,7 @@ struct non_robust_cartesian_fast : boost::geometry::strategies::detail::cartesia struct non_robust_cartesian_sbt : boost::geometry::strategies::detail::cartesian_base { - template - static auto side(Geometry const&) + static auto side() { return boost::geometry::strategy::side::side_by_triangle<>(); }