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

Fixed trailing whitespace in refine_mesh_3.h (no real changes)

This commit is contained in:
Mael Rouxel-Labbé 2017-10-31 15:06:39 +01:00
parent 62fa9be278
commit c038e25f98
1 changed files with 343 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
Mesh_3/include/CGAL/refine_mesh_3.h
View File

@ -27,7 +27,6 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/config.h> #include <CGAL/config.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
#include <CGAL/Mesh_3/Dump_c3t3.h> #include <CGAL/Mesh_3/Dump_c3t3.h>
@ -37,18 +36,18 @@
namespace CGAL { namespace CGAL {
namespace details { namespace details {
/** /**
* @class Insert_vertex_in_c3t3 * @class Insert_vertex_in_c3t3
* *
* A functor designed to insert unweighted points into the triangulation * A functor designed to insert unweighted points into the triangulation
* of a C3T3 from C3T3::Tr::Vertex , keeping the dimension and indices. * of a C3T3 from C3T3::Tr::Vertex , keeping the dimension and indices.
*/ */
template <typename C3T3> template <typename C3T3>
class Insert_vertex_in_c3t3 class Insert_vertex_in_c3t3
{ {
private: private:
typedef typename C3T3::Vertex_handle Vertex_handle; typedef typename C3T3::Vertex_handle Vertex_handle;
typedef typename C3T3::Index Index; typedef typename C3T3::Index Index;
@ -58,7 +57,7 @@ namespace CGAL {
typedef typename Tr::Weighted_point Weighted_point; typedef typename Tr::Weighted_point Weighted_point;
typedef typename Weighted_point::Weight Weight; typedef typename Weighted_point::Weight Weight;
public: public:
Insert_vertex_in_c3t3(C3T3& c3t3) Insert_vertex_in_c3t3(C3T3& c3t3)
: r_c3t3_(c3t3) {} : r_c3t3_(c3t3) {}
@ -81,7 +80,7 @@ namespace CGAL {
r_c3t3_.set_dimension(new_vertex, dimension); r_c3t3_.set_dimension(new_vertex, dimension);
#if defined(CGAL_LINKED_WITH_TBB)\ #if defined(CGAL_LINKED_WITH_TBB)\
&& !defined(CGAL_PARALLEL_MESH_3_DO_NOT_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE) && !defined(CGAL_PARALLEL_MESH_3_DO_NOT_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE)
if (boost::is_convertible<typename C3T3::Concurrency_tag, CGAL::Parallel_tag>::value) if (boost::is_convertible<typename C3T3::Concurrency_tag, CGAL::Parallel_tag>::value)
{ {
if (dimension == -1) if (dimension == -1)
@ -97,21 +96,21 @@ namespace CGAL {
#endif #endif
} }
private: private:
C3T3& r_c3t3_; C3T3& r_c3t3_;
}; };
}
} // namespace details
namespace parameters { namespace parameters {
namespace internal { namespace internal {
const int undef_parameter = -1; const int undef_parameter = -1;
// Helpers // Helpers
struct Optimization_options_base struct Optimization_options_base
{ {
Optimization_options_base(bool b) Optimization_options_base(bool b)
: b_(b), time_limit_(undef_parameter), bound_(undef_parameter) {} : b_(b), time_limit_(undef_parameter), bound_(undef_parameter) {}
@ -125,14 +124,14 @@ namespace parameters {
void set_bound(double d) { bound_ = d; } void set_bound(double d) { bound_ = d; }
double bound() const { return bound_; } double bound() const { return bound_; }
private: private:
bool b_; bool b_;
double time_limit_; double time_limit_;
double bound_; double bound_;
}; };
struct Global_optimization_options_base struct Global_optimization_options_base
{ {
Global_optimization_options_base() Global_optimization_options_base()
: convergence_(undef_parameter), max_it_nb_(undef_parameter) {} : convergence_(undef_parameter), max_it_nb_(undef_parameter) {}
@ -144,41 +143,41 @@ namespace parameters {
void set_max_iteration_number(int i) { max_it_nb_ = i; } void set_max_iteration_number(int i) { max_it_nb_ = i; }
int max_iteration_number() const { return max_it_nb_; } int max_iteration_number() const { return max_it_nb_; }
private: private:
double convergence_; double convergence_;
int max_it_nb_; int max_it_nb_;
}; };
// Perturb // Perturb
struct Perturb_options : public Optimization_options_base struct Perturb_options : public Optimization_options_base
{ {
Perturb_options(bool b) : Optimization_options_base(b) {} Perturb_options(bool b) : Optimization_options_base(b) {}
}; };
// Exude // Exude
struct Exude_options : public Optimization_options_base struct Exude_options : public Optimization_options_base
{ {
Exude_options(bool b) : Optimization_options_base(b) {} Exude_options(bool b) : Optimization_options_base(b) {}
}; };
// Odt // Odt
struct Odt_options : public Optimization_options_base struct Odt_options : public Optimization_options_base
, public Global_optimization_options_base , public Global_optimization_options_base
{ {
Odt_options(bool b) : Optimization_options_base(b) Odt_options(bool b) : Optimization_options_base(b)
, Global_optimization_options_base() {} , Global_optimization_options_base() {}
}; };
// Lloyd // Lloyd
struct Lloyd_options : public Optimization_options_base struct Lloyd_options : public Optimization_options_base
, public Global_optimization_options_base , public Global_optimization_options_base
{ {
Lloyd_options(bool b) : Optimization_options_base(b) Lloyd_options(bool b) : Optimization_options_base(b)
, Global_optimization_options_base() {} , Global_optimization_options_base() {}
}; };
// Manifold // Manifold
struct Manifold_options { struct Manifold_options {
enum { enum {
NON_MANIFOLD = 0, NON_MANIFOLD = 0,
MANIFOLD_WITH_BOUNDARY = 8, MANIFOLD_WITH_BOUNDARY = 8,
@ -194,10 +193,10 @@ namespace parameters {
{} {}
int mesh_topology; int mesh_topology;
}; };
// Various Mesh_3 option // Various Mesh_3 option
struct Mesh_3_options { struct Mesh_3_options {
Mesh_3_options() Mesh_3_options()
: dump_after_init_prefix() : dump_after_init_prefix()
, dump_after_refine_surface_prefix() , dump_after_refine_surface_prefix()
@ -218,9 +217,9 @@ namespace parameters {
int number_of_initial_points; int number_of_initial_points;
bool nonlinear_growth_of_balls; bool nonlinear_growth_of_balls;
}; // end struct Mesh_3_options }; // end struct Mesh_3_options
} // end namespace internal } // end namespace internal
// see <CGAL/config.h> // see <CGAL/config.h>
CGAL_PRAGMA_DIAG_PUSH CGAL_PRAGMA_DIAG_PUSH
@ -228,13 +227,13 @@ CGAL_PRAGMA_DIAG_PUSH
CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
// ----------------------------------- // -----------------------------------
// Perturb // Perturb
// ----------------------------------- // -----------------------------------
BOOST_PARAMETER_FUNCTION((internal::Perturb_options), perturb, tag, BOOST_PARAMETER_FUNCTION((internal::Perturb_options), perturb, tag,
(optional (time_limit_, *, internal::undef_parameter ) (optional (time_limit_, *, internal::undef_parameter )
(sliver_bound_, *, default_values::perturb_sliver_bound ))) (sliver_bound_, *, default_values::perturb_sliver_bound )))
{ {
internal::Perturb_options options(true); internal::Perturb_options options(true);
if ( internal::undef_parameter != time_limit_ ) if ( internal::undef_parameter != time_limit_ )
@ -243,17 +242,17 @@ CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
options.set_bound(sliver_bound_); options.set_bound(sliver_bound_);
return options; return options;
} }
inline internal::Perturb_options no_perturb() { return internal::Perturb_options(false); } inline internal::Perturb_options no_perturb() { return internal::Perturb_options(false); }
// ----------------------------------- // -----------------------------------
// Exude // Exude
// ----------------------------------- // -----------------------------------
BOOST_PARAMETER_FUNCTION((internal::Exude_options), exude, tag, BOOST_PARAMETER_FUNCTION((internal::Exude_options), exude, tag,
(optional (time_limit_, *, internal::undef_parameter ) (optional (time_limit_, *, internal::undef_parameter )
(sliver_bound_, *, default_values::exude_sliver_bound ))) (sliver_bound_, *, default_values::exude_sliver_bound )))
{ {
internal::Exude_options options(true); internal::Exude_options options(true);
if ( internal::undef_parameter != time_limit_ ) if ( internal::undef_parameter != time_limit_ )
@ -262,19 +261,19 @@ CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
options.set_bound(sliver_bound_); options.set_bound(sliver_bound_);
return options; return options;
} }
inline internal::Exude_options no_exude() { return internal::Exude_options(false); } inline internal::Exude_options no_exude() { return internal::Exude_options(false); }
// ----------------------------------- // -----------------------------------
// Odt // Odt
// ----------------------------------- // -----------------------------------
BOOST_PARAMETER_FUNCTION((internal::Odt_options), odt, tag, BOOST_PARAMETER_FUNCTION((internal::Odt_options), odt, tag,
(optional (time_limit_, *, 0 ) (optional (time_limit_, *, 0 )
(max_iteration_number_, *, 0 ) (max_iteration_number_, *, 0 )
(convergence_, *, default_values::odt_convergence_ratio ) (convergence_, *, default_values::odt_convergence_ratio )
(freeze_bound_, *, default_values::odt_freeze_ratio ))) (freeze_bound_, *, default_values::odt_freeze_ratio )))
{ {
internal::Odt_options options(true); internal::Odt_options options(true);
options.set_time_limit(time_limit_); options.set_time_limit(time_limit_);
@ -283,19 +282,19 @@ CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
options.set_max_iteration_number(max_iteration_number_); options.set_max_iteration_number(max_iteration_number_);
return options; return options;
} }
inline internal::Odt_options no_odt() { return internal::Odt_options(false); } inline internal::Odt_options no_odt() { return internal::Odt_options(false); }
// ----------------------------------- // -----------------------------------
// Lloyd // Lloyd
// ----------------------------------- // -----------------------------------
BOOST_PARAMETER_FUNCTION((internal::Lloyd_options), lloyd, tag, BOOST_PARAMETER_FUNCTION((internal::Lloyd_options), lloyd, tag,
(optional (time_limit_, *, 0 ) (optional (time_limit_, *, 0 )
(max_iteration_number_, *, 0 ) (max_iteration_number_, *, 0 )
(convergence_, *, default_values::lloyd_convergence_ratio ) (convergence_, *, default_values::lloyd_convergence_ratio )
(freeze_bound_, *, default_values::lloyd_freeze_ratio ))) (freeze_bound_, *, default_values::lloyd_freeze_ratio )))
{ {
internal::Lloyd_options options(true); internal::Lloyd_options options(true);
options.set_time_limit(time_limit_); options.set_time_limit(time_limit_);
@ -304,48 +303,48 @@ CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
options.set_max_iteration_number(max_iteration_number_); options.set_max_iteration_number(max_iteration_number_);
return options; return options;
} }
inline internal::Lloyd_options no_lloyd() { return internal::Lloyd_options(false); } inline internal::Lloyd_options no_lloyd() { return internal::Lloyd_options(false); }
// ----------------------------------- // -----------------------------------
// Manifold options ------------------ // Manifold options ------------------
// ----------------------------------- // -----------------------------------
BOOST_PARAMETER_FUNCTION((internal::Manifold_options), manifold_options, tag, BOOST_PARAMETER_FUNCTION((internal::Manifold_options), manifold_options, tag,
(optional (optional
(mesh_topology_, (int), -1) (mesh_topology_, (int), -1)
) )
) )
{ {
internal::Manifold_options options; internal::Manifold_options options;
options.mesh_topology = mesh_topology_; options.mesh_topology = mesh_topology_;
return options; return options;
} }
inline internal::Manifold_options manifold() inline internal::Manifold_options manifold()
{ {
return internal::Manifold_options( return internal::Manifold_options(
internal::Manifold_options::MANIFOLD); internal::Manifold_options::MANIFOLD);
} }
inline internal::Manifold_options manifold_with_boundary() inline internal::Manifold_options manifold_with_boundary()
{ {
return internal::Manifold_options( return internal::Manifold_options(
internal::Manifold_options::MANIFOLD_WITH_BOUNDARY); internal::Manifold_options::MANIFOLD_WITH_BOUNDARY);
} }
inline internal::Manifold_options non_manifold() inline internal::Manifold_options non_manifold()
{ {
return internal::Manifold_options( return internal::Manifold_options(
internal::Manifold_options::NON_MANIFOLD); internal::Manifold_options::NON_MANIFOLD);
} }
// ----------------------------------- // -----------------------------------
// Mesh options // Mesh options
// ----------------------------------- // -----------------------------------
// Undocumented Boost parameter for refine_mesh_3 and make_mesh_3. // Undocumented Boost parameter for refine_mesh_3 and make_mesh_3.
// Allows to dump the mesh at given stage of the mesh generation // Allows to dump the mesh at given stage of the mesh generation
// algorithm. // algorithm.
BOOST_PARAMETER_FUNCTION((internal::Mesh_3_options), mesh_3_options, tag, BOOST_PARAMETER_FUNCTION((internal::Mesh_3_options), mesh_3_options, tag,
(optional (optional
(dump_after_init_prefix_, (std::string), "" ) (dump_after_init_prefix_, (std::string), "" )
(dump_after_refine_surface_prefix_, (std::string), "" ) (dump_after_refine_surface_prefix_, (std::string), "" )
@ -356,7 +355,7 @@ CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
(number_of_initial_points_, (int), -1) (number_of_initial_points_, (int), -1)
) )
) )
{ {
internal::Mesh_3_options options; internal::Mesh_3_options options;
options.dump_after_init_prefix=dump_after_init_prefix_; options.dump_after_init_prefix=dump_after_init_prefix_;
@ -368,47 +367,47 @@ CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
options.number_of_initial_points=number_of_initial_points_; options.number_of_initial_points=number_of_initial_points_;
return options; return options;
} }
// Undocumented Boost parameter for refine_mesh_3 and make_mesh_3. // Undocumented Boost parameter for refine_mesh_3 and make_mesh_3.
// Default Mesh_3_options: dump at every stage of the mesh generation. // Default Mesh_3_options: dump at every stage of the mesh generation.
inline internal::Mesh_3_options mesh_3_dump() inline internal::Mesh_3_options mesh_3_dump()
{ {
internal::Mesh_3_options options; internal::Mesh_3_options options;
options.dump_after_init_prefix="mesh_dump_after_init"; options.dump_after_init_prefix = "mesh_dump_after_init";
options.dump_after_refine_surface_prefix="mesh_dump_after_refine_surface"; options.dump_after_refine_surface_prefix = "mesh_dump_after_refine_surface";
options.dump_after_refine_prefix="mesh_dump_after_refine"; options.dump_after_refine_prefix = "mesh_dump_after_refine";
options.dump_after_glob_opt_prefix="mesh_dump_after_glob_opt"; options.dump_after_glob_opt_prefix = "mesh_dump_after_glob_opt";
options.dump_after_perturb_prefix="mesh_dump_after_perturb"; options.dump_after_perturb_prefix = "mesh_dump_after_perturb";
options.dump_after_exude_prefix="mesh_dump_after_exude"; options.dump_after_exude_prefix = "mesh_dump_after_exude";
return options; return options;
} }
CGAL_PRAGMA_DIAG_POP CGAL_PRAGMA_DIAG_POP
// ----------------------------------- // -----------------------------------
// Reset_c3t3 (undocumented) // Reset_c3t3 (undocumented)
// ----------------------------------- // -----------------------------------
CGAL_MESH_BOOLEAN_PARAMETER(Reset,reset_c3t3,no_reset_c3t3) CGAL_MESH_BOOLEAN_PARAMETER(Reset, reset_c3t3, no_reset_c3t3)
// CGAL_MESH_BOOLEAN_PARAMETER defined in <CGAL/Mesh_3/global_parameters.h> // CGAL_MESH_BOOLEAN_PARAMETER defined in <CGAL/Mesh_3/global_parameters.h>
// see <CGAL/config.h> // see <CGAL/config.h>
CGAL_PRAGMA_DIAG_PUSH CGAL_PRAGMA_DIAG_PUSH
// see <CGAL/Mesh_3/config.h> // see <CGAL/Mesh_3/config.h>
CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS CGAL_MESH_3_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
// ----------------------------------- // -----------------------------------
// Parameters // Parameters
// ----------------------------------- // -----------------------------------
BOOST_PARAMETER_NAME( exude_param ) BOOST_PARAMETER_NAME( exude_param )
BOOST_PARAMETER_NAME( perturb_param ) BOOST_PARAMETER_NAME( perturb_param )
BOOST_PARAMETER_NAME( odt_param ) BOOST_PARAMETER_NAME( odt_param )
BOOST_PARAMETER_NAME( lloyd_param ) BOOST_PARAMETER_NAME( lloyd_param )
BOOST_PARAMETER_NAME( reset_param ) BOOST_PARAMETER_NAME( reset_param )
BOOST_PARAMETER_NAME( mesh_options_param ) BOOST_PARAMETER_NAME( mesh_options_param )
BOOST_PARAMETER_NAME( manifold_options_param ) BOOST_PARAMETER_NAME( manifold_options_param )
CGAL_PRAGMA_DIAG_POP CGAL_PRAGMA_DIAG_POP
} // end namespace parameters } // end namespace parameters
@ -564,10 +563,8 @@ void refine_mesh_3_impl(C3T3& c3t3,
dump_c3t3(c3t3, mesh_options.dump_after_exude_prefix); dump_c3t3(c3t3, mesh_options.dump_after_exude_prefix);
} }
} }
} // end namespace CGAL } // end namespace CGAL
#endif // CGAL_REFINE_MESH_3_H #endif // CGAL_REFINE_MESH_3_H