diff --git a/Mesh_3/include/CGAL/Mesh_cell_base_3.h b/Mesh_3/include/CGAL/Mesh_cell_base_3.h index 2dc813054de..40178ede670 100644 --- a/Mesh_3/include/CGAL/Mesh_cell_base_3.h +++ b/Mesh_3/include/CGAL/Mesh_cell_base_3.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include @@ -40,8 +40,8 @@ namespace CGAL { // Cell base class used in 3D meshing process. // Adds information to Cb about the cell of the input complex containing it template< class GT, - class MD, - class Cb = CGAL::Regular_triangulation_cell_base_with_circumcenter_3< + class MD, + class Cb= CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3< GT, CGAL::Regular_triangulation_cell_base_3 > > class Mesh_cell_base_3 : public Mesh_3::Mesh_surface_cell_base_3 diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_3.h index 7c52fdfc20c..1896486b4a7 100644 --- a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_3.h +++ b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_3.h @@ -19,7 +19,7 @@ By default, this parameter is instantiated by `Triangulation_cell_base_3 \sa `RegularTriangulationCellBase_3` \sa `RegularTriangulationTraits_3` \sa `CGAL::Regular_triangulation_3` -\sa `CGAL::Regular_triangulation_cell_base_with_circumcenter_3` +\sa `CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3` */ diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h index 3106390cdd1..788a3973344 100644 --- a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h +++ b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h @@ -4,7 +4,7 @@ namespace CGAL { /*! \ingroup PkgTriangulation3VertexCellClasses -The class `Regular_triangulation_cell_base_with_circumcenter_3` derives from +The class `Regular_triangulation_cell_base_with_weighted_circumcenter_3` derives from `Cb`, a cell base class of a 3D triangulation. It provides an easy way to cache the computation of the weighted circumcenters of tetrahedra. @@ -17,7 +17,7 @@ circumcenter. of `RegularTriangulationTraits_3`. \tparam Cb is a cell base class from which -`Regular_triangulation_cell_base_with_circumcenter_3` derives. Cb should +`Regular_triangulation_cell_base_with_weighted_circumcenter_3` derives. Cb should be a model of `RegularTriangulationCellBase_3`. It has the default value `Triangulation_cell_base_3`. @@ -29,7 +29,7 @@ It has the default value `Triangulation_cell_base_3 -class Regular_triangulation_cell_base_with_circumcenter_3 : public Cb { +class Regular_triangulation_cell_base_with_weighted_circumcenter_3 : public Cb { public: /// \name Types @@ -63,5 +63,5 @@ const Bare_point& weighted_circumcenter( /// @} -}; /* end Regular_triangulation_cell_base_with_circumcenter_3 */ +}; /* end Regular_triangulation_cell_base_with_weighted_circumcenter_3 */ } /* end namespace CGAL */ diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_with_circumcenter_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_with_circumcenter_3.h index 4902c193cee..a14b419e371 100644 --- a/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_with_circumcenter_3.h +++ b/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_with_circumcenter_3.h @@ -6,7 +6,7 @@ namespace CGAL { \deprecated This class is deprecated since \cgal 4.4. The class `Delaunay_triangulation_cell_base_with_circumcenter_3` should be used instead. -`Regular_triangulation_cell_base_with_circumcenter_3` and +`Regular_triangulation_cell_base_with_weighted_circumcenter_3` and `Triangulation_cell_base_with_info_3` can also be used in other frameworks. The class `Triangulation_cell_base_with_circumcenter_3` derives from diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h index f11ae6773cd..ed7d2779326 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h @@ -36,7 +36,7 @@ and an operator to compute its weighted circumcenter. \cgalRefines `TriangulationCellBase_3` \cgalHasModel CGAL::Regular_triangulation_cell_base_3 -\cgalHasModel CGAL::Regular_triangulation_cell_base_with_circumcenter_3 +\cgalHasModel CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3 \sa `TriangulationCellBase_3` \sa `RegularTriangulationTraits_3` diff --git a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt index a2ba8b235f5..01ad34dcc30 100644 --- a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt +++ b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt @@ -93,7 +93,7 @@ is opposite to the vertex with the same index. See - `CGAL::Delaunay_triangulation_cell_base_3` - `CGAL::Delaunay_triangulation_cell_base_with_circumcenter_3` - `CGAL::Regular_triangulation_cell_base_3` -- `CGAL::Regular_triangulation_cell_base_with_circumcenter_3` +- `CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3` - `CGAL::Triangulation_vertex_base_3` - `CGAL::Triangulation_vertex_base_with_info_3` - `CGAL::Triangulation_simplex_3` diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h similarity index 83% rename from Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h rename to Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h index 379858c4532..a0a30f9593c 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h @@ -32,7 +32,7 @@ namespace CGAL { template < typename GT, typename Cb = Triangulation_cell_base_3 > -class Regular_triangulation_cell_base_with_circumcenter_3 +class Regular_triangulation_cell_base_with_weighted_circumcenter_3 : public Cb { typedef typename GT::Point_3 Point_3; @@ -58,41 +58,44 @@ public: template < typename TDS2 > struct Rebind_TDS { typedef typename Cb::template Rebind_TDS::Other Cb2; - typedef Regular_triangulation_cell_base_with_circumcenter_3 Other; + typedef + Regular_triangulation_cell_base_with_weighted_circumcenter_3 + Other; }; - Regular_triangulation_cell_base_with_circumcenter_3() + Regular_triangulation_cell_base_with_weighted_circumcenter_3() : Cb(), weighted_circumcenter_(NULL) {} - Regular_triangulation_cell_base_with_circumcenter_3 - (const Regular_triangulation_cell_base_with_circumcenter_3 &c) + Regular_triangulation_cell_base_with_weighted_circumcenter_3 + (const Regular_triangulation_cell_base_with_weighted_circumcenter_3 &c) : Cb(c), weighted_circumcenter_(c.weighted_circumcenter_ != NULL ? new Bare_point(*(c.weighted_circumcenter_)) : NULL) {} - Regular_triangulation_cell_base_with_circumcenter_3& - operator=(const Regular_triangulation_cell_base_with_circumcenter_3 &c) + Regular_triangulation_cell_base_with_weighted_circumcenter_3& + operator= + (const Regular_triangulation_cell_base_with_weighted_circumcenter_3 &c) { - Regular_triangulation_cell_base_with_circumcenter_3 tmp=c; + RT_cell_base_with_weighted_circumcenter_3 tmp=c; std::swap(tmp, *this); return *this; } - Regular_triangulation_cell_base_with_circumcenter_3( + Regular_triangulation_cell_base_with_weighted_circumcenter_3( Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3) : Cb(v0, v1, v2, v3), weighted_circumcenter_(NULL) {} - Regular_triangulation_cell_base_with_circumcenter_3( + Regular_triangulation_cell_base_with_weighted_circumcenter_3( Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3, Cell_handle n0, Cell_handle n1, Cell_handle n2, Cell_handle n3) : Cb(v0, v1, v2, v3, n0, n1, n2, n3), weighted_circumcenter_(NULL) {} - ~Regular_triangulation_cell_base_with_circumcenter_3() + ~Regular_triangulation_cell_base_with_weighted_circumcenter_3() { delete weighted_circumcenter_; }