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

Improve energy-related end condition and verbose 

- Ignore negative energies (bad for my chakras)
- Only compute energies if we need them
- Fix verbose and counter
This commit is contained in:
Mael Rouxel-Labbé 2019-10-07 13:08:01 +02:00
parent 0840a6e1a3
commit ffb18e9e6d
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,49 +1363,62 @@ public:
#endif #endif
// main loop // main loop
for(unsigned int ite=1; ite<=m_iterations; ++ite) unsigned int ite = 1;
for(;;)
{ {
compute_optimal_Lt_matrices(mesh, faces, ctmap, lp, lpmap, uvmap, ltmap); compute_optimal_Lt_matrices(mesh, faces, ctmap, lp, lpmap, uvmap, ltmap);
status = update_solution(mesh, vertices, ctmap, lp, lpmap, ltmap, status = update_solution(mesh, vertices, ctmap, lp, lpmap, ltmap,
uvmap, vimap, vpmap, A); uvmap, vimap, vpmap, A);
// Output the current situation // Output the current parameterization
#ifdef CGAL_SMP_ARAP_DEBUG #ifdef CGAL_SMP_ARAP_DEBUG
output_uvmap("ARAP_iteration_", ite, mesh, vertices, faces, uvmap vimap); output_uvmap("ARAP_iteration_", ite, mesh, vertices, faces, uvmap, vimap);
#endif #endif
energy_last = energy_this;
energy_this = compute_current_energy(mesh, faces, ctmap, lp, lpmap,
ltmap, uvmap);
#ifdef CGAL_PARAMETERIZATION_ARAP_VERBOSE
std::cout << "Energy at iteration " << ite << " : " << energy_this << std::endl;
#endif
CGAL_warning(energy_this >= 0);
if(status != OK) if(status != OK)
return status; return status;
// energy based termination // energy based termination
if(m_tolerance > 0.0 && ite <= m_iterations) // if tolerance <= 0, don't compute energy if(m_tolerance > 0. && ite <= m_iterations) { // if tolerance <= 0, don't compute energy
{ // also no need compute energy if this iteration is the last iteration energy_last = energy_this;
energy_this = compute_current_energy(mesh, faces, ctmap, lp, lpmap, ltmap, uvmap);
#ifdef CGAL_PARAMETERIZATION_ARAP_VERBOSE
std::cout << "Energy at iteration " << ite << " : " << energy_this << std::endl;
#endif
if(energy_this < 0) {
// numerical issues can make it so you may get an energy of -1e-17,
// but it shouldn't be too wrong
CGAL_assertion(energy_this >= - std::numeric_limits<NT>::epsilon());
break;
}
double energy_diff = std::abs((energy_last - energy_this) / energy_this); double energy_diff = std::abs((energy_last - energy_this) / energy_this);
if(energy_diff < m_tolerance) { if(energy_diff < m_tolerance) {
#ifdef CGAL_PARAMETERIZATION_ARAP_VERBOSE
std::cout << "Minimization process ended after: "
<< ite + 1 << " iterations. "
<< "Energy diff: " << energy_diff << std::endl;
#endif
break; break;
} }
} }
if(ite >= m_iterations)
break;
else
++ite;
} }
#ifdef CGAL_PARAMETERIZATION_ARAP_VERBOSE
std::cout << "Minimization process ended after: " << ite << " iterations. " << std::endl;
#endif
#ifdef CGAL_SMP_ARAP_DEBUG #ifdef CGAL_SMP_ARAP_DEBUG
output_uvmap("ARAP_final_pre_processing.off", mesh, vertices, faces, uvmap, vimap); output_uvmap("ARAP_final_pre_processing.off", mesh, vertices, faces, uvmap, vimap);
#endif #endif
if(!is_one_to_one_mapping(mesh, faces, uvmap)) { if(!is_one_to_one_mapping(mesh, faces, uvmap)) {
// Use post processing to handle flipped elements // Use post processing to handle flipped elements
std::cerr << "Parameterization is not valid; calling post processor" << std::endl; #ifdef CGAL_PARAMETERIZATION_ARAP_VERBOSE
std::cout << "Parameterization is not valid; calling post processor" << std::endl;
#endif
status = post_process(mesh, vertices, faces, bhd, uvmap, vimap); status = post_process(mesh, vertices, faces, bhd, uvmap, vimap);
} }