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

fix and improvement during peer-review with Jane

This commit is contained in:
Laurent Rineau 2024-12-05 16:13:16 +01:00
parent 196f00c34b
commit b54b80f412
11 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Constrained_triangulation_3/doc/Constrained_triangulation_3/Doxyfile.in
View File

@ -2,5 +2,5 @@
PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Constrained Triangulations"
INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}
EXAMPLE_PATH += ${CGAL_PACKAGE_INCLUDE_DIR}
EXAMPLE_PATH += ${CGAL_PACKAGE_DOC_DIR}
EXAMPLE_PATH += ${CGAL_PACKAGE_DOC_DIR}/doc_fragments
QUIET = YES

0
Constrained_triangulation_3/doc/Constrained_triangulation_3/doc_fragments/CDT_3_common_named_parameters.dox → Constrained_triangulation_3/doc/Constrained_triangulation_3/doc_fragments/CDT_3_common_named_parameters.dox-frag
View File

0
Constrained_triangulation_3/doc/Constrained_triangulation_3/doc_fragments/CDT_3_common_template_parameters.dox → Constrained_triangulation_3/doc/Constrained_triangulation_3/doc_fragments/CDT_3_common_template_parameters.dox-frag
View File

0
Constrained_triangulation_3/doc/Constrained_triangulation_3/doc_fragments/CDT_3_description_of_input.dox → Constrained_triangulation_3/doc/Constrained_triangulation_3/doc_fragments/CDT_3_description_of_input.dox-frag
View File

42
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h
View File

@ -551,7 +551,9 @@ public:
\c Conforming_constrained_Delaunay_triangulation_3 can be constructed from either
a polygon soup or a polygon mesh.
\include{doc} doc_fragments/CDT_3_description_of_input.dox
## Input Data
\include{doc} CDT_3_description_of_input.dox-frag
*/
/*!
@ -967,7 +969,7 @@ public:
using Vertex_marker = CDT_3_vertex_marker;
using Cell_marker = CDT_3_cell_marker;
using Face_index = CDT_3_face_index;
using Face_index = CDT_3_signed_index;
using Conforming_Dt::Conforming_Dt;
@ -1371,7 +1373,7 @@ public:
return (f_vertices == fh_vertices);
}
void set_facet_constrained(Facet f, CDT_3_face_index polygon_contraint_id,
void set_facet_constrained(Facet f, CDT_3_signed_index polygon_contraint_id,
CDT_2_face_handle fh)
{
CGAL_assertion(fh == CDT_2_face_handle{} || same_triangle(f, fh));
@ -1437,7 +1439,7 @@ public:
auto& borders = face_index < 0 ? this->face_borders.emplace_back() : this->face_borders[face_index];
auto& border = borders.emplace_back();
const auto polygon_contraint_id =
face_index < 0 ? static_cast<CDT_3_face_index>(this->face_borders.size() - 1) : face_index;
face_index < 0 ? static_cast<CDT_3_signed_index>(this->face_borders.size() - 1) : face_index;
do {
const auto va = *circ;
++circ;
@ -1532,7 +1534,7 @@ public:
}
private:
void fill_cdt_2(CDT_2& cdt_2, CDT_3_face_index polygon_contraint_id)
void fill_cdt_2(CDT_2& cdt_2, CDT_3_signed_index polygon_contraint_id)
{
const auto vec_of_handles = std::invoke([this, polygon_contraint_id]() {
std::vector<std::vector<Vertex_handle>> vec_of_handles;
@ -1715,7 +1717,7 @@ private:
}
}
void search_for_missing_subfaces(CDT_3_face_index polygon_contraint_id)
void search_for_missing_subfaces(CDT_3_signed_index polygon_contraint_id)
{
const CDT_2& cdt_2 = face_cdt_2[polygon_contraint_id];
@ -1764,7 +1766,7 @@ private:
return fh_region;
}
auto brute_force_border_3_of_region([[maybe_unused]] CDT_3_face_index face_index,
auto brute_force_border_3_of_region([[maybe_unused]] CDT_3_signed_index face_index,
[[maybe_unused]] int region_index,
[[maybe_unused]] const CDT_2& cdt_2,
const std::vector<CDT_2_face_handle>& fh_region)
@ -1848,7 +1850,7 @@ private:
// The returned edge has its first vertex above the region.
template <typename Fh_region, typename Edges_container>
std::optional<Search_first_intersection_result_type>
search_first_intersection(CDT_3_face_index /*face_index*/,
search_first_intersection(CDT_3_signed_index /*face_index*/,
const CDT_2& cdt_2,
const Fh_region& fh_region,
const Edges_container& border_edges)
@ -1895,7 +1897,7 @@ private:
};
template <typename Fh_region, typename Vertices_container, typename Edges_container>
auto construct_cavities(CDT_3_face_index face_index,
auto construct_cavities(CDT_3_signed_index face_index,
int region_index,
const CDT_2& cdt_2,
const Fh_region& fh_region,
@ -2484,7 +2486,7 @@ private:
using Conforming_Dt::with_point_and_info;
template <typename Fh_region>
void restore_subface_region(CDT_3_face_index face_index, int region_index,
void restore_subface_region(CDT_3_signed_index face_index, int region_index,
CDT_2& non_const_cdt_2, Fh_region& non_const_fh_region)
{
if(this->debug_regions()) {
@ -2791,7 +2793,7 @@ private:
std::for_each(fh_region.begin(), fh_region.end(), [](auto fh) { fh->info().is_in_region = 3; });
// dump_3d_triangulation(face_index, region_index, "lower", lower_cavity_triangulation);
// dump_3d_triangulation(face_index, region_index, "upper", upper_cavity_triangulation);
auto dump_facets_of_cavity_border = [&](CDT_3_face_index face_index, int region_index, std::string type,
auto dump_facets_of_cavity_border = [&](CDT_3_signed_index face_index, int region_index, std::string type,
const auto& cavity_triangulation) {
std::ofstream out(std::string("dump_plane_facets_of_region_") + std::to_string(face_index) + "_" +
std::to_string(region_index) + "_" + type + ".off");
@ -3197,7 +3199,7 @@ private:
}
std::optional<std::pair<Vertex_handle, Vertex_handle>>
return_encroached_constrained_edge([[maybe_unused]] CDT_3_face_index face_index,
return_encroached_constrained_edge([[maybe_unused]] CDT_3_signed_index face_index,
const CDT_2& cdt_2,
Point_3 steiner_pt) const
{
@ -3221,7 +3223,7 @@ private:
}
std::optional<std::pair<Vertex_handle, Vertex_handle>>
try_to_insert_circumcenter_in_face_or_return_encroached_edge(CDT_3_face_index face_index,
try_to_insert_circumcenter_in_face_or_return_encroached_edge(CDT_3_signed_index face_index,
CDT_2& non_const_cdt_2,
CDT_2_face_handle fh_2d)
{
@ -3369,7 +3371,7 @@ private:
// assert(is_valid(true));
}
bool restore_face(CDT_3_face_index face_index) {
bool restore_face(CDT_3_signed_index face_index) {
CDT_2& non_const_cdt_2 = face_cdt_2[face_index];
const CDT_2& cdt_2 = non_const_cdt_2;
#if CGAL_CDT_3_CAN_USE_CXX20_FORMAT
@ -3671,7 +3673,7 @@ public:
write_facets(out, tr, tr.finite_facets());
}
void dump_3d_triangulation(CDT_3_face_index face_index,
void dump_3d_triangulation(CDT_3_signed_index face_index,
int region_index,
std::string type,
const Conforming_constrained_Delaunay_triangulation_3_impl& tr)
@ -3694,21 +3696,21 @@ public:
write_3d_triangulation_to_OFF(dump, *this);
}
void dump_region(CDT_3_face_index face_index, int region_index, const CDT_2& cdt_2) {
void dump_region(CDT_3_signed_index face_index, int region_index, const CDT_2& cdt_2) {
std::ofstream dump_region(std::string("dump_region_") + std::to_string(face_index) + "_" +
std::to_string(region_index) + ".off");
dump_region.precision(17);
write_region_to_OFF(dump_region, cdt_2);
}
void dump_face(CDT_3_face_index face_index) {
void dump_face(CDT_3_signed_index face_index) {
const auto& cdt_2 = face_cdt_2[face_index];
std::ofstream dump_region(std::string("dump_face_") + std::to_string(face_index) + ".off");
dump_region.precision(17);
write_region_to_OFF(dump_region, cdt_2);
}
void dump_region(CDT_3_face_index face_index, int region_index) {
void dump_region(CDT_3_signed_index face_index, int region_index) {
const auto& cdt_2 = face_cdt_2[face_index];
dump_region(face_index, region_index, cdt_2);
}
@ -3780,7 +3782,7 @@ public:
}
template <typename Facets_range>
void dump_facets_of_cavity(CDT_3_face_index face_index, int region_index, std::string type,
void dump_facets_of_cavity(CDT_3_signed_index face_index, int region_index, std::string type,
const Facets_range& facets_range)
{
std::ofstream out(std::string("dump_facets_of_region_") + std::to_string(face_index) + "_" +
@ -3830,7 +3832,7 @@ protected:
bool is_reverse = false;
};
std::vector<std::vector<std::vector<Face_edge>>> face_borders;
std::multimap<Constraint_id, CDT_3_face_index> constraint_to_faces;
std::multimap<Constraint_id, CDT_3_signed_index> constraint_to_faces;
// boost::dynamic_bitset<> face_constraint_misses_subfaces;
// std::size_t face_constraint_misses_subfaces_find_first() const {

6
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h
View File

@ -47,7 +47,7 @@ class Conforming_constrained_Delaunay_triangulation_cell_base_3
Conforming_constrained_Delaunay_triangulation_cell_data_3 ccdt_3_data_;
mutable bool sliver_cache_validity_ = false;
Subdomain_index subdomain_index_ = -1;
CDT_3_signed_index subdomain_index_ = -1;
double sliver_value_ = 0.;
public:
// To get correct cell type in TDS
@ -69,8 +69,8 @@ public:
}
// model of SimplicialMeshCellBase_3
using Surface_patch_index = CDT_3_face_index;
using Subdomain_index = int;
using Surface_patch_index = CDT_3_signed_index;
using Subdomain_index = CDT_3_signed_index;
bool is_facet_on_surface(int i) const { return ccdt_3_data().is_facet_constrained(i); }
Surface_patch_index surface_patch_index(int i) const { return ccdt_3_data().face_constraint_index(i) + 1; }
void set_surface_patch_index(int i, Surface_patch_index index)

9
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_data_3.h
View File

@ -29,6 +29,7 @@ enum class CDT_3_cell_marker {
};
/*!
* @ingroup PkgCT_3Classes
* @brief Internal per-cell data for \cgal 3D conforming constrained Delaunay triangulations
*
* This class is an internal detail of the implementation of \cgal 3D conforming constrained Delaunay triangulations.
@ -41,7 +42,7 @@ class Conforming_constrained_Delaunay_triangulation_cell_data_3 {
template <typename Tr> friend class Conforming_constrained_Delaunay_triangulation_3_impl;
/// @endcond
std::array<CDT_3_face_index, 4> face_id = { -1, -1, -1, -1 };
std::array<CDT_3_signed_index, 4> face_id = { -1, -1, -1, -1 };
std::array<void*, 4> facet_2d = {nullptr, nullptr, nullptr, nullptr};
std::bitset<static_cast<unsigned>(CDT_3_cell_marker::nb_of_markers)> markers;
@ -52,7 +53,7 @@ class Conforming_constrained_Delaunay_triangulation_cell_data_3 {
void clear_marks() { markers.reset(); }
template <typename Facet_handle>
void set_facet_constraint(int i, CDT_3_face_index face_id,
void set_facet_constraint(int i, CDT_3_signed_index face_id,
Facet_handle facet_2d)
{
this->face_id[unsigned(i)] = face_id;
@ -72,11 +73,11 @@ public:
/// @brief Returns the index of the constraint that constrains the
/// i-th facet of the cell.
/// @pre `is_facet_constrained(i)`
CDT_3_face_index face_constraint_index(int i) const {
CDT_3_signed_index face_constraint_index(int i) const {
return face_id[unsigned(i)];
}
/// @brief Set the index of the constraint that constrains the i-th facet of the cell.
void set_face_constraint_index(int i, CDT_3_face_index index) {
void set_face_constraint_index(int i, CDT_3_signed_index index) {
face_id[unsigned(i)] = index;
}
};

2
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h
View File

@ -42,7 +42,7 @@ class Conforming_constrained_Delaunay_triangulation_vertex_base_3 : public Base_
{
Conforming_constrained_Delaunay_triangulation_vertex_data_3 ccdt_3_data_;
bool cache_validity_ = false;
CDT_3_face_index index_ = 0;
CDT_3_signed_index index_ = 0;
int dim_ = -1;
std::size_t number_of_incident_facets_ = 0;
std::size_t number_of_components_ = 0;

9
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_data_3.h
View File

@ -23,6 +23,7 @@ namespace CGAL {
#ifdef DOXYGEN_RUNNING
/*!
* @ingroup PkgCT_3Classes
* @brief Internal per-vertex data for \cgal 3D conforming constrained Delaunay triangulations
*
* This class is an internal detail of the implementation of \cgal 3D conforming constrained Delaunay triangulations.
@ -45,7 +46,7 @@ enum class CDT_3_vertex_marker {
nb_of_markers
};
struct Conforming_constrained_Delaunay_triangulation_vertex_data_3 {
class Conforming_constrained_Delaunay_triangulation_vertex_data_3 {
protected:
// TODO: check and improve the compactness of this class
CDT_3_vertex_type m_vertex_type = CDT_3_vertex_type::FREE;
@ -56,7 +57,7 @@ protected:
void* c_id = nullptr;
} on_edge;
struct On_face{
CDT_3_face_index face_index = 0;
CDT_3_signed_index face_index = 0;
} on_face;
} u {U::On_edge{}};
@ -113,12 +114,12 @@ public:
return C_id(static_cast<Vertex_list_ptr>(u.on_edge.c_id));
}
void set_Steiner_vertex_in_face(CDT_3_face_index face_index) {
void set_Steiner_vertex_in_face(CDT_3_signed_index face_index) {
m_vertex_type = CDT_3_vertex_type::STEINER_IN_FACE;
u.on_face = typename U::On_face{face_index};
}
CDT_3_face_index face_index() const {
CDT_3_signed_index face_index() const {
CGAL_assertion(m_vertex_type == CDT_3_vertex_type::STEINER_IN_FACE);
return u.on_face.face_index;
}

4
Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3_types.h
View File

@ -20,12 +20,12 @@ namespace CGAL {
/**
* @ingroup PkgCT_3Classes
* \brief Integral type to store the index of constraints.
* \brief Signed integral type to store the index of constraints.
* @see `Conforming_constrained_Delaunay_triangulation_cell_data_3`
* @see `Conforming_constrained_Delaunay_triangulation_vertex_base_3`
*
*/
using CDT_3_face_index = int; // must be signed
using CDT_3_signed_index = int; // must be signed
} // namespace CGAL

10
Constrained_triangulation_3/include/CGAL/make_conforming_constrained_Delaunay_triangulation_3.h
View File

@ -35,7 +35,7 @@ namespace CGAL {
Input Data {#make_conforming_constrained_Delaunay_triangulation_3_input_data}
----------
\include{doc} doc_fragments/CDT_3_description_of_input.dox
\include{doc} CDT_3_description_of_input.dox-frag
Template Parameters {#make_conforming_constrained_Delaunay_triangulation_3_template_parameters}
-------------------
@ -75,7 +75,7 @@ namespace CGAL {
* \relates CGAL::Conforming_constrained_Delaunay_triangulation_3
*
* \tparam PolygonMesh a model of `FaceListGraph`
* \include{doc} doc_fragments/CDT_3_common_template_parameters.dox
* \include{doc} CDT_3_common_template_parameters.dox-frag
*
* \param mesh the polygon mesh representing the constraints
* \param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below
@ -99,7 +99,7 @@ namespace CGAL {
* \cgalParamExtra{Otherwise, faces with the same patch identifier are considered part of the same surface patch.}
* \cgalParamNEnd
*
* \include{doc} doc_fragments/CDT_3_common_named_parameters.dox
* \include{doc} CDT_3_common_named_parameters.dox-frag
* \cgalNamedParamsEnd
*
* \pre `mesh` must not have self-intersections:
@ -131,7 +131,7 @@ auto make_conforming_constrained_Delaunay_triangulation_3(const PolygonMesh &mes
* of the polygon soup
* \tparam PolygonRange a model of the concept `RandomAccessContainer` whose value type is a model of the concept
* `RandomAccessContainer` whose value type is `std::size_t`
* \include{doc} doc_fragments/CDT_3_common_template_parameters.dox
* \include{doc} CDT_3_common_template_parameters.dox-frag
*
* \param points a range of points representing the vertices of the polygon soup
* \param polygons a range of ranges of indices representing the faces of the polygon soup
@ -153,7 +153,7 @@ auto make_conforming_constrained_Delaunay_triangulation_3(const PolygonMesh &mes
* \cgalParamExtra{Otherwise faces with the same patch identifier are considered part of the same surface patch.}
* \cgalParamNEnd
*
* \include{doc} doc_fragments/CDT_3_common_named_parameters.dox
* \include{doc} CDT_3_common_named_parameters.dox-frag
*
* \cgalNamedParamsEnd
*