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

rename np

This commit is contained in:
Sébastien Loriot 2025-05-13 11:26:47 +02:00
parent 0064ea9f3e
commit f40c64ba13
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Constrained_triangulation_3/examples/Constrained_triangulation_3/ccdt_3_check_preconditions.cpp
View File

@ -27,12 +27,12 @@ int main(int argc, char* argv[])
<< mesh.number_of_faces() << "\n";
auto ccdt = CGAL::make_conforming_constrained_Delaunay_triangulation_3(mesh,
CGAL::parameters::check_preconditions(true));
CGAL::parameters::return_empty_on_invalid_input(true));
if(ccdt.number_of_constrained_facets() == 0)
{
std::cerr << "Error: no constrained facets in the CDT.\n";
std::cerr << "Checking preconditions has failed.\n";
std::cerr << "Invalid input.\n";
return EXIT_SUCCESS;
}

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

@ -622,12 +622,12 @@ public:
// ----------------------------------
// cstr... (polygon mesh)
// ----------------------------------
const bool check_preconditions =
parameters::choose_parameter(parameters::get_parameter(np, internal_np::check_preconditions), false);
const bool return_empty_on_invalid_input =
parameters::choose_parameter(parameters::get_parameter(np, internal_np::return_empty_on_invalid_input), false);
CGAL_precondition_msg(check_preconditions || preconditions_verified_mesh(mesh, np), "Conforming_constrained_Delaunay_triangulation_3: mesh self-intersects");
CGAL_precondition_msg(return_empty_on_invalid_input || preconditions_verified_mesh(mesh, np), "Conforming_constrained_Delaunay_triangulation_3: mesh self-intersects");
if(check_preconditions && !preconditions_verified_mesh(mesh, np)) return;
if(return_empty_on_invalid_input && !preconditions_verified_mesh(mesh, np)) return;
auto mesh_vp_map = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point),
get(CGAL::vertex_point, mesh));
@ -754,12 +754,12 @@ public:
// ----------------------------------
// cstr... (polygon soup)
// ----------------------------------
const bool check_preconditions =
parameters::choose_parameter(parameters::get_parameter(np, internal_np::check_preconditions), false);
const bool return_empty_on_invalid_input =
parameters::choose_parameter(parameters::get_parameter(np, internal_np::return_empty_on_invalid_input), false);
CGAL_precondition_msg(check_preconditions || preconditions_verified_soup(points, polygons, np), "Conforming_constrained_Delaunay_triangulation_3: polygon soup self-intersects");
CGAL_precondition_msg(return_empty_on_invalid_input || preconditions_verified_soup(points, polygons, np), "Conforming_constrained_Delaunay_triangulation_3: polygon soup self-intersects");
if(check_preconditions && !preconditions_verified_soup(points, polygons, np)) return;
if(return_empty_on_invalid_input && !preconditions_verified_soup(points, polygons, np)) return;
using PointRange_const_iterator = typename PointRange::const_iterator;

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

@ -116,7 +116,7 @@ namespace CGAL {
* Faces with the same patch identifier are considered part of the same surface patch.}
* \cgalParamNEnd
*
* \cgalParamNBegin{check_preconditions}
* \cgalParamNBegin{return_empty_on_invalid_input}
* \cgalParamDescription{a boolean activating the check of preconditions on the input
* before starting to construct the triangulation.
* If the check is activated and the preconditions not satisfied,
@ -189,7 +189,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
*
* \cgalParamNBegin{check_preconditions}
* \cgalParamNBegin{return_empty_on_invalid_input}
* \cgalParamDescription{a boolean activating the check of preconditions on the input
* before starting to construct the triangulation.
* If the check is activated and the preconditions not satisfied,

2
STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
View File

@ -322,7 +322,7 @@ CGAL_add_named_parameter(adjust_directions_t, adjust_directions, adjust_directio
CGAL_add_named_parameter(segment_t, segment_map, segment_map)
// List of named parameters using in Constrained_triangulation_3
CGAL_add_named_parameter(check_preconditions_t, check_preconditions, check_preconditions)
CGAL_add_named_parameter(return_empty_on_invalid_input_t, return_empty_on_invalid_input, return_empty_on_invalid_input)
// List of named parameters used in Mesh_2 package
CGAL_add_named_parameter_with_compatibility(seeds_t, seeds, seeds)