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

tweak debug macros

This commit is contained in:
Laurent Rineau 2023-08-31 18:23:48 +02:00
parent fc0cb34e64
commit 6070f6e01a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h
View File

@ -381,9 +381,9 @@ protected:
const auto& [steiner_pt, hint, ref_vertex] = construct_Steiner_point(constraint, subconstraint); const auto& [steiner_pt, hint, ref_vertex] = construct_Steiner_point(constraint, subconstraint);
[[maybe_unused]] const auto v = [[maybe_unused]] const auto v =
insert_Steiner_point_on_subconstraint(steiner_pt, hint, subconstraint, constraint, visitor); insert_Steiner_point_on_subconstraint(steiner_pt, hint, subconstraint, constraint, visitor);
#if CGAL_DEBUG_CDT_3 & 2 #if CGAL_CDT_3_DEBUG_CONFORMING
std::cerr << " new vertex " << display_vert(v) << '\n'; std::cerr << " new vertex " << display_vert(v) << '\n';
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_CONFORMING
return true; return true;
} }
@ -572,10 +572,10 @@ protected:
pa, this->tr.point(v2), pb) == SMALLER; pa, this->tr.point(v2), pb) == SMALLER;
}); });
CGAL_assertion(reference_vertex_it != end); CGAL_assertion(reference_vertex_it != end);
#if CGAL_DEBUG_CDT_3 & 2 #if CGAL_CDT_3_DEBUG_CONFORMING
std::cerr << " -> reference point: " << display_vert(*reference_vertex_it) std::cerr << " -> reference point: " << display_vert(*reference_vertex_it)
<< '\n'; << '\n';
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_CONFORMING
const auto reference_vertex = *reference_vertex_it; const auto reference_vertex = *reference_vertex_it;
const auto& reference_point = tr.point(reference_vertex); const auto& reference_point = tr.point(reference_vertex);
const auto vector_ab = vector_functor(pa, pb); const auto vector_ab = vector_functor(pa, pb);
@ -601,10 +601,10 @@ protected:
? midpoint_functor(pa, pb) ? midpoint_functor(pa, pb)
: inter_point; : inter_point;
#if CGAL_DEBUG_CDT_3 & 2 #if CGAL_CDT_3_DEBUG_CONFORMING
std::cerr << "ref ratio = " << ratio << '\n'; std::cerr << "ref ratio = " << ratio << '\n';
std::cerr << " -> Steiner point: " << result_point << '\n'; std::cerr << " -> Steiner point: " << result_point << '\n';
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_CONFORMING
return {result_point, reference_vertex->cell(), reference_vertex}; return {result_point, reference_vertex->cell(), reference_vertex};
}; };
@ -628,10 +628,10 @@ protected:
? midpoint_functor(pa, pb) ? midpoint_functor(pa, pb)
: translate_functor(pa, scaled_vector_functor(vector_ab, lambda)); : translate_functor(pa, scaled_vector_functor(vector_ab, lambda));
#if CGAL_DEBUG_CDT_3 & 2 #if CGAL_CDT_3_DEBUG_CONFORMING
std::cerr << "lambda = " << lambda << '\n'; std::cerr << "lambda = " << lambda << '\n';
std::cerr << " -> Steiner point: " << result_point << '\n'; std::cerr << " -> Steiner point: " << result_point << '\n';
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_CONFORMING
return {result_point, reference_vertex->cell(), reference_vertex}; return {result_point, reference_vertex->cell(), reference_vertex};
} }

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

@ -321,10 +321,10 @@ protected:
auto fh_2 = c->face_2(self.face_cdt_2[face_id], li); auto fh_2 = c->face_2(self.face_cdt_2[face_id], li);
fh_2->info().facet_3d = {}; fh_2->info().facet_3d = {};
self.set_facet_constrained({c, li}, -1, {}); self.set_facet_constrained({c, li}, -1, {});
#if CGAL_DEBUG_CDT_3 #if CGAL_CDT_3_DEBUG_MISSING_TRIANGLES
std::cerr << "Add missing triangle (from visitor), face #F" << face_id << ": \n"; std::cerr << "Add missing triangle (from visitor), face #F" << face_id << ": \n";
self.write_2d_triangle(std::cerr, fh_2); self.write_2d_triangle(std::cerr, fh_2);
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_MISSING_TRIANGLES
fh_2->info().missing_subface = true; fh_2->info().missing_subface = true;
} }
@ -726,7 +726,7 @@ private:
boost::breadth_first_search(dual, cdt_2.infinite_vertex()->face(), boost::breadth_first_search(dual, cdt_2.infinite_vertex()->face(),
boost::color_map(Color_map())); boost::color_map(Color_map()));
} // end of Boost BFS } // end of Boost BFS
#if CGAL_DEBUG_CDT_3 #if CGAL_DEBUG_CDT_3 & 4
int counter = 0; int counter = 0;
for(const auto fh: cdt_2.finite_face_handles()) { for(const auto fh: cdt_2.finite_face_handles()) {
if(!fh->info().is_outside_the_face) ++counter; if(!fh->info().is_outside_the_face) ++counter;
@ -785,10 +785,10 @@ private:
if(!tr.is_facet(v0, v1, v2, c, i, j, k)) { if(!tr.is_facet(v0, v1, v2, c, i, j, k)) {
fh->info().missing_subface = true; fh->info().missing_subface = true;
face_constraint_misses_subfaces.set(static_cast<std::size_t>(polygon_contraint_id)); face_constraint_misses_subfaces.set(static_cast<std::size_t>(polygon_contraint_id));
#if CGAL_DEBUG_CDT_3 #if CGAL_CDT_3_DEBUG_MISSING_TRIANGLES
std::cerr << std::format("Missing triangle in polygon #{}:\n", polygon_contraint_id); std::cerr << std::format("Missing triangle in polygon #{}:\n", polygon_contraint_id);
write_triangle(std::cerr, v0, v1, v2); write_triangle(std::cerr, v0, v1, v2);
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_MISSING_TRIANGLES
} else { } else {
fh->info().missing_subface = false; fh->info().missing_subface = false;
const int facet_index = 6 - i - j - k; const int facet_index = 6 - i - j - k;
@ -842,10 +842,10 @@ private:
CGAL_assume(b); CGAL_assume(b);
border_edges.emplace_back(c, i, j); border_edges.emplace_back(c, i, j);
} }
#if CGAL_DEBUG_CDT_3 #if CGAL_CDT_3_DEBUG_REGIONS
std::cerr << "region size is: " << fh_region.size() << "\n"; std::cerr << "region size is: " << fh_region.size() << "\n";
std::cerr << "region border size is: " << border_edges.size() << "\n"; std::cerr << "region border size is: " << border_edges.size() << "\n";
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_CDT_3_DEBUG_REGIONS
return border_edges; return border_edges;
} }
@ -992,12 +992,12 @@ private:
for(std::size_t i = 0; i < intersecting_edges.size(); ++i) { for(std::size_t i = 0; i < intersecting_edges.size(); ++i) {
const auto intersecting_edge = intersecting_edges[i]; const auto intersecting_edge = intersecting_edges[i];
const auto [v_above, v_below] = vertex_pair(intersecting_edge); const auto [v_above, v_below] = vertex_pair(intersecting_edge);
#if CGAL_DEBUG_CDT_3 #if CGAL_CDT_3_DEBUG_REGION
std::cerr << std::format("restore_subface_region face index: {}, region #{}, Edge #{:6}: ({} , {})\n", std::cerr << std::format("restore_subface_region face index: {}, region #{}, Edge #{:6}: ({} , {})\n",
face_index, region_count, i, face_index, region_count, i,
IO::oformat(v_above, with_point), IO::oformat(v_above, with_point),
IO::oformat(v_below, with_point)); IO::oformat(v_below, with_point));
#endif #endif // CGAL_CDT_3_DEBUG_REGION
CGAL_assertion(false == polygon_vertices.contains(v_above)); CGAL_assertion(false == polygon_vertices.contains(v_above));
CGAL_assertion(false == polygon_vertices.contains(v_below)); CGAL_assertion(false == polygon_vertices.contains(v_below));
if(new_vertex(v_above)) { if(new_vertex(v_above)) {
@ -1110,12 +1110,12 @@ private:
} }
return vertices; return vertices;
}(); }();
#if CGAL_DEBUG_CDT_3 #if CGAL_CDT_3_DEBUG_REGION
std::cerr << "polygon_vertices.size() = " << polygon_vertices.size() << "\n"; std::cerr << "polygon_vertices.size() = " << polygon_vertices.size() << "\n";
for(auto v : polygon_vertices) { for(auto v : polygon_vertices) {
std::cerr << std::format(" {}\n", IO::oformat(v, with_point)); std::cerr << std::format(" {}\n", IO::oformat(v, with_point));
} }
#endif #endif // CGAL_CDT_3_DEBUG_REGION
for(auto v: polygon_vertices) { for(auto v: polygon_vertices) {
v->nb_of_incident_constraints = -v->nb_of_incident_constraints; v->nb_of_incident_constraints = -v->nb_of_incident_constraints;
CGAL_assertion(v->nb_of_incident_constraints < 0); CGAL_assertion(v->nb_of_incident_constraints < 0);
@ -1770,7 +1770,7 @@ private:
const auto& cdt_2 = non_const_cdt_2; const auto& cdt_2 = non_const_cdt_2;
auto steiner_pt = CGAL::centroid(cdt_2.triangle(fh_2d)); auto steiner_pt = CGAL::centroid(cdt_2.triangle(fh_2d));
#if CGAL_DEBUG_CDT_3 & 64 && __has_include(<format>) #if CGAL_DEBUG_CDT_3 & 64 && __has_include(<format>)
std::cerr << std::format("Inserting Steiner (circumcenter) point {} in non-coplanar face {}.\n", IO::oformat(steiner_pt), std::cerr << std::format("Inserting Steiner (centroid) point {} in non-coplanar face {}.\n", IO::oformat(steiner_pt),
IO::oformat(cdt_2.triangle(fh_2d))); IO::oformat(cdt_2.triangle(fh_2d)));
#endif // CGAL_DEBUG_CDT_3 #endif // CGAL_DEBUG_CDT_3
auto encroached_edge_opt = return_encroached_constrained_edge(face_index, cdt_2, steiner_pt); auto encroached_edge_opt = return_encroached_constrained_edge(face_index, cdt_2, steiner_pt);