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

WIP: more fix

This commit is contained in:
Laurent Rineau 2023-11-14 15:28:38 +01:00
parent cc98a40424
commit 1f75f30ab2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
View File

@ -485,7 +485,7 @@ public:
p_vh->set_point(p); p_vh->set_point(p);
vertices_of_original_cavity.insert(p_vh); vertices_of_original_cavity.insert(p_vh);
// compute facets of the border of the cavity, seen from the // compute facets of the border of the cavity, seen from the exterior
std::vector<Facet> orig_facets_of_cavity; std::vector<Facet> orig_facets_of_cavity;
orig_facets_of_cavity.reserve(exterior_border_facets_of_original_cavity.size()); orig_facets_of_cavity.reserve(exterior_border_facets_of_original_cavity.size());
for(auto f: exterior_border_facets_of_original_cavity) { for(auto f: exterior_border_facets_of_original_cavity) {
@ -507,6 +507,8 @@ public:
this->register_facet_to_be_constrained(f); this->register_facet_to_be_constrained(f);
} }
visitor.process_cells_in_conflict(cells_of_cavity.begin(), cells_of_cavity.end());
typename T_3::Vertex_triple_Facet_map outer_map; typename T_3::Vertex_triple_Facet_map outer_map;
for(auto f: facets_of_cavity) { for(auto f: facets_of_cavity) {
typename T_3::Vertex_triple vt = this->make_vertex_triple(f); typename T_3::Vertex_triple vt = this->make_vertex_triple(f);
@ -533,7 +535,6 @@ public:
} }
} }
visitor.process_cells_in_conflict(cells_of_cavity.begin(), cells_of_cavity.end());
for(auto c: cells_of_cavity) { for(auto c: cells_of_cavity) {
this->tds().delete_cell(c); this->tds().delete_cell(c);
} }

3
Triangulation_3/include/CGAL/cdt_debug_io.h
View File

@ -40,7 +40,8 @@ namespace CGAL {
std::vector<std::array<std::size_t, 3>> facets; std::vector<std::array<std::size_t, 3>> facets;
facets.reserve(size); facets.reserve(size);
for(std::size_t i = 0; const auto& [cell, facet_index] : facets_range) { std::size_t i = 0;
for(const auto& [cell, facet_index] : facets_range) {
const auto v0 = cell->vertex(Tr::vertex_triple_index(facet_index, 0)); const auto v0 = cell->vertex(Tr::vertex_triple_index(facet_index, 0));
const auto v1 = cell->vertex(Tr::vertex_triple_index(facet_index, 1)); const auto v1 = cell->vertex(Tr::vertex_triple_index(facet_index, 1));
const auto v2 = cell->vertex(Tr::vertex_triple_index(facet_index, 2)); const auto v2 = cell->vertex(Tr::vertex_triple_index(facet_index, 2));