mirror of https://github.com/CGAL/cgal
Introduced the tag "Periodic_tag" to mark distinguish periodic triangulations
This commit is contained in:
parent
e3d27128fb
commit
aaeaf35380
|
|
@ -87,6 +87,12 @@ public:
|
||||||
typedef typename Base::Periodic_segment_iterator Periodic_segment_iterator;
|
typedef typename Base::Periodic_segment_iterator Periodic_segment_iterator;
|
||||||
typedef typename Base::Periodic_triangle_iterator Periodic_triangle_iterator;
|
typedef typename Base::Periodic_triangle_iterator Periodic_triangle_iterator;
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_true Periodic_tag;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Base::empty;
|
using Base::empty;
|
||||||
|
|
|
||||||
|
|
@ -204,10 +204,12 @@ public:
|
||||||
typedef value_type& reference;
|
typedef value_type& reference;
|
||||||
// \}
|
// \}
|
||||||
|
|
||||||
|
|
||||||
/// Tag to distinguish regular triangulations from others;
|
/// Tag to distinguish regular triangulations from others;
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
/// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_true Periodic_tag;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// Protected types of Periodic_2_triangulation_2
|
// Protected types of Periodic_2_triangulation_2
|
||||||
typedef typename Gt::Orientation_2 Orientation_2;
|
typedef typename Gt::Orientation_2 Orientation_2;
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,7 @@ public:
|
||||||
//typedef typename PTr::Finite_faces_iterator Finite_faces_iterator;
|
//typedef typename PTr::Finite_faces_iterator Finite_faces_iterator;
|
||||||
|
|
||||||
typedef typename PTr::Weighted_tag Weighted_tag;
|
typedef typename PTr::Weighted_tag Weighted_tag;
|
||||||
|
typedef typename PTr::Periodic_tag Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using PTr_Base::geom_traits;
|
using PTr_Base::geom_traits;
|
||||||
|
|
|
||||||
|
|
@ -114,6 +114,12 @@ public:
|
||||||
typedef typename Base::Periodic_tetrahedron_iterator Periodic_tetrahedron_iterator;
|
typedef typename Base::Periodic_tetrahedron_iterator Periodic_tetrahedron_iterator;
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from Regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_true Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Base::cw;
|
using Base::cw;
|
||||||
using Base::ccw;
|
using Base::ccw;
|
||||||
|
|
|
||||||
|
|
@ -129,6 +129,9 @@ public:
|
||||||
//Tag to distinguish Delaunay from Regular triangulations
|
//Tag to distinguish Delaunay from Regular triangulations
|
||||||
typedef Tag_true Weighted_tag;
|
typedef Tag_true Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_true Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Tr_Base::cw;
|
using Tr_Base::cw;
|
||||||
using Tr_Base::ccw;
|
using Tr_Base::ccw;
|
||||||
|
|
|
||||||
|
|
@ -201,8 +201,12 @@ public:
|
||||||
typedef Point value_type;
|
typedef Point value_type;
|
||||||
typedef const value_type& const_reference;
|
typedef const value_type& const_reference;
|
||||||
|
|
||||||
|
//Tag to distinguish regular triangulations from others
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_true Periodic_tag;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum Iterator_type {
|
enum Iterator_type {
|
||||||
STORED = 0,
|
STORED = 0,
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,9 @@ public:
|
||||||
typedef typename PTr_Base::Facet_iterator Facet_iterator;
|
typedef typename PTr_Base::Facet_iterator Facet_iterator;
|
||||||
typedef typename PTr_Base::Edge_iterator Edge_iterator;
|
typedef typename PTr_Base::Edge_iterator Edge_iterator;
|
||||||
|
|
||||||
|
typedef typename PTr_Base::Weighted_tag Weighted_tag;
|
||||||
|
typedef typename PTr_Base::Periodic_tag Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using PTr_Base::number_of_vertices;
|
using PTr_Base::number_of_vertices;
|
||||||
using PTr_Base::geom_traits;
|
using PTr_Base::geom_traits;
|
||||||
|
|
|
||||||
|
|
@ -90,11 +90,10 @@ public: // PUBLIC NESTED TYPES
|
||||||
//Tag to distinguish triangulations with weighted_points
|
//Tag to distinguish triangulations with weighted_points
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
protected: // DATA MEMBERS
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
typedef typename Base::Rotor Rotor;
|
typedef typename Base::Rotor Rotor;
|
||||||
using Base::maximal_dimension;
|
using Base::maximal_dimension;
|
||||||
using Base::are_incident_full_cells_valid;
|
using Base::are_incident_full_cells_valid;
|
||||||
|
|
|
||||||
|
|
@ -95,11 +95,10 @@ public: // PUBLIC NESTED TYPES
|
||||||
//Tag to distinguish Delaunay from Regular triangulations
|
//Tag to distinguish Delaunay from Regular triangulations
|
||||||
typedef Tag_true Weighted_tag;
|
typedef Tag_true Weighted_tag;
|
||||||
|
|
||||||
protected: // DATA MEMBERS
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
typedef typename Base::Point Weighted_point;
|
typedef typename Base::Point Weighted_point;
|
||||||
typedef typename Base::Rotor Rotor;
|
typedef typename Base::Rotor Rotor;
|
||||||
using Base::maximal_dimension;
|
using Base::maximal_dimension;
|
||||||
|
|
|
||||||
|
|
@ -183,6 +183,12 @@ public:
|
||||||
typedef boost::filter_iterator<Finiteness_predicate, Facet_iterator>
|
typedef boost::filter_iterator<Finiteness_predicate, Facet_iterator>
|
||||||
Finite_facet_iterator;
|
Finite_facet_iterator;
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
protected: // DATA MEMBERS
|
protected: // DATA MEMBERS
|
||||||
|
|
||||||
Triangulation_ds tds_;
|
Triangulation_ds tds_;
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,12 @@ public:
|
||||||
typedef typename Ctr::Less_edge less_edge;
|
typedef typename Ctr::Less_edge less_edge;
|
||||||
typedef typename Ctr::Edge_set Edge_set;
|
typedef typename Ctr::Edge_set Edge_set;
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Ctr::geom_traits;
|
using Ctr::geom_traits;
|
||||||
using Ctr::number_of_vertices;
|
using Ctr::number_of_vertices;
|
||||||
|
|
|
||||||
|
|
@ -143,6 +143,11 @@ public:
|
||||||
// Tag to mark the presence of a hierarchy of constraints
|
// Tag to mark the presence of a hierarchy of constraints
|
||||||
typedef Tag_false Constraint_hierarchy_tag;
|
typedef Tag_false Constraint_hierarchy_tag;
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
class Less_edge;
|
class Less_edge;
|
||||||
typedef std::set<Edge,Less_edge> Edge_set;
|
typedef std::set<Edge,Less_edge> Edge_set;
|
||||||
|
|
|
||||||
|
|
@ -161,10 +161,16 @@ public:
|
||||||
typedef Polyline_constraint_hierarchy_2<Vertex_handle, Vh_less_xy, Point>
|
typedef Polyline_constraint_hierarchy_2<Vertex_handle, Vh_less_xy, Point>
|
||||||
Constraint_hierarchy;
|
Constraint_hierarchy;
|
||||||
public:
|
public:
|
||||||
|
// Tag to mark the presence of a hierarchy of constraints
|
||||||
typedef Tag_true Constraint_hierarchy_tag;
|
typedef Tag_true Constraint_hierarchy_tag;
|
||||||
|
|
||||||
// for user interface with the constraint hierarchy
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
|
// for user interface with the constraint hierarchy
|
||||||
typedef typename Constraint_hierarchy::Vertex_it
|
typedef typename Constraint_hierarchy::Vertex_it
|
||||||
Vertices_in_constraint_iterator;
|
Vertices_in_constraint_iterator;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,12 @@ public:
|
||||||
Finite_vertices_iterator;
|
Finite_vertices_iterator;
|
||||||
typedef typename Triangulation::All_faces_iterator All_faces_iterator;
|
typedef typename Triangulation::All_faces_iterator All_faces_iterator;
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Triangulation::side_of_oriented_circle;
|
using Triangulation::side_of_oriented_circle;
|
||||||
using Triangulation::circumcenter;
|
using Triangulation::circumcenter;
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,9 @@ public:
|
||||||
//Tag to distinguish Delaunay from regular triangulations
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
typedef Tag_true Weighted_tag;
|
typedef Tag_true Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
size_type _hidden_vertices;
|
size_type _hidden_vertices;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -211,9 +211,12 @@ public:
|
||||||
OUTSIDE_CONVEX_HULL, //3
|
OUTSIDE_CONVEX_HULL, //3
|
||||||
OUTSIDE_AFFINE_HULL}; //4
|
OUTSIDE_AFFINE_HULL}; //4
|
||||||
|
|
||||||
//Tag to distinguish regular triangulations from others;
|
//Tag to distinguish regular triangulations from others
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Gt _gt;
|
Gt _gt;
|
||||||
Tds _tds;
|
Tds _tds;
|
||||||
|
|
|
||||||
|
|
@ -76,9 +76,10 @@ class Triangulation_hierarchy_2
|
||||||
typename internal::Bare_point_type<Tr_Base>,
|
typename internal::Bare_point_type<Tr_Base>,
|
||||||
boost::mpl::identity<typename Tr_Base::Point>
|
boost::mpl::identity<typename Tr_Base::Point>
|
||||||
>::type Bare_point;
|
>::type Bare_point;
|
||||||
|
|
||||||
typedef typename Geom_traits::Weighted_point_2 Weighted_point;
|
typedef typename Geom_traits::Weighted_point_2 Weighted_point;
|
||||||
|
|
||||||
typedef typename Tr_Base::Weighted_tag Weighted_tag;
|
typedef typename Tr_Base::Weighted_tag Weighted_tag;
|
||||||
|
typedef typename Tr_Base::Periodic_tag Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Tr_Base::geom_traits;
|
using Tr_Base::geom_traits;
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,11 @@ public:
|
||||||
typedef typename Tr_Base::size_type size_type;
|
typedef typename Tr_Base::size_type size_type;
|
||||||
typedef typename Tr_Base::Locate_type Locate_type;
|
typedef typename Tr_Base::Locate_type Locate_type;
|
||||||
|
|
||||||
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Tr_Base::cw;
|
using Tr_Base::cw;
|
||||||
|
|
|
||||||
|
|
@ -148,6 +148,9 @@ namespace CGAL {
|
||||||
//Tag to distinguish Delaunay from regular triangulations
|
//Tag to distinguish Delaunay from regular triangulations
|
||||||
typedef Tag_true Weighted_tag;
|
typedef Tag_true Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
using Tr_Base::geom_traits;
|
using Tr_Base::geom_traits;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -533,7 +533,8 @@ public:
|
||||||
//Tag to distinguish triangulations with weighted_points
|
//Tag to distinguish triangulations with weighted_points
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
|
// Tag to distinguish periodic triangulations from others
|
||||||
|
typedef Tag_false Periodic_tag;
|
||||||
|
|
||||||
enum Locate_type {
|
enum Locate_type {
|
||||||
VERTEX=0,
|
VERTEX=0,
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,9 @@ public:
|
||||||
// this may be weighted or not
|
// this may be weighted or not
|
||||||
typedef typename Tr_Base::Point Point;
|
typedef typename Tr_Base::Point Point;
|
||||||
|
|
||||||
|
typedef typename Tr_Base::Weighted_tag Weighted_tag;
|
||||||
|
typedef typename Tr_Base::Periodic_tag Periodic_tag;
|
||||||
|
|
||||||
using Tr_Base::number_of_vertices;
|
using Tr_Base::number_of_vertices;
|
||||||
using Tr_Base::geom_traits;
|
using Tr_Base::geom_traits;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue