diff --git a/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h b/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h index 5121838db03..1575223d944 100644 --- a/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h +++ b/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h @@ -23,8 +23,8 @@ the faces of the input complex. It has to be a model of the concept `MeshDomain_3`. \tparam Cb is the cell base class. It has to be a model -of the concept `RegularTriangulationCellBase_3` and defaults to -`Regular_triangulation_cell_base_3`. +of the concept `RegularTriangulationCellBaseWithWeightedCircumcenter_3` and defaults to +`Regular_triangulation_cell_base_with_weighted_circumcenter_3`. \cgalModels `MeshCellBase_3` diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h b/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h index 3f246f34606..ea5a9ffb801 100644 --- a/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h +++ b/Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h @@ -4,7 +4,8 @@ The concept `MeshCellBase_3` describes the requirements for the `Cell` type of the triangulation -used in the 3D mesh generation process. The type `MeshCellBase_3` refines the concept `RegularTriangulationCellBase_3` +used in the 3D mesh generation process. The type `MeshCellBase_3` +refines the concept `RegularTriangulationCellBaseWithWeightedCircumcenter_3` and must be copy constructible. The concept `MeshCellBase_3` includes a way to store and retrieve @@ -39,7 +40,7 @@ and `is_facet_visited(1)` in parallel must be safe) Moreover, the parallel algorithms require an erase counter in each cell (see below). -\cgalRefines `RegularTriangulationCellBase_3` +\cgalRefines `RegularTriangulationCellBaseWithWeightedCircumcenter_3` \cgalRefines `CopyConstructible` \cgalHasModel `CGAL::Compact_mesh_cell_base_3` @@ -152,13 +153,6 @@ Returns the surface center index of `facet(i)`. */ Index get_facet_surface_center_index(int i); -/*! -Invalidates the circumcenter value stored in the cell. -This value is usually stored in the cell, but the optimizers need to be able to -invalidate this cache value. -*/ -void invalidate_circumcenter(); - /// Get the erase counter. /// Only required by the parallel algorithms. /// See `CGAL::Compact_container` for more details. diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h index f0490c9fe3f..5efa4f5d98a 100644 --- a/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h +++ b/Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h @@ -20,7 +20,7 @@ circumcenter. be a model of `RegularTriangulationCellBase_3`. It has the default value `Regular_triangulation_cell_base_3`. -\cgalModels `RegularTriangulationCellBase_3` +\cgalModels `RegularTriangulationCellBaseWithWeightedCircumcenter_3` \sa `CGAL::Triangulation_cell_base_3` \sa `CGAL::Triangulation_cell_base_with_info_3` @@ -41,13 +41,13 @@ typedef Traits::Weighted_point_3 Point; /*! \name Access function As a model of the concept `RegularTriangulationCellBase_3`, -`Regular_triangulation_cell_base_3` +`Regular_triangulation_cell_base_with_weighted_circumcenter_3` provides a `weighted_circumcenter()` member fonction. In this model, the `weighted_circumcenter()` member fonction returns the weighted circumcenter of the cell. -This `Point_3` is computed by the `Construct_weighted_circumcenter_3` constructor of the traits class -when this function is first called. +This `Point_3` is computed using the `Construct_weighted_circumcenter_3` functor +of the traits class when this function is first called and its value is stored. In the next calls, the cached value is returned. Note that the returned point has no weight. diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h index 40b9fa9f8d8..2826558a689 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationCellBase_3.h @@ -36,7 +36,6 @@ 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_weighted_circumcenter_3 \sa `RegularTriangulationTraits_3` diff --git a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt index a902e280a2c..c32542ab661 100644 --- a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt +++ b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt @@ -79,6 +79,7 @@ is opposite to the vertex with the same index. See - `DelaunayTriangulationCellBase_3` - `RegularTriangulationVertexBase_3` - `RegularTriangulationCellBase_3` +- `RegularTriangulationCellBaseWithWeightedCircumcenter_3` - `TriangulationDataStructure_3` - `WeightedPoint`