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

clean up the code

This commit is contained in:
Shihao Wu 2013-09-13 15:51:41 +08:00
parent 446c54eab8
commit 676da9c403
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,7 +456,6 @@ wlop_simplify_and_regularize_point_set(
#endif #endif
} }
// initial rich sample points // initial rich sample points
std::vector<Rich_point>::iterator sample_rich_iter; std::vector<Rich_point>::iterator sample_rich_iter;
sample_rich_iter = sample_rich_points.begin(); sample_rich_iter = sample_rich_points.begin();
@ -467,20 +466,15 @@ wlop_simplify_and_regularize_point_set(
*sample_rich_iter = Rich_point(*sample_iter, index++); *sample_rich_iter = Rich_point(*sample_iter, index++);
} }
std::vector<Point> update_sample_points(nb_points_sample); std::vector<Point> update_sample_points(nb_points_sample);
std::vector<Point>::iterator update_sample_iter; std::vector<Point>::iterator update_sample_iter;
//most time consuming part
//iteration loop!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
for (unsigned int iteration = 0; iteration < max_iter_number; iteration++) for (unsigned int iteration = 0; iteration < max_iter_number; iteration++)
{ {
// Build rich-grid for sample-sample neighborhood // Build rich-grid for sample-sample neighborhood
rich_grid_internal::compute_ball_neighbors_one_self(sample_rich_points, rich_grid_internal::compute_ball_neighbors_one_self(sample_rich_points,
bbox, bbox,
neighbor_radius); neighbor_radius);
// Compute sample density weight for sample points if user needed // Compute sample density weight for sample points if user needed
std::vector<FT> sample_densities; std::vector<FT> sample_densities;
if (need_compute_density) if (need_compute_density)
@ -503,7 +497,6 @@ wlop_simplify_and_regularize_point_set(
sample_densities.push_back(density); sample_densities.push_back(density);
} }
} }
#ifdef CGAL_DEBUG_MODE #ifdef CGAL_DEBUG_MODE
long memory = CGAL::Memory_sizer().virtual_size(); long memory = CGAL::Memory_sizer().virtual_size();
std::cout << "Initialization / Compute Density For Sample" << std::endl; std::cout << "Initialization / Compute Density For Sample" << std::endl;
@ -511,7 +504,6 @@ wlop_simplify_and_regularize_point_set(
<< (memory>>20) << " Mb allocated" << std::endl << std::endl; << (memory>>20) << " Mb allocated" << std::endl << std::endl;
task_timer.reset(); task_timer.reset();
#endif #endif
// Build rich-grid for sample-original neighborhood // Build rich-grid for sample-original neighborhood
rich_grid_internal::compute_ball_neighbors_one_to_another rich_grid_internal::compute_ball_neighbors_one_to_another
(sample_rich_points, (sample_rich_points,