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

Added CGAL_DEBUG macro

This commit is contained in:
Mael Rouxel-Labbé 2017-08-23 16:31:17 +02:00
parent f7405c8f96
commit 406f41af78
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Alpha_shapes_3/include/CGAL/Alpha_shape_3.h
View File

@ -1806,43 +1806,46 @@ Alpha_shape_3<Dt,EACT>::find_optimal_alpha(size_type nb_components) const
std::ptrdiff_t half; std::ptrdiff_t half;
while (len > 0) while (len > 0)
{
half = len / 2;
middle = first + half;
#ifdef CGAL_DEBUG_ALPHA_SHAPE_3
std::cerr << "first : " << *first
<< " last : "
<< ((first+len != last) ? *(first+len) : *(last-1))
<< " mid : " << *middle
<< " nb comps : " << number_of_solid_components(*middle)
<< std::endl;
#endif
if (number_of_solid_components(*middle) > nb_components)
{ {
half = len / 2; first = middle + 1;
middle = first + half; len = len - half -1;
/* //#ifdef DEBUG */
/* std::cerr << "first : " << *first */
/* << " last : " */
/* << ((first+len != last) ? *(first+len) : *(last-1)) */
/* << " mid : " << *middle */
/* << " nb comps : " << number_of_solid_components(*middle) */
/* << std::endl; */
/* //#endif // DEBUG */
if (number_of_solid_components(*middle) > nb_components)
{
first = middle + 1;
len = len - half -1;
}
else // number_of_solid_components(*middle) <= nb_components
{
len = half;
}
} }
else // number_of_solid_components(*middle) <= nb_components
{
len = half;
}
}
/* std::cerr << "a la fin " << std::endl */ #ifdef CGAL_DEBUG_ALPHA_SHAPE_3
/* << "first : " << *first */ std::cerr << "In the end: " << std::endl
/* << " nb comps : " << number_of_solid_components(*first) */ << "first : " << *first
/* << std::endl; */ << " nb comps : " << number_of_solid_components(*first)
/* if ((first+1) < alpha_end()) */ << std::endl;
/* std::cerr << "first+1 " << *(first+1) */ if ((first+1) < alpha_end())
/* << " nb comps : " << number_of_solid_components(*(first+1)) */ std::cerr << "first+1 " << *(first+1)
/* << std::endl; */ << " nb comps : " << number_of_solid_components(*(first+1))
/* std::cerr << std::endl; */ << std::endl;
std::cerr << std::endl;
#endif
if (number_of_solid_components(*first) <= nb_components ) return first; if (number_of_solid_components(*first) <= nb_components )
else return first+1; return first;
} else
return first+1;
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------