From b52d2118243b56d7dc34e6f25f1edb48b2917222 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 2 Aug 2022 09:27:01 +0100 Subject: [PATCH 1/3] Parameterization: Scope name of a #define --- .../Iterative_authalic_parameterizer_3.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h index 938f1ec836f..b63ef28801e 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h @@ -50,7 +50,7 @@ #include #include -#define DEBUG_L0 0 // @fixme +#define CGAL_DEBUG_IA 0 /// \file Iterative_authalic_parameterizer_3.h @@ -890,7 +890,7 @@ public: NT area_3D = initialize_faces_areas(cc_faces, tmesh); - if(DEBUG_L0) + if(CGAL_DEBUG_IA) std::cout << std::endl; unsigned int last_best_i = 0; @@ -901,7 +901,7 @@ public: unsigned int i = 0; while(i < iterations) { - if(DEBUG_L0) + if(CGAL_DEBUG_IA) std::cout << "Iteration " << i << ", gamma = " << gamma << std::flush; // update weights for inner vertices @@ -940,7 +940,7 @@ public: if(!get_linear_algebra_traits().linear_solver(A, Bu, Xu, Du) || !get_linear_algebra_traits().linear_solver(A, Bv, Xv, Dv)) { - if(DEBUG_L0) + if(CGAL_DEBUG_IA) std::cout << " Linear solver failure #" << m_linear_solver_failures << std::endl; status = ERROR_CANNOT_SOLVE_LINEAR_SYSTEM; @@ -988,7 +988,7 @@ public: } } - if(DEBUG_L0) + if(CGAL_DEBUG_IA) { std::ofstream out("last_solve.off"); out.precision(17); @@ -1001,7 +1001,7 @@ public: err[i] = compute_area_distortion(cc_faces, area_3D, tmesh, uvmap); - if(DEBUG_L0) + if(CGAL_DEBUG_IA) std::cout << " err " << err[i] << std::flush; if(err[i] <= err[last_best_i]) @@ -1011,7 +1011,7 @@ public: last_best_i = i; is_changed = false; - if(DEBUG_L0) + if(CGAL_DEBUG_IA) std::cout << " *****" << std::flush; } else if(err[i] > 100) // @fixme is that reasonnable From 349f9ac384623eee0b7310b678496e4e5b02d502 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 2 Aug 2022 16:01:43 +0100 Subject: [PATCH 2/3] Fix link --- .../CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h index 331fc3998af..be36acfcb1f 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h @@ -162,7 +162,7 @@ namespace Surface_mesh_parameterization { /// \endcode /// /// \sa `CGAL::Surface_mesh_parameterization::Fixed_border_parameterizer_3` -/// \sa `CGAL::Iterative_authalic_parameterizer_3` +/// \sa `CGAL::Surface_mesh_parameterization::Iterative_authalic_parameterizer_3` /// template < class TriangleMesh_, class BorderParameterizer_ = Default, From 001f9b8c43236f904672091b1739986c15b4ddce Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 3 Aug 2022 11:35:00 +0100 Subject: [PATCH 3/3] Change macro name --- .../Iterative_authalic_parameterizer_3.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h index b63ef28801e..d70453b963a 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h @@ -50,7 +50,7 @@ #include #include -#define CGAL_DEBUG_IA 0 +#define CGAL_SMP_IA_DEBUG_L0 0 /// \file Iterative_authalic_parameterizer_3.h @@ -890,7 +890,7 @@ public: NT area_3D = initialize_faces_areas(cc_faces, tmesh); - if(CGAL_DEBUG_IA) + if(CGAL_SMP_IA_DEBUG_L0) std::cout << std::endl; unsigned int last_best_i = 0; @@ -901,7 +901,7 @@ public: unsigned int i = 0; while(i < iterations) { - if(CGAL_DEBUG_IA) + if(CGAL_SMP_IA_DEBUG_L0) std::cout << "Iteration " << i << ", gamma = " << gamma << std::flush; // update weights for inner vertices @@ -940,7 +940,7 @@ public: if(!get_linear_algebra_traits().linear_solver(A, Bu, Xu, Du) || !get_linear_algebra_traits().linear_solver(A, Bv, Xv, Dv)) { - if(CGAL_DEBUG_IA) + if(CGAL_SMP_IA_DEBUG_L0) std::cout << " Linear solver failure #" << m_linear_solver_failures << std::endl; status = ERROR_CANNOT_SOLVE_LINEAR_SYSTEM; @@ -988,7 +988,7 @@ public: } } - if(CGAL_DEBUG_IA) + if(CGAL_SMP_IA_DEBUG_L0) { std::ofstream out("last_solve.off"); out.precision(17); @@ -1001,7 +1001,7 @@ public: err[i] = compute_area_distortion(cc_faces, area_3D, tmesh, uvmap); - if(CGAL_DEBUG_IA) + if(CGAL_SMP_IA_DEBUG_L0) std::cout << " err " << err[i] << std::flush; if(err[i] <= err[last_best_i]) @@ -1011,7 +1011,7 @@ public: last_best_i = i; is_changed = false; - if(CGAL_DEBUG_IA) + if(CGAL_SMP_IA_DEBUG_L0) std::cout << " *****" << std::flush; } else if(err[i] > 100) // @fixme is that reasonnable