From 2a851b7ec4ff65083508fae2988a8d1a1ff09bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 26 Oct 2022 21:52:55 +0200 Subject: [PATCH] Rename some variables / functions for clarity --- SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h b/SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h index 23e318c77e9..7f803f05dc6 100644 --- a/SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h +++ b/SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h @@ -350,10 +350,10 @@ bool build_infinite_cells(Tr& tr, } template -bool has_infinite_vertex(const std::array& v, - const Tr& tr) +bool is_infinite(const std::array& f, + const Tr& tr) { - for (auto vh : v) + for (auto vh : f) { if (tr.infinite_vertex() == vh) return true; @@ -389,8 +389,9 @@ bool assign_neighbors(Tr& tr, } else if(allow_non_manifold)// if (adjacent_cells.size() == 4) { - CGAL_assertion_code(const auto& v = icit->first); - CGAL_assertion(has_infinite_vertex(v, tr)); + CGAL_assertion_code(const auto& f = icit->first); + CGAL_assertion(is_infinite(f, tr)); + success = false; } } @@ -577,7 +578,6 @@ bool build_triangulation_from_file(std::istream& is, std::vector points; boost::unordered_map border_facets; - // grab the vertices int dim; int nv, nf, ntet, ref; std::string word; @@ -594,7 +594,7 @@ bool build_triangulation_from_file(std::istream& is, std::cout << "Allow non-manifoldness = " << allow_non_manifold << std::endl; } - bool dont_replace_domain_0 = false; + bool is_CGAL_mesh = false; while(is >> word && word != "End") { @@ -607,7 +607,7 @@ bool build_triangulation_from_file(std::istream& is, } else if (word == "CGAL::Mesh_complex_3_in_triangulation_3") { - dont_replace_domain_0 = true;//with CGAL meshes, domain 0 should be kept + is_CGAL_mesh = true; // with CGAL meshes, domain 0 should be kept continue; } //else skip other comments