songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use transform_iterator instead of iterator_adaptor

This commit is contained in:
Clement Jamin 2014-04-04 16:06:33 +02:00
parent 0709be0904
commit 9c8a469339
2 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Triangulation/include/CGAL/Delaunay_triangulation.h
View File

@ -303,10 +303,13 @@ public:
else else
{ {
Substitute_point_in_vertex_iterator< Substitute_point_in_vertex_iterator<
Full_cell::Vertex_handle_const_iterator> it(s->vertices_begin(), typename Full_cell::Vertex_handle_const_iterator>
dc_.infinite_vertex(), spivi(dc_.infinite_vertex(), &p_);
&p_);
Orientation o = ori_(it, it + cur_dim_ + 1); Orientation o = ori_(
boost::make_transform_iterator(s->vertices_begin(), spivi),
boost::make_transform_iterator(s->vertices_begin() + cur_dim_ + 1,
spivi));
if( POSITIVE == o ) if( POSITIVE == o )
ok = true; ok = true;

57
Triangulation/include/CGAL/Triangulation.h
View File

@ -29,9 +29,6 @@
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
#include <CGAL/Default.h> #include <CGAL/Default.h>
#include <CGAL/substitute_iterator.h>
namespace CGAL { namespace CGAL {
template < class TriangulationTraits, class TDS_ = Default > template < class TriangulationTraits, class TDS_ = Default >
@ -92,44 +89,35 @@ protected:
// dereferenced. If the current // dereferenced. If the current
// vertex_handle vh == vh_where_point_should_be_substituted, it returns // vertex_handle vh == vh_where_point_should_be_substituted, it returns
// "subtitute_point", otherwise, it returns vh->point() // "subtitute_point", otherwise, it returns vh->point()
template<typename Vertex_iterator> template<class VertexHandleConstIter>
class Substitute_point_in_vertex_iterator class Substitute_point_in_vertex_iterator
: public boost::iterator_adaptor<
Substitute_point_in_vertex_iterator<Vertex_iterator> // Derived
, Vertex_iterator // Base
, typename Vertex_iterator::value_type::value_type::Point // Value
, boost::use_default // CategoryOrTraversal
, typename Vertex_iterator::value_type::value_type::Point const & // Reference
>
{ {
typedef typename Vertex_iterator::value_type Vertex_handle; typedef typename VertexHandleConstIter::value_type Vertex_handle;
typedef typename Vertex_handle::value_type::Point Point; typedef typename Vertex_handle::value_type Vertex;
public: typedef typename Vertex::Point Point;
Substitute_point_in_vertex_iterator()
: Substitute_point_in_vertex_iterator::iterator_adaptor_(Vertex_iterator()) {}
explicit Substitute_point_in_vertex_iterator( public:
Vertex_iterator it, typedef Point const& result_type; // For result_of
const Vertex_handle &vh_where_point_should_be_substituted,
const Point *subtitute_point) Substitute_point_in_vertex_iterator(
: Substitute_point_in_vertex_iterator::iterator_adaptor_(it) Vertex_handle vh_where_point_should_be_substituted,
, vh_where_point_should_be_substituted_(vh_where_point_should_be_substituted) Point const *subtitute_point)
: vh_where_point_should_be_substituted_(vh_where_point_should_be_substituted)
, subtitute_point_(subtitute_point) , subtitute_point_(subtitute_point)
{} {}
private: result_type operator()(Vertex_handle vh) const
friend class boost::iterator_core_access;
typename iterator_adaptor::reference dereference() const
{ {
if (*this->base() == vh_where_point_should_be_substituted_) if (vh == vh_where_point_should_be_substituted_)
return *subtitute_point_; return *subtitute_point_;
else else
return (*this->base())->point(); return vh->point();
} }
private:
Vertex_handle vh_where_point_should_be_substituted_; Vertex_handle vh_where_point_should_be_substituted_;
const Point *subtitute_point_; Point const *subtitute_point_;
}; };
public: public:
@ -1011,10 +999,13 @@ Triangulation<TT, TDS>
} }
Substitute_point_in_vertex_iterator< Substitute_point_in_vertex_iterator<
Full_cell::Vertex_handle_const_iterator> it(s->vertices_begin(), typename Full_cell::Vertex_handle_const_iterator>
s->vertex(i), spivi(s->vertex(i), &p);
&p);
orientations_[i] = orientation_pred(it, it + cur_dim + 1); orientations_[i] = orientation_pred(
boost::make_transform_iterator(s->vertices_begin(), spivi),
boost::make_transform_iterator(s->vertices_begin() + cur_dim + 1,
spivi));
if( orientations_[i] != NEGATIVE ) if( orientations_[i] != NEGATIVE )
{ {