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

Merge pull request #6781 from afabri/Parameterization-change_define-GF 

Parameterization:  Scope name of a #define
This commit is contained in:
Sebastien Loriot 2022-08-10 18:33:01 +02:00 committed by GitHub
parent d64d243bf5 001f9b8c43
commit 03ab0d5220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
View File

@ -162,7 +162,7 @@ namespace Surface_mesh_parameterization {
/// \endcode /// \endcode
/// ///
/// \sa `CGAL::Surface_mesh_parameterization::Fixed_border_parameterizer_3<TriangleMesh, BorderParameterizer, SolverTraits>` /// \sa `CGAL::Surface_mesh_parameterization::Fixed_border_parameterizer_3<TriangleMesh, BorderParameterizer, SolverTraits>`
/// \sa `CGAL::Iterative_authalic_parameterizer_3<TriangleMesh, BorderParameterizer, SolverTraits>` /// \sa `CGAL::Surface_mesh_parameterization::Iterative_authalic_parameterizer_3<TriangleMesh, BorderParameterizer, SolverTraits>`
/// ///
template < class TriangleMesh_, template < class TriangleMesh_,
class BorderParameterizer_ = Default, class BorderParameterizer_ = Default,

14
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h
View File

@ -50,7 +50,7 @@
#include <iomanip> #include <iomanip>
#include <unordered_set> #include <unordered_set>
#define DEBUG_L0 0 // @fixme #define CGAL_SMP_IA_DEBUG_L0 0
/// \file Iterative_authalic_parameterizer_3.h /// \file Iterative_authalic_parameterizer_3.h
@ -890,7 +890,7 @@ public:
NT area_3D = initialize_faces_areas(cc_faces, tmesh); NT area_3D = initialize_faces_areas(cc_faces, tmesh);
if(DEBUG_L0) if(CGAL_SMP_IA_DEBUG_L0)
std::cout << std::endl; std::cout << std::endl;
unsigned int last_best_i = 0; unsigned int last_best_i = 0;
@ -901,7 +901,7 @@ public:
unsigned int i = 0; unsigned int i = 0;
while(i < iterations) while(i < iterations)
{ {
if(DEBUG_L0) if(CGAL_SMP_IA_DEBUG_L0)
std::cout << "Iteration " << i << ", gamma = " << gamma << std::flush; std::cout << "Iteration " << i << ", gamma = " << gamma << std::flush;
// update weights for inner vertices // update weights for inner vertices
@ -940,7 +940,7 @@ public:
if(!get_linear_algebra_traits().linear_solver(A, Bu, Xu, Du) || if(!get_linear_algebra_traits().linear_solver(A, Bu, Xu, Du) ||
!get_linear_algebra_traits().linear_solver(A, Bv, Xv, Dv)) !get_linear_algebra_traits().linear_solver(A, Bv, Xv, Dv))
{ {
if(DEBUG_L0) if(CGAL_SMP_IA_DEBUG_L0)
std::cout << " Linear solver failure #" << m_linear_solver_failures << std::endl; std::cout << " Linear solver failure #" << m_linear_solver_failures << std::endl;
status = ERROR_CANNOT_SOLVE_LINEAR_SYSTEM; status = ERROR_CANNOT_SOLVE_LINEAR_SYSTEM;
@ -988,7 +988,7 @@ public:
} }
} }
if(DEBUG_L0) if(CGAL_SMP_IA_DEBUG_L0)
{ {
std::ofstream out("last_solve.off"); std::ofstream out("last_solve.off");
out.precision(17); out.precision(17);
@ -1001,7 +1001,7 @@ public:
err[i] = compute_area_distortion(cc_faces, area_3D, tmesh, uvmap); err[i] = compute_area_distortion(cc_faces, area_3D, tmesh, uvmap);
if(DEBUG_L0) if(CGAL_SMP_IA_DEBUG_L0)
std::cout << " err " << err[i] << std::flush; std::cout << " err " << err[i] << std::flush;
if(err[i] <= err[last_best_i]) if(err[i] <= err[last_best_i])
@ -1011,7 +1011,7 @@ public:
last_best_i = i; last_best_i = i;
is_changed = false; is_changed = false;
if(DEBUG_L0) if(CGAL_SMP_IA_DEBUG_L0)
std::cout << " *****" << std::flush; std::cout << " *****" << std::flush;
} }
else if(err[i] > 100) // @fixme is that reasonnable else if(err[i] > 100) // @fixme is that reasonnable