boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-13 00:22:10 +00:00
Code Issues Projects Releases Wiki Activity

[is_valid] rename {not_}equal_point to {not_}equal_to and use point as the outer template parameter object instead of iterator

Browse Source
This commit is contained in:
Menelaos Karavelas
2014-04-30 22:22:01 +03:00
parent 542278e42c
commit 178696d511
2 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
View File

@@ -16,6 +16,7 @@
#include <boost/range.hpp>
#include <boost/geometry/core/closure.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp>
@@ -31,35 +32,35 @@ namespace boost { namespace geometry
namespace detail { namespace is_valid
{
template <typename Iterator>
struct equal_point
template <typename Point>
struct equal_to
{
Iterator m_it;
Point const& m_point;
equal_point(Iterator it)
: m_it(it)
equal_to(Point const& point)
: m_point(point)
{}
template <typename Point>
inline bool operator()(Point const& p) const
template <typename OtherPoint>
inline bool operator()(OtherPoint const& other) const
{
return geometry::equals(p, *m_it);
return geometry::equals(m_point, other);
}
};
template <typename Iterator>
struct not_equal_point
template <typename Point>
struct not_equal_to
{
Iterator m_it;
Point const& m_point;
not_equal_point(Iterator it)
: m_it(it)
not_equal_to(Point const& point)
: m_point(point)
{}
template <typename Point>
inline bool operator()(Point const& p) const
template <typename OtherPoint>
inline bool operator()(OtherPoint const& other) const
{
return !geometry::equals(p, *m_it);
return !geometry::equals(other, m_point);
}
};
@@ -70,22 +71,19 @@ struct has_spikes
{
static inline bool apply(Range const& range)
{
typedef typename point_type<Range>::type point;
typedef typename boost::range_iterator<Range const>::type iterator;
typedef typename boost::range_reverse_iterator
<
Range const
>::type reverse_iterator;
typedef not_equal_point<iterator> not_equal;
typedef not_equal_to<point> not_equal;
BOOST_ASSERT( boost::size(range) > 2 );
iterator prev = boost::begin(range);
iterator cur = std::find_if(prev, boost::end(range), not_equal(prev));
iterator cur = std::find_if(prev, boost::end(range), not_equal(*prev));
BOOST_ASSERT( cur != boost::end(range) );
iterator next = std::find_if(cur, boost::end(range), not_equal(cur));
iterator next = std::find_if(cur, boost::end(range), not_equal(*cur));
BOOST_ASSERT( next != boost::end(range) );
while ( next != boost::end(range) )
@@ -98,21 +96,19 @@ struct has_spikes
}
prev = cur;
cur = next;
next = std::find_if(cur, boost::end(range), not_equal(cur));
next = std::find_if(cur, boost::end(range), not_equal(*cur));
}
if ( geometry::equals(*boost::begin(range), *boost::rbegin(range)) )
{
iterator cur = boost::begin(range);
reverse_iterator prev =
std::find_if(boost::rbegin(range),
boost::rend(range),
not_equal_point
<
reverse_iterator
>(boost::rbegin(range))
);
iterator next = std::find_if(cur, boost::end(range), not_equal(cur));
typename boost::range_reverse_iterator
<
Range const
>::type prev = std::find_if(boost::rbegin(range),
boost::rend(range),
not_equal(*boost::rbegin(range)));
iterator next = std::find_if(cur, boost::end(range), not_equal(*cur));
return detail::point_is_spike_or_equal(*prev, *next, *cur);
}
@@ -126,10 +122,10 @@ struct has_spikes<Range, open>
{
static inline bool apply(Range const& range)
{
typedef typename closeable_view<Range, open>::type ClosedRange;
typedef typename closeable_view<Range, open>::type closed_view_type;
ClosedRange crange(const_cast<Range&>(range));
return has_spikes<ClosedRange, closed>::apply(crange);
closed_view_type closed_range(const_cast<Range&>(range));
return has_spikes<closed_view_type, closed>::apply(closed_range);
}
};

9
include/boost/geometry/algorithms/detail/is_valid/linestring.hpp
View File

@@ -38,13 +38,13 @@ struct is_single_point
{
static inline bool apply(Range const& range)
{
typedef typename boost::range_iterator<Range const>::type iterator;
typedef typename point_type<Range>::type point;
BOOST_ASSERT( boost::size(range) > 1 );
return std::find_if(++boost::begin(range),
boost::end(range),
not_equal_point<iterator>(boost::begin(range))
not_equal_to<point>(*boost::begin(range))
)
== boost::end(range);
}
@@ -55,6 +55,7 @@ struct has_three_distinct_points
{
static inline bool apply(Range const& range)
{
typedef typename point_type<Range>::type point;
typedef typename boost::range_iterator<Range const>::type iterator;
BOOST_ASSERT( boost::size(range) > 1 );
@@ -62,14 +63,14 @@ struct has_three_distinct_points
iterator it1 =
std::find_if(boost::begin(range),
boost::end(range),
not_equal_point<iterator>(boost::begin(range)));
not_equal_to<point>(*boost::begin(range)));
BOOST_ASSERT( it1 != boost::end(range) );
iterator it2 =
std::find_if(it1,
boost::end(range),
not_equal_point<iterator>(it1));
not_equal_to<point>(*it1));
return it2 != boost::end(range)
&& !geometry::equals(*boost::begin(range), *it2);