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

Merge pull request #1417 from afabri/Polyline_simplification-Bugfix_choose_correct_Itag-GF 

Fix bug in polyline simplification
This commit is contained in:
Laurent Rineau 2016-09-15 17:20:15 +02:00 committed by GitHub
parent 3bef239e82 147ebae4d6
commit 17057027bc
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h
View File

@ -339,7 +339,7 @@ template <class Traits, class Container, class CostFunction, class StopFunction>
typedef Vertex_base_2< K > Vb;
typedef CGAL::Constrained_triangulation_face_base_2<K> Fb;
typedef CGAL::Triangulation_data_structure_2<Vb,Fb> TDS;
typedef CGAL::Constrained_Delaunay_triangulation_2<K, TDS, CGAL::Exact_predicates_tag> CDT;
typedef CGAL::Constrained_Delaunay_triangulation_2<K, TDS,typename internal::Itag<K>::type> CDT;
typedef CGAL::Constrained_triangulation_plus_2<CDT> PCT;
typedef typename PCT::Constraint_id Constraint_id;
typedef typename PCT::Vertices_in_constraint_iterator Vertices_in_constraint_iterator;
@ -387,7 +387,7 @@ Simplifies an open or closed polyline given as an iterator range of 2D \cgal poi
typedef Vertex_base_2< K > Vb;
typedef CGAL::Constrained_triangulation_face_base_2<K> Fb;
typedef CGAL::Triangulation_data_structure_2<Vb,Fb> TDS;
typedef CGAL::Constrained_Delaunay_triangulation_2<K, TDS, CGAL::Exact_predicates_tag> CDT;
typedef CGAL::Constrained_Delaunay_triangulation_2<K, TDS,typename internal::Itag<K>::type > CDT;
typedef CGAL::Constrained_triangulation_plus_2<CDT> PCT;
typedef typename PCT::Constraint_id Constraint_id;
typedef typename PCT::Vertices_in_constraint_iterator Vertices_in_constraint_iterator;

12
Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -32,12 +32,24 @@
#include <CGAL/intersections.h>
#include <CGAL/squared_distance_2.h>
#include <boost/mpl/if.hpp>
namespace CGAL {
struct No_intersection_tag{};
struct Exact_intersections_tag{}; // to be used with an exact number type
struct Exact_predicates_tag{}; // to be used with filtered exact number
namespace internal {
template <typename K>
struct Itag {
typedef typename boost::mpl::if_<typename Algebraic_structure_traits<typename K::FT>::Is_exact,
Exact_intersections_tag,
Exact_predicates_tag>::type type;
};
} // namespace internal
template < class Gt,
class Tds = Triangulation_data_structure_2 <