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

fix the assertions 

That makes `1435440-min2.off` pass.
This commit is contained in:
Laurent Rineau 2024-02-15 11:45:55 +01:00
parent 2da7b21865
commit 0fc61e6b3f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1605,7 +1605,7 @@ private:
} }
} }
} }
CGAL_assertion(vertices_of_border_union_find.number_of_sets() == 2); CGAL_assertion(vertices_of_border_union_find.number_of_sets() <= 2);
const auto [border_edge_va, border_edge_vb] = tr.vertices(border_edge); const auto [border_edge_va, border_edge_vb] = tr.vertices(border_edge);
auto circ = tr.incident_cells(border_edge); auto circ = tr.incident_cells(border_edge);
CGAL_assertion(circ != nullptr); CGAL_assertion(circ != nullptr);
@ -1630,7 +1630,8 @@ private:
{ {
++it; ++it;
} }
CGAL_assertion(it != vertices_of_border_union_find.end()); CGAL_assertion((it == vertices_of_border_union_find.end()) ==
(vertices_of_border_union_find.number_of_sets() == 1));
const auto vertex_below_handle = it; const auto vertex_below_handle = it;
for(auto handle = vertices_of_border_union_find.begin(), end = vertices_of_border_union_find.end(); for(auto handle = vertices_of_border_union_find.begin(), end = vertices_of_border_union_find.end();
handle != end; ++handle) handle != end; ++handle)
@ -1671,8 +1672,9 @@ private:
for(auto v: facet_vertices) { for(auto v: facet_vertices) {
std::cerr << IO::oformat(v, with_point_and_info) << " "; std::cerr << IO::oformat(v, with_point_and_info) << " ";
} }
CGAL_assertion(!std::all_of(facet_vertices.begin(), facet_vertices.end(), // This assertion is wrong, because there might be only one half-cavity and not a full cavity.
[](auto v) { return v->is_marked(Vertex_marker::REGION_BORDER); })); // CGAL_assertion(!std::all_of(facet_vertices.begin(), facet_vertices.end(),
// [](auto v) { return v->is_marked(Vertex_marker::REGION_BORDER); }));
std::cerr << "\n"; std::cerr << "\n";
} }
for(auto v: tr.vertices(facet)) { for(auto v: tr.vertices(facet)) {