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

replaced all "CGAL_DEBUG_MODE" with "CGAL_PSP3_VERBOSE"

This commit is contained in:
Shihao Wu 2015-02-20 15:43:04 +02:00
parent 053ee4d507
commit 4825fd601b
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h
View File

@ -55,7 +55,7 @@
#endif // CGAL_LINKED_WITH_TBB
//#define CGAL_DEBUG_MODE //on-off cout
//#define CGAL_PSP3_VERBOSE
namespace CGAL {
@ -453,7 +453,7 @@ bilateral_smooth_point_set(
unsigned int nb_points = pwns.size();
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "Initialization and compute max spacing: " << std::endl;
#endif
// initiate a KD-tree search for points
@ -468,7 +468,7 @@ bilateral_smooth_point_set(
}
Tree tree(treeElements.begin(), treeElements.end());
// Guess spacing
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
CGAL::Timer task_timer;
task_timer.start();
#endif
@ -481,12 +481,12 @@ bilateral_smooth_point_set(
guess_neighbor_radius = (CGAL::max)(max_spacing, guess_neighbor_radius);
}
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
task_timer.stop();
#endif
guess_neighbor_radius *= 0.95;
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
CGAL::Memory_sizer::size_type memory = CGAL::Memory_sizer().virtual_size();
std::cout << "done: " << task_timer.time() << " seconds, "
<< (memory>>20) << " Mb allocated" << std::endl;
@ -518,7 +518,7 @@ bilateral_smooth_point_set(
}
}
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
task_timer.stop();
memory = CGAL::Memory_sizer().virtual_size();
std::cout << "done: " << task_timer.time() << " seconds, "
@ -561,7 +561,7 @@ bilateral_smooth_point_set(
sharpness_angle);
}
}
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
task_timer.stop();
memory = CGAL::Memory_sizer().virtual_size();
std::cout << "done: " << task_timer.time() << " seconds, "

16
Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
View File

@ -38,7 +38,7 @@
#include <boost/property_map.hpp>
#endif
//#define CGAL_DEBUG_MODE
//#define CGAL_PSP3_VERBOSE
namespace CGAL {
@ -76,7 +76,7 @@ base_point_selection(
if (neighbor_points.empty())
{
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "empty neighborhood" << std::endl;
#endif
output_base_index = query.index;
@ -369,7 +369,7 @@ edge_aware_upsample_point_set(
if (neighbor_radius < average_spacing * 1.0)
{
neighbor_radius = average_spacing * 3.0;
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "neighbor radius: " << neighbor_radius << std::endl;
#endif
}
@ -413,7 +413,7 @@ edge_aware_upsample_point_set(
for (unsigned int iter_time = 0; iter_time < max_iter_time; ++iter_time)
{
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << std::endl << "iter_time: " << iter_time + 1 << std::endl;
#endif
if (iter_time > 0)
@ -427,7 +427,7 @@ edge_aware_upsample_point_set(
bbox,
current_radius);
}
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "current radius: " << current_radius << std::endl;
#endif
@ -474,7 +474,7 @@ edge_aware_upsample_point_set(
FT density_pass_threshold2 = density_pass_threshold *
density_pass_threshold;
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "pass_threshold: " << density_pass_threshold << std::endl;
#endif
// insert new points until all the points' density pass the threshold
@ -482,7 +482,7 @@ edge_aware_upsample_point_set(
unsigned int loop = 0;
while (true)
{
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "loop_time: " << loop + 1 << std::endl;
#endif
unsigned int count_not_pass = 0;
@ -552,7 +552,7 @@ edge_aware_upsample_point_set(
break;
}
}
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "current size: " << rich_point_set.size() << std::endl;
#endif
if (count_not_pass == 0 ||

2
Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h
View File

@ -505,7 +505,7 @@ wlop_simplify_and_regularize_point_set(
nb_neighbors);
radius = average_spacing * 8.0;
#ifdef CGAL_DEBUG_MODE
#ifdef CGAL_PSP3_VERBOSE
std::cout << "The estimated radius size is: " << radius << std::endl;
std::cout << "Be careful! Using this radius estimation may not be able to have good performance/result for different input" << std::endl;
#endif