From f38ff92498c2a2aca6cc45e365ecd6d65cde7d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 7 Dec 2022 14:29:05 +0100 Subject: [PATCH 1/3] remove verbose flag --- Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h index 90b6216f5f7..720217e0196 100644 --- a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h +++ b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h @@ -198,7 +198,7 @@ void tetrahedral_isotropic_remeshing( const SizingFunction& sizing, const NamedParameters& np) { - CGAL_assertion(tr.is_valid(true)); + CGAL_assertion(tr.is_valid()); typedef CGAL::Triangulation_3 Tr; @@ -395,7 +395,7 @@ void tetrahedral_isotropic_remeshing( const SizingFunction& sizing, const NamedParameters& np) { - CGAL_assertion(c3t3.triangulation().tds().is_valid(true)); + CGAL_assertion(c3t3.triangulation().tds().is_valid()); using parameters::get_parameter; using parameters::choose_parameter; From 7466cfc3830208d10994983af06b024de4589103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 7 Dec 2022 17:11:09 +0100 Subject: [PATCH 2/3] add verbose option to dump c3t3 --- Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h index 5a798e665e0..a14e5a96ecb 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h @@ -40,9 +40,10 @@ template ::is_specialized) > struct Dump_c3t3 { - void dump_c3t3(const C3t3& c3t3, std::string prefix) const + void dump_c3t3(const C3t3& c3t3, std::string prefix, bool verbose) const { - std::clog<<"======dump c3t3===== to: " << prefix << std::endl; + if (verbose) + std::clog<<"======dump c3t3===== to: " << prefix << std::endl; std::ofstream medit_file((prefix+".mesh").c_str()); medit_file.precision(17); CGAL::IO::output_to_medit(medit_file, c3t3, false /*rebind*/, true /*show_patches*/); @@ -63,7 +64,7 @@ struct Dump_c3t3 { template struct Dump_c3t3 { - void dump_c3t3(const C3t3&, std::string) { + void dump_c3t3(const C3t3&, std::string, bool) { std::cerr << "Warning " << __FILE__ << ":" << __LINE__ << "\n" << " the c3t3 object of following type:\n" << typeid(C3t3).name() << std::endl @@ -123,11 +124,11 @@ void dump_c3t3_edges(const C3t3& c3t3, std::string prefix) } } template -void dump_c3t3(const C3t3& c3t3, std::string prefix) +void dump_c3t3(const C3t3& c3t3, std::string prefix, bool verbose = false) { if(!prefix.empty()) { Dump_c3t3 dump; - dump.dump_c3t3(c3t3, prefix); + dump.dump_c3t3(c3t3, prefix, verbose); } } From 71e452a6b8c8328e1994aa4b2911883080470ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 12 Dec 2022 17:55:41 +0100 Subject: [PATCH 3/3] be verbose if the macro is defined --- Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h index a14e5a96ecb..406e3d18cee 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h @@ -124,7 +124,12 @@ void dump_c3t3_edges(const C3t3& c3t3, std::string prefix) } } template -void dump_c3t3(const C3t3& c3t3, std::string prefix, bool verbose = false) +void dump_c3t3(const C3t3& c3t3, std::string prefix, +#ifdef CGAL_MESH_3_VERBOSE + bool verbose = true) +#else + bool verbose = false) +#endif { if(!prefix.empty()) { Dump_c3t3 dump;