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

Code clean-up

This commit is contained in:
Clement Jamin 2014-05-27 13:21:16 +02:00
parent d2f2f9c482
commit 2f78d27bd3
6 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
View File

@ -1200,7 +1200,7 @@ get_best_weight(const Vertex_handle& v, bool *could_lock_zone) const
double worst_criterion_value = get_min_value(criterion_values);
double best_weight = 0;
// CJTODO: this computes the incident cells again!
// TODO: it seems that this computes the incident cells again
double sq_d_v = get_closest_vertice_squared_distance(v);
// If that boolean is set to false, it means that a facet in the complex
@ -1219,7 +1219,7 @@ get_best_weight(const Vertex_handle& v, bool *could_lock_zone) const
// expand prestar (insert opposite_cell facets in pre_star)
Facet link = pre_star.front()->second;
const Cell_handle& opposite_cell = tr_.mirror_facet(link).first;
// CJTODO: useless?
if (could_lock_zone && !tr_.try_lock_cell(opposite_cell))
{
*could_lock_zone = false;

4
Mesh_3/include/CGAL/Meshes/Filtered_deque_container.h
View File

@ -96,7 +96,7 @@ namespace Meshes {
Element get_next_local_element_impl()
{
CGAL_assertion(!m_local_lists.local().empty());
// CJTODO BUG: add this? It shouldn't be necessary as user
// Add this? It shouldn't be necessary as user
// is supposed to call "no_longer_element_to_refine_impl" first
/*while( !test(container.front()) )
{
@ -252,7 +252,7 @@ namespace Meshes {
Element get_next_element_impl() const
{
CGAL_assertion(!container.empty());
// CJTODO BUG: add this? It shouldn't be necessary as user
// Add this? It shouldn't be necessary as user
// is supposed to call "no_longer_element_to_refine_impl" first
/*while( !test(container.front()) )
{

4
Mesh_3/include/CGAL/Meshes/Filtered_multimap_container.h
View File

@ -95,7 +95,7 @@ namespace CGAL {
Element get_next_local_element_impl()
{
CGAL_assertion(!m_local_lists.local().empty());
// CJTODO BUG: add this? It shouldn't be necessary as user
// Add this? It shouldn't be necessary as user
// is supposed to call "no_longer_element_to_refine_impl" first
/*while( !test(container.front()) )
{
@ -246,7 +246,7 @@ namespace CGAL {
Element get_next_element_impl() const
{
CGAL_assertion(!container.empty());
// CJTODO BUG: add this? It shouldn't be necessary as user
// Add this? It shouldn't be necessary as user
// is supposed to call "no_longer_element_to_refine_impl" first
/*while( !test(container.front()) )
{

2
Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp
View File

@ -305,7 +305,7 @@ template < typename Tr >
void do_benchmarks(string name)
{
cout << "\n\nBenchmarking configuration : " << name << endl;
tbb::task_scheduler_init tbb_init(10); // CJTODO TEMP
// tbb::task_scheduler_init tbb_init(10); // Set number of threads
benchmark_construction<Tr>();
if (input_file_selected)
return;

11
Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -37,7 +37,6 @@
#include <CGAL/Triangulation_3.h>
#include <CGAL/iterator.h>
#include <CGAL/Location_policy.h>
#include <CGAL/Mesh_3/Profiling_tools.h> // CJTODO TEMP
#ifndef CGAL_TRIANGULATION_3_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
#include <CGAL/Spatial_sort_traits_adapter_3.h>
@ -284,10 +283,6 @@ public:
static Profile_branch_counter_3 bcounter(
"early withdrawals / late withdrawals / successes [Delaunay_tri_3::insert]");
#endif
#ifdef CGAL_TRIANGULATION_3_PROFILING
WallClockTimer t; // CJTODO TEMP
#endif
size_type n = number_of_vertices();
std::vector<Point> points (first, last);
@ -298,16 +293,12 @@ public:
if (this->is_parallel())
{
size_t num_points = points.size();
#ifdef CGAL_TRIANGULATION_3_PROFILING
WallClockTimer t1; // CJTODO TEMP
#endif
Vertex_handle hint;
std::vector<Vertex_handle> far_sphere_vertices;
#ifdef CGAL_CONCURRENT_TRIANGULATION_3_ADD_TEMPORARY_POINTS_ON_FAR_SPHERE
const size_t MIN_NUM_POINTS_FOR_FAR_SPHERE_POINTS = 1000000; // CJTODO: ADJUST THIS
const size_t MIN_NUM_POINTS_FOR_FAR_SPHERE_POINTS = 1000000;
if (num_points >= MIN_NUM_POINTS_FOR_FAR_SPHERE_POINTS)
{
// Add temporary vertices on a "far sphere" to reduce contention on

2
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -229,7 +229,7 @@ namespace CGAL {
std::vector<Vertex_handle> far_sphere_vertices;
#ifdef CGAL_CONCURRENT_TRIANGULATION_3_ADD_TEMPORARY_POINTS_ON_FAR_SPHERE
const size_t MIN_NUM_POINTS_FOR_FAR_SPHERE_POINTS = 1000000; // CJTODO: ADJUST THIS
const size_t MIN_NUM_POINTS_FOR_FAR_SPHERE_POINTS = 1000000;
if (num_points >= MIN_NUM_POINTS_FOR_FAR_SPHERE_POINTS)
{
// Add temporary vertices on a "far sphere" to reduce contention on