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

rename Regular_triangulation_cell_base_with_circumcenter_3 

to Regular_triangulation_cell_base_with_weighted_circumcenter_3
This commit is contained in:
Jane Tournois 2014-02-06 15:50:38 +01:00
parent fc2be4f233
commit 75771bacb3
7 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesh_3/include/CGAL/Mesh_cell_base_3.h
View File

@ -30,7 +30,7 @@
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
#include <CGAL/Regular_triangulation_cell_base_3.h> #include <CGAL/Regular_triangulation_cell_base_3.h>
#include <CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h> #include <CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h>
#include <CGAL/Mesh_3/Mesh_surface_cell_base_3.h> #include <CGAL/Mesh_3/Mesh_surface_cell_base_3.h>
#include <CGAL/Mesh_3/io_signature.h> #include <CGAL/Mesh_3/io_signature.h>
@ -40,8 +40,8 @@ namespace CGAL {
// Cell base class used in 3D meshing process. // Cell base class used in 3D meshing process.
// Adds information to Cb about the cell of the input complex containing it // Adds information to Cb about the cell of the input complex containing it
template< class GT, template< class GT,
class MD, class MD,
class Cb = CGAL::Regular_triangulation_cell_base_with_circumcenter_3< class Cb= CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3<
GT, CGAL::Regular_triangulation_cell_base_3<GT> > > GT, CGAL::Regular_triangulation_cell_base_3<GT> > >
class Mesh_cell_base_3 class Mesh_cell_base_3
: public Mesh_3::Mesh_surface_cell_base_3<GT, MD, Cb> : public Mesh_3::Mesh_surface_cell_base_3<GT, MD, Cb>

2
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_3.h
View File

@ -19,7 +19,7 @@ By default, this parameter is instantiated by `Triangulation_cell_base_3<Traits>
\sa `RegularTriangulationCellBase_3` \sa `RegularTriangulationCellBase_3`
\sa `RegularTriangulationTraits_3` \sa `RegularTriangulationTraits_3`
\sa `CGAL::Regular_triangulation_3<Traits,Tds>` \sa `CGAL::Regular_triangulation_3<Traits,Tds>`
\sa `CGAL::Regular_triangulation_cell_base_with_circumcenter_3<RegularTriangulationTraits_3, CellBase_3>` \sa `CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3<RegularTriangulationTraits_3, CellBase_3>`
*/ */

8
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h
View File

@ -4,7 +4,7 @@ namespace CGAL {
/*! /*!
\ingroup PkgTriangulation3VertexCellClasses \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. `Cb`, a cell base class of a 3D triangulation.
It provides an easy way to cache the computation of the weighted circumcenters of It provides an easy way to cache the computation of the weighted circumcenters of
tetrahedra. tetrahedra.
@ -17,7 +17,7 @@ circumcenter.
of `RegularTriangulationTraits_3`. of `RegularTriangulationTraits_3`.
\tparam Cb is a cell base class from which \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`. be a model of `RegularTriangulationCellBase_3`.
It has the default value `Triangulation_cell_base_3<RegularTriangulationTraits_3>`. It has the default value `Triangulation_cell_base_3<RegularTriangulationTraits_3>`.
@ -29,7 +29,7 @@ It has the default value `Triangulation_cell_base_3<RegularTriangulationTraits_3
*/ */
template< typename TriangulationTraits_3, typename Cb > template< typename TriangulationTraits_3, typename Cb >
class Regular_triangulation_cell_base_with_circumcenter_3 : public Cb { class Regular_triangulation_cell_base_with_weighted_circumcenter_3 : public Cb {
public: public:
/// \name Types /// \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 */ } /* end namespace CGAL */

2
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_with_circumcenter_3.h
View File

@ -6,7 +6,7 @@ namespace CGAL {
\deprecated This class is deprecated since \cgal 4.4. The class \deprecated This class is deprecated since \cgal 4.4. The class
`Delaunay_triangulation_cell_base_with_circumcenter_3` should `Delaunay_triangulation_cell_base_with_circumcenter_3` should
be used instead. 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. `Triangulation_cell_base_with_info_3` can also be used in other frameworks.
The class `Triangulation_cell_base_with_circumcenter_3` derives from The class `Triangulation_cell_base_with_circumcenter_3` derives from

2
Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h
View File

@ -36,7 +36,7 @@ and an operator to compute its weighted circumcenter.
\cgalRefines `TriangulationCellBase_3` \cgalRefines `TriangulationCellBase_3`
\cgalHasModel CGAL::Regular_triangulation_cell_base_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 `TriangulationCellBase_3`
\sa `RegularTriangulationTraits_3` \sa `RegularTriangulationTraits_3`

2
Triangulation_3/doc/Triangulation_3/PackageDescription.txt
View File

@ -93,7 +93,7 @@ is opposite to the vertex with the same index. See
- `CGAL::Delaunay_triangulation_cell_base_3<Traits,Cb>` - `CGAL::Delaunay_triangulation_cell_base_3<Traits,Cb>`
- `CGAL::Delaunay_triangulation_cell_base_with_circumcenter_3<Traits,Cb>` - `CGAL::Delaunay_triangulation_cell_base_with_circumcenter_3<Traits,Cb>`
- `CGAL::Regular_triangulation_cell_base_3<Traits,Cb>` - `CGAL::Regular_triangulation_cell_base_3<Traits,Cb>`
- `CGAL::Regular_triangulation_cell_base_with_circumcenter_3<Traits,Cb>` - `CGAL::Regular_triangulation_cell_base_with_weighted_circumcenter_3<Traits,Cb>`
- `CGAL::Triangulation_vertex_base_3<TriangulationTraits_3, TriangulationDSVertexBase_3>` - `CGAL::Triangulation_vertex_base_3<TriangulationTraits_3, TriangulationDSVertexBase_3>`
- `CGAL::Triangulation_vertex_base_with_info_3<Info, TriangulationTraits_3, TriangulationVertexBase_3>` - `CGAL::Triangulation_vertex_base_with_info_3<Info, TriangulationTraits_3, TriangulationVertexBase_3>`
- `CGAL::Triangulation_simplex_3<Triangulation_3>` - `CGAL::Triangulation_simplex_3<Triangulation_3>`

25
Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_circumcenter_3.h → Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h
View File

@ -32,7 +32,7 @@
namespace CGAL { namespace CGAL {
template < typename GT, typename Cb = Triangulation_cell_base_3<GT> > template < typename GT, typename Cb = Triangulation_cell_base_3<GT> >
class Regular_triangulation_cell_base_with_circumcenter_3 class Regular_triangulation_cell_base_with_weighted_circumcenter_3
: public Cb : public Cb
{ {
typedef typename GT::Point_3 Point_3; typedef typename GT::Point_3 Point_3;
@ -58,41 +58,44 @@ public:
template < typename TDS2 > template < typename TDS2 >
struct Rebind_TDS { struct Rebind_TDS {
typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2; typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;
typedef Regular_triangulation_cell_base_with_circumcenter_3<GT, Cb2> Other; typedef
Regular_triangulation_cell_base_with_weighted_circumcenter_3<GT, Cb2>
Other;
}; };
Regular_triangulation_cell_base_with_circumcenter_3() Regular_triangulation_cell_base_with_weighted_circumcenter_3()
: Cb(), weighted_circumcenter_(NULL) {} : Cb(), weighted_circumcenter_(NULL) {}
Regular_triangulation_cell_base_with_circumcenter_3 Regular_triangulation_cell_base_with_weighted_circumcenter_3
(const Regular_triangulation_cell_base_with_circumcenter_3 &c) (const Regular_triangulation_cell_base_with_weighted_circumcenter_3 &c)
: Cb(c), : Cb(c),
weighted_circumcenter_(c.weighted_circumcenter_ != NULL ? weighted_circumcenter_(c.weighted_circumcenter_ != NULL ?
new Bare_point(*(c.weighted_circumcenter_)) : new Bare_point(*(c.weighted_circumcenter_)) :
NULL) NULL)
{} {}
Regular_triangulation_cell_base_with_circumcenter_3& Regular_triangulation_cell_base_with_weighted_circumcenter_3&
operator=(const Regular_triangulation_cell_base_with_circumcenter_3 &c) 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); std::swap(tmp, *this);
return *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 v0, Vertex_handle v1,
Vertex_handle v2, Vertex_handle v3) Vertex_handle v2, Vertex_handle v3)
: Cb(v0, v1, v2, v3), weighted_circumcenter_(NULL) {} : 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 v0, Vertex_handle v1,
Vertex_handle v2, Vertex_handle v3, Vertex_handle v2, Vertex_handle v3,
Cell_handle n0, Cell_handle n1, Cell_handle n0, Cell_handle n1,
Cell_handle n2, Cell_handle n3) Cell_handle n2, Cell_handle n3)
: Cb(v0, v1, v2, v3, n0, n1, n2, n3), weighted_circumcenter_(NULL) {} : 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_; delete weighted_circumcenter_;
} }