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

Re-organized P3 triangulations constructors

This commit is contained in:
Mael Rouxel-Labbé 2017-05-16 11:20:30 +02:00
parent 650e257f2d
commit 33956eaff1
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_3.h
View File

@ -215,20 +215,17 @@ private:
public:
/** @name Creation */ //@{
Periodic_3_Delaunay_triangulation_3(
const Iso_cuboid& domain = Iso_cuboid(0,0,0,1,1,1),
const Geometric_traits& gt = Geometric_traits())
: Base(domain, gt),
too_long_edge_counter(0)
Periodic_3_Delaunay_triangulation_3(const Iso_cuboid& domain = Iso_cuboid(0,0,0,1,1,1),
const Geometric_traits& gt = Geometric_traits())
: Base(domain, gt), too_long_edge_counter(0)
{
edge_length_threshold = FT(0.166) * (domain.xmax()-domain.xmin())
* (domain.xmax()-domain.xmin());
}
// copy constructor duplicates vertices and cells
Periodic_3_Delaunay_triangulation_3(
const Periodic_3_Delaunay_triangulation_3& tr) : Base(tr),
edge_length_threshold(tr.edge_length_threshold)
Periodic_3_Delaunay_triangulation_3(const Periodic_3_Delaunay_triangulation_3& tr)
: Base(tr), edge_length_threshold(tr.edge_length_threshold)
{
if (is_1_cover()) {
tds() = tr.tds();
@ -239,15 +236,27 @@ public:
CGAL_triangulation_expensive_postcondition( is_valid() );
}
void copy_multiple_covering(const Periodic_3_Delaunay_triangulation_3 & tr);
template < typename InputIterator >
Periodic_3_Delaunay_triangulation_3(InputIterator first, InputIterator last,
const Iso_cuboid& domain = Iso_cuboid(0,0,0,1,1,1),
const Geometric_traits& gt = Geometric_traits())
: Base(domain, gt), too_long_edge_counter(0)
{
edge_length_threshold = FT(0.166) * (domain.xmax()-domain.xmin())
* (domain.xmax()-domain.xmin());
insert(first, last);
}
Periodic_3_Delaunay_triangulation_3 operator= (Periodic_3_Delaunay_triangulation_3 tr)
Periodic_3_Delaunay_triangulation_3 operator=(Periodic_3_Delaunay_triangulation_3 tr)
{
tr.swap(*this);
return *this;
}
void swap(Periodic_3_Delaunay_triangulation_3&tr) {
void copy_multiple_covering(const Periodic_3_Delaunay_triangulation_3 & tr);
void swap(Periodic_3_Delaunay_triangulation_3&tr)
{
std::swap(edge_length_threshold,tr.edge_length_threshold);
std::swap(too_long_edges,tr.too_long_edges);
std::swap(too_long_edge_counter,tr.too_long_edge_counter);
@ -309,18 +318,6 @@ public:
}
return counter;
}
template < typename InputIterator >
Periodic_3_Delaunay_triangulation_3(InputIterator first, InputIterator last,
const Iso_cuboid& domain = Iso_cuboid(0,0,0,1,1,1),
const Geometric_traits& gt = Geometric_traits() )
: Base(domain, gt),
too_long_edge_counter(0)
{
edge_length_threshold = FT(0.166) * (domain.xmax()-domain.xmin())
* (domain.xmax()-domain.xmin());
insert(first, last);
}
//@}
void create_initial_triangulation()