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

Renamed a few functions + tabs to spaces conversion + benchmark output + minor changes

This commit is contained in:
Clement Jamin 2013-03-11 15:46:27 +01:00
parent dc13ea964d
commit 1f0e994a00
8 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Mesh_2/include/CGAL/Mesher_level.h
View File

@ -143,7 +143,7 @@ template <
/**< Previous level type, defaults to
\c Null_mesher_level. */
class Triangulation_traits /** Traits class that defines types for the
triangulation. */
triangulation. */
>
class Mesher_level_base
{
@ -320,7 +320,7 @@ public:
/** Actions before testing conflicts for point \c p and element \c e */
template <typename Mesh_visitor>
void before_conflicts(const Element& e, const Point& p,
Mesh_visitor visitor)
Mesh_visitor visitor)
{
visitor.before_conflicts(e, p);
derived().before_conflicts_impl(e, p);
@ -334,7 +334,7 @@ public:
the tested element should be reconsidered latter.
*/
Mesher_level_conflict_status private_test_point_conflict(const Point& p,
Zone& zone)
Zone& zone)
{
return derived().private_test_point_conflict_impl(p, zone);
}
@ -366,7 +366,7 @@ public:
* if no point is inserted. */
template <class Mesh_visitor>
void after_no_insertion(const Element& e, const Point& p, Zone& zone,
Mesh_visitor visitor)
Mesh_visitor visitor)
{
derived().after_no_insertion_impl(e, p, zone);
visitor.after_no_insertion(e, p, zone);
@ -478,7 +478,7 @@ template <
/**< Previous level type, defaults to
\c Null_mesher_level. */
class Triangulation_traits, /** Traits class that defines types for the
triangulation. */
triangulation. */
typename Concurrency_tag>
class Mesher_level
: public Mesher_level_base<Tr, Derived, Element, Previous,
@ -490,7 +490,7 @@ public:
Derived,
Element,
Previous,
Triangulation_traits,
Triangulation_traits,
Concurrency_tag> Self;
typedef Mesher_level_base<Tr,
@ -698,7 +698,7 @@ template <
/**< Previous level type, defaults to
\c Null_mesher_level. */
class Triangulation_traits> /** Traits class that defines types for the
triangulation. */
triangulation. */
class Mesher_level<Tr, Derived, Element, Previous,
Triangulation_traits, Parallel_tag>
: public Mesher_level_base<Tr, Derived, Element, Previous,
@ -710,7 +710,7 @@ public:
Derived,
Element,
Previous,
Triangulation_traits,
Triangulation_traits,
Parallel_tag> Self;
typedef Mesher_level_base<Tr,
@ -865,7 +865,7 @@ public:
{
if (m_lock_ds)
{
m_lock_ds->unlock_all_tls_locked_cells();
m_lock_ds->unlock_all_tls_locked_locations();
}
}

2
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -522,7 +522,7 @@ public:
{
if (m_lock_ds)
{
m_lock_ds->unlock_all_tls_locked_cells();
m_lock_ds->unlock_all_tls_locked_locations();
}
}

2
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
View File

@ -178,7 +178,7 @@ protected:
void unlock_all_elements()
{
m_lock_ds.unlock_all_tls_locked_cells();
m_lock_ds.unlock_all_tls_locked_locations();
}
public:

2
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
View File

@ -372,7 +372,7 @@ protected:
void unlock_all_elements() const
{
m_lock_ds.unlock_all_tls_locked_cells();
m_lock_ds.unlock_all_tls_locked_locations();
}
void create_root_task() const

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

@ -249,7 +249,7 @@ protected:
void unlock_all_elements() const
{
m_lock_ds.unlock_all_tls_locked_cells();
m_lock_ds.unlock_all_tls_locked_locations();
}
void create_root_task() const
@ -456,10 +456,24 @@ public: // methods
pump_vertices<true>(criterion_value_limit, visitor);
#ifdef MESH_3_PROFILING
double exudation_time = t.elapsed();
std::cerr << std::endl << "==== Total exudation 'wall-clock' time: "
<< exudation_time << "s ====" << std::endl;
double exudation_time = t.elapsed();
std::cerr << std::endl << "==== Total exudation 'wall-clock' time: "
<< exudation_time << "s ====" << std::endl;
#endif
#ifdef CGAL_MESH_3_EXPORT_PERFORMANCE_DATA
if (ret == BOUND_REACHED)
{
CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", exudation_time);
}
else
{
CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time",
(ret == CANT_IMPROVE_ANYMORE ?
"CANT_IMPROVE_ANYMORE" : "TIME_LIMIT_REACHED"));
}
#endif
return ret;
}
@ -958,10 +972,6 @@ pump_vertices(double sliver_criterion_limit,
std::cerr << std::endl;
#endif // CGAL_MESH_3_EXUDER_VERBOSE
#ifdef CGAL_MESH_3_EXPORT_PERFORMANCE_DATA
CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", running_time_.time());
#endif
if ( is_time_limit_reached() ) {
#ifdef CGAL_MESH_3_EXUDER_VERBOSE
std::cerr << "Exuding return code: TIME_LIMIT_REACHED\n\n";

4
STL_Extension/include/CGAL/Spatial_grid_lock_data_structure_3.h
View File

@ -265,7 +265,7 @@ public:
m_tls_grids.local()[cell_index] = false;
}
void unlock_all_tls_locked_cells()
void unlock_all_tls_locked_locations()
{
std::vector<int> &tls_locked_cells = m_tls_locked_cells.local();
std::vector<int>::const_iterator it = tls_locked_cells.begin();
@ -304,7 +304,7 @@ public:
}
template <typename P3>
void unlock_all_tls_locked_cells_but_one_point(const P3 &point)
void unlock_all_tls_locked_locations_but_one_point(const P3 &point)
{
unlock_all_tls_locked_cells_but_one(get_grid_index(point));
}

17
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -108,7 +108,7 @@ protected:
Triangulation_3_base() {}
Triangulation_3_base(Lock_data_structure *) {}
void swap(Triangulation_3_base<Concurrency_tag,Lock_data_structure> &tr){}
void swap(Triangulation_3_base<Concurrency_tag, Lock_data_structure_> &tr){}
public:
bool is_parallel() const
@ -270,14 +270,14 @@ public:
void unlock_all_elements() const
{
if (m_lock_ds)
m_lock_ds->unlock_all_tls_locked_cells();
m_lock_ds->unlock_all_tls_locked_locations();
}
template <typename P3>
void unlock_all_elements_but_one_point(const P3 &point) const
{
if (m_lock_ds)
m_lock_ds->unlock_all_tls_locked_cells_but_one_point(point);
m_lock_ds->unlock_all_tls_locked_locations_but_one_point(point);
}
protected:
@ -748,8 +748,8 @@ public:
Cell_handle
inexact_locate(const Point& p,
Cell_handle start,
bool *p_could_lock_zone = 0,
int max_num_cells = CGAL_T3_STRUCTURAL_FILTERING_MAX_VISITED_CELLS) const;
int max_num_cells = CGAL_T3_STRUCTURAL_FILTERING_MAX_VISITED_CELLS,
bool *p_could_lock_zone = 0) const;
protected:
Cell_handle
exact_locate(const Point& p,
@ -767,7 +767,8 @@ protected:
internal::Structural_filtering_3_tag,
bool *p_could_lock_zone = 0) const
{
Cell_handle ch = inexact_locate(p, start, p_could_lock_zone);
Cell_handle ch = inexact_locate(
p, start, CGAL_T3_STRUCTURAL_FILTERING_MAX_VISITED_CELLS, p_could_lock_zone);
if (p_could_lock_zone && *p_could_lock_zone == false)
return ch; // = Cell_handle() here
else
@ -2607,8 +2608,8 @@ template <class Gt, class Tds, class Lds>
inline
typename Triangulation_3<Gt, Tds, Lds>::Cell_handle
Triangulation_3<Gt, Tds, Lds>::
inexact_locate(const Point & t, Cell_handle start,
bool *p_could_lock_zone, int n_of_turns) const
inexact_locate(const Point & t, Cell_handle start, int n_of_turns,
bool *p_could_lock_zone) const
{
CGAL_triangulation_expensive_assertion(start == Cell_handle() || tds().is_simplex(start) );

1
Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h
View File

@ -29,6 +29,7 @@
#ifdef CGAL_LINKED_WITH_TBB
# include <tbb/atomic.h>
# include <boost/type_traits/is_base_of.hpp>
#endif
namespace CGAL {