Remove unused comments related to less compare policy

This commit is contained in:
Vissarion Fisikopoulos 2023-07-05 13:18:44 +03:00
parent 6cf09dc70c
commit e6d9ab3a8e
13 changed files with 3 additions and 37 deletions

View File

@ -224,7 +224,6 @@ private:
point_type const& left, point_type const& right, point_type const& left, point_type const& right,
SideStrategy const& side) SideStrategy const& side)
{ {
//std::cout << "add to hull" << std::endl;
output.push_back(left); output.push_back(left);
for (auto const& i : input) for (auto const& i : input)
{ {

View File

@ -68,12 +68,11 @@ private:
: geometry::less<void, -1, Strategy> : geometry::less<void, -1, Strategy>
{ {
private: private:
//TODO: pass strategy using less_type = geometry::less<void, -1, Strategy>;
typedef geometry::less<void, -1, Strategy> base_type;
public: public:
unary_not_disjoint_predicate(Iterator first, Iterator last) unary_not_disjoint_predicate(Iterator first, Iterator last)
: base_type(), m_first(first), m_last(last) : less_type(), m_first(first), m_last(last)
{} {}
template <typename Point> template <typename Point>
@ -82,7 +81,7 @@ private:
return std::binary_search(m_first, return std::binary_search(m_first,
m_last, m_last,
point, point,
static_cast<base_type const&>(*this)); static_cast<less_type const&>(*this));
} }
private: private:
@ -97,7 +96,6 @@ public:
{ {
BOOST_GEOMETRY_ASSERT( boost::size(multipoint1) <= boost::size(multipoint2) ); BOOST_GEOMETRY_ASSERT( boost::size(multipoint1) <= boost::size(multipoint2) );
//TODO: pass strategy
using less_type = geometry::less<void, -1, Strategy>; using less_type = geometry::less<void, -1, Strategy>;
using point1_type = typename boost::range_value<MultiPoint1>::type; using point1_type = typename boost::range_value<MultiPoint1>::type;

View File

@ -658,7 +658,6 @@ public:
BoxPoint const& bottom_right, BoxPoint const& bottom_right,
Strategies const& strategies) Strategies const& strategies)
{ {
//TODO: pass strategy
BOOST_GEOMETRY_ASSERT( (geometry::less<SegmentPoint, -1, Strategies>()(p0, p1)) BOOST_GEOMETRY_ASSERT( (geometry::less<SegmentPoint, -1, Strategies>()(p0, p1))
|| geometry::has_nan_coordinate(p0) || geometry::has_nan_coordinate(p0)
|| geometry::has_nan_coordinate(p1) ); || geometry::has_nan_coordinate(p1) );
@ -754,7 +753,6 @@ public:
bottom_left, bottom_right, bottom_left, bottom_right,
top_left, top_right); top_left, top_right);
//TODO: pass strategy
typedef geometry::less<segment_point, -1, Strategies> less_type; typedef geometry::less<segment_point, -1, Strategies> less_type;
if (less_type()(p[0], p[1])) if (less_type()(p[0], p[1]))
{ {

View File

@ -45,7 +45,6 @@ struct is_simple_multipoint
template <typename Strategy> template <typename Strategy>
static inline bool apply(MultiPoint const& multipoint, Strategy const& strategy) static inline bool apply(MultiPoint const& multipoint, Strategy const& strategy)
{ {
//TODO: pass strategy
typedef geometry::less typedef geometry::less
< <
typename point_type<MultiPoint>::type, typename point_type<MultiPoint>::type,

View File

@ -54,7 +54,6 @@ public:
{ {
if ( m_turn_point != NULL && other.m_turn_point != NULL ) if ( m_turn_point != NULL && other.m_turn_point != NULL )
{ {
//TODO: pass strategy
return geometry::less return geometry::less
< <
TurnPoint, -1, Strategy TurnPoint, -1, Strategy

View File

@ -255,7 +255,6 @@ struct multipoint_multipoint_point
OutputIterator oit, OutputIterator oit,
Strategy const& strategy) Strategy const& strategy)
{ {
//TODO: pass strategy
typedef geometry::less<void, -1, Strategy> less_type; typedef geometry::less<void, -1, Strategy> less_type;
if ( OverlayType != overlay_difference if ( OverlayType != overlay_difference

View File

@ -162,7 +162,6 @@ public:
template <typename Point> template <typename Point>
bool is_endpoint_boundary(Point const& pt) const bool is_endpoint_boundary(Point const& pt) const
{ {
//TODO: pass strategy
using less_type = geometry::less<mutable_point_type, -1, Strategy>; using less_type = geometry::less<mutable_point_type, -1, Strategy>;
auto const multi_count = boost::size(m_geometry); auto const multi_count = boost::size(m_geometry);

View File

@ -135,7 +135,6 @@ struct multi_point_geometry_eb<Geometry, multi_linestring_tag>
template <typename Point, typename Strategy> template <typename Point, typename Strategy>
bool apply(Point const& boundary_point, Strategy const&) bool apply(Point const& boundary_point, Strategy const&)
{ {
//TODO: pass strategy
typedef geometry::less<void, -1, Strategy> less_type; typedef geometry::less<void, -1, Strategy> less_type;
if (! std::binary_search(m_points.begin(), m_points.end(), if (! std::binary_search(m_points.begin(), m_points.end(),
@ -160,7 +159,6 @@ struct multi_point_geometry_eb<Geometry, multi_linestring_tag>
{ {
typedef typename boost::range_value<MultiPoint>::type point_type; typedef typename boost::range_value<MultiPoint>::type point_type;
typedef std::vector<point_type> points_type; typedef std::vector<point_type> points_type;
//TODO: pass strategy
typedef geometry::less<void, -1, Strategy> less_type; typedef geometry::less<void, -1, Strategy> less_type;
points_type points(boost::begin(multi_point), boost::end(multi_point)); points_type points(boost::begin(multi_point), boost::end(multi_point));

View File

@ -222,7 +222,6 @@ struct multipoint_multipoint
{ {
// sort points from the 1 MPt // sort points from the 1 MPt
typedef typename geometry::point_type<SortedMultiPoint>::type point_type; typedef typename geometry::point_type<SortedMultiPoint>::type point_type;
//TODO: pass strategy
typedef geometry::less<void, -1, Strategy> less_type; typedef geometry::less<void, -1, Strategy> less_type;
std::vector<point_type> points(boost::begin(sorted_mpt), boost::end(sorted_mpt)); std::vector<point_type> points(boost::begin(sorted_mpt), boost::end(sorted_mpt));

View File

@ -171,7 +171,6 @@ struct topology_check<MultiLinestring, Strategy, multi_linestring_tag>
} }
private: private:
//TODO: pass strategy
typedef geometry::less<void, -1, Strategy> less_type; typedef geometry::less<void, -1, Strategy> less_type;
void init() const void init() const

View File

@ -79,7 +79,6 @@ struct multi_point_multi_point
Strategy const& /*strategy*/) Strategy const& /*strategy*/)
{ {
typedef typename boost::range_value<MultiPoint2>::type point2_type; typedef typename boost::range_value<MultiPoint2>::type point2_type;
//TODO: pass strategy
typedef geometry::less<void, -1, Strategy> less_type; typedef geometry::less<void, -1, Strategy> less_type;
less_type const less = less_type(); less_type const less = less_type();

View File

@ -173,7 +173,6 @@ inline void merge(RandomIt const first, RandomIt const last, MultiGeometry& out,
auto const less = [](auto const& l, auto const& r) auto const less = [](auto const& l, auto const& r)
{ {
//TODO: pass strategy
return geometry::less<void, -1, Strategy>()(l.first, r.first); return geometry::less<void, -1, Strategy>()(l.first, r.first);
}; };

View File

@ -52,25 +52,6 @@ struct less
inline bool operator()(Point const& left, Point const& right) const inline bool operator()(Point const& left, Point const& right) const
{ {
/*using strategy_type = typename strategy::compare::services::default_strategy
<
strategy::compare::less,
strategy::compare::equals_epsilon,
Point, Point,
Dimension
>::type;
Strategy strategy;
using compare_strategy = decltype(
strategy.template compare
<
strategy::compare::less,
strategy::compare::equals_exact,
-1
>());
return compare_strategy::apply(left, right);
*/
return Strategy::template compare_type return Strategy::template compare_type
< <
strategy::compare::less strategy::compare::less