From 96f0f391138a4c46354919d678eca54465a5f276 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 7 Jun 2016 14:49:46 +0200 Subject: [PATCH] Updates the CDT constructors, the tests and the doc. --- .../CGAL/Constrained_Delaunay_triangulation_2.h | 6 +++--- .../CGAL/Constrained_Delaunay_triangulation_2.h | 13 ++++--------- .../include/CGAL/Constrained_triangulation_plus_2.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_Delaunay_triangulation_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_Delaunay_triangulation_2.h index d2b5e06f9ce..4b4e6a27021 100644 --- a/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_Delaunay_triangulation_2.h +++ b/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_Delaunay_triangulation_2.h @@ -108,9 +108,9 @@ Constrained_Delaunay_triangulation_2(const Constrained_Delaunay_triangulation_2& cdt1); /*! -A templated constructor which introduces and builds -a constrained triangulation with constraints in the range -`[first,last)`. +Builds a constrained triangulation with constraints +in the range `[first,last)` by calling +`insert_constraints(first, last)`. \tparam ConstraintIterator must be an `InputIterator` with the value type `std::pair` or `Segment`. */ template Constrained_Delaunay_triangulation_2( diff --git a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h index 4f43b3784df..0c4a1a054e9 100644 --- a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h @@ -120,14 +120,11 @@ public: Constrained_Delaunay_triangulation_2(const CDt& cdt) : Ctr(cdt) {} - Constrained_Delaunay_triangulation_2(List_constraints& lc, + Constrained_Delaunay_triangulation_2(const List_constraints& lc, const Geom_traits& gt=Geom_traits()) : Ctr(gt) - { - typename List_constraints::iterator itc = lc.begin(); - for( ; itc != lc.end(); ++itc) { - insert((*itc).first, (*itc).second); - } + { + insert_constraints(lc.begin(), lc.end()); CGAL_triangulation_postcondition( is_valid() ); } @@ -137,9 +134,7 @@ public: const Geom_traits& gt=Geom_traits() ) : Ctr(gt) { - for ( ; it != last; it++) { - insert((*it).first, (*it).second); - } + insert_constraints(it, last); CGAL_triangulation_postcondition( is_valid() ); } diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index 21db1b05cfd..ff6641eebaf 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -222,7 +222,7 @@ public: } - Constrained_triangulation_plus_2(std::list > constraints, + Constrained_triangulation_plus_2(const std::list > &constraints, const Geom_traits& gt=Geom_traits() ) : Triangulation(gt) , hierarchy(Vh_less_xy(this))