diff --git a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp index 8ea91f006..50ee39503 100644 --- a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp +++ b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp @@ -31,13 +31,6 @@ #include -// Temporary, comparing sorting, this can be removed in the end -//#define BOOST_GEOMETRY_USE_FLEX_SORT -//#define BOOST_GEOMETRY_USE_FLEX_SORT2 -#if defined(BOOST_GEOMETRY_USE_FLEX_SORT) -# include -#endif - namespace boost { namespace geometry { @@ -178,62 +171,15 @@ struct assign_range } }; - template static inline void sort(Range& range) { typedef typename boost::range_value::type point_type; typedef geometry::less comparator; -#if defined(GGL_USE_FLEX_SORT) - - #if defined(GGL_USE_FLEX_SORT1) - typedef boost::detail::default_predicate - < - boost::sort_filter_cutoff - < - 18, - boost::detail::insert_sort_core, - boost::sort_filter_ground - < - 30, - boost::detail::heap_sort_core, - boost::detail::quick_sort_core - < - boost::pivot_median_of_three, - boost::default_partitionner - > - > - >, - comparator> my_sort; - my_sort sort; - #elif defined(GGL_USE_FLEX_SORT2) - - // 1, 5, 9, 18, 25: 0.75 - // 50: 0.81 - - typedef boost::detail::default_predicate - >, comparator - > barend_sort; - - barend_sort sort; - #else - #error Define sub-flex-sort - #endif - - sort(boost::begin(range), boost::end(range)); - -#else - std::sort - (boost::begin(range), boost::end(range), comparator()); -#endif + std::sort(boost::begin(range), boost::end(range), comparator()); } - } // namespace detail #endif // DOXYGEN_NO_DETAIL