mirror of https://github.com/CGAL/cgal
rename internal namespace
default_values -> default_values_for_mesh_3
This commit is contained in:
parent
3d1f7e530e
commit
1c3e09f562
|
|
@ -24,7 +24,7 @@
|
||||||
#include <CGAL/Mesh_3/sliver_criteria.h>
|
#include <CGAL/Mesh_3/sliver_criteria.h>
|
||||||
|
|
||||||
namespace CGAL {
|
namespace CGAL {
|
||||||
namespace parameters { namespace default_values {
|
namespace parameters { namespace default_values_for_mesh_3 {
|
||||||
|
|
||||||
// exude_mesh_3
|
// exude_mesh_3
|
||||||
const double exude_sliver_bound = 0.;
|
const double exude_sliver_bound = 0.;
|
||||||
|
|
@ -51,7 +51,7 @@ const double lloyd_convergence_ratio = 0.02;
|
||||||
const double odt_freeze_ratio = 0.01;
|
const double odt_freeze_ratio = 0.01;
|
||||||
const double odt_convergence_ratio = 0.02;
|
const double odt_convergence_ratio = 0.02;
|
||||||
|
|
||||||
} } // end namespace parameters::default_values
|
} } // end namespace parameters::default_values_for_mesh_3
|
||||||
} // end namespace CGAL
|
} // end namespace CGAL
|
||||||
|
|
||||||
#endif // CGAL_MESH_3_PARAMETERS_DEFAULTS_H
|
#endif // CGAL_MESH_3_PARAMETERS_DEFAULTS_H
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(required (in_out(c3t3),*) )
|
(required (in_out(c3t3),*) )
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0 )
|
(time_limit_, *, 0 )
|
||||||
(sliver_bound_, *, parameters::default_values::exude_sliver_bound )
|
(sliver_bound_, *, parameters::default_values_for_mesh_3::exude_sliver_bound )
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -51,9 +51,9 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0 )
|
(time_limit_, *, 0 )
|
||||||
(max_iteration_number_, *, 0 )
|
(max_iteration_number_, *, 0 )
|
||||||
(convergence_, *, parameters::default_values::lloyd_convergence_ratio )
|
(convergence_, *, parameters::default_values_for_mesh_3::lloyd_convergence_ratio )
|
||||||
(freeze_bound_, *, parameters::default_values::lloyd_freeze_ratio )
|
(freeze_bound_, *, parameters::default_values_for_mesh_3::lloyd_freeze_ratio )
|
||||||
(do_freeze_, *, parameters::default_values::do_freeze ))
|
(do_freeze_, *, parameters::default_values_for_mesh_3::do_freeze ))
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return lloyd_optimize_mesh_3_impl(c3t3, domain,
|
return lloyd_optimize_mesh_3_impl(c3t3, domain,
|
||||||
|
|
|
||||||
|
|
@ -51,9 +51,9 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0 )
|
(time_limit_, *, 0 )
|
||||||
(max_iteration_number_, *, 0 )
|
(max_iteration_number_, *, 0 )
|
||||||
(convergence_, *, parameters::default_values::odt_convergence_ratio )
|
(convergence_, *, parameters::default_values_for_mesh_3::odt_convergence_ratio )
|
||||||
(freeze_bound_, *, parameters::default_values::odt_freeze_ratio )
|
(freeze_bound_, *, parameters::default_values_for_mesh_3::odt_freeze_ratio )
|
||||||
(do_freeze_, *, parameters::default_values::do_freeze ))
|
(do_freeze_, *, parameters::default_values_for_mesh_3::do_freeze ))
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return odt_optimize_mesh_3_impl(c3t3, domain,
|
return odt_optimize_mesh_3_impl(c3t3, domain,
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,9 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(required (in_out(c3t3),*) (domain,*) )
|
(required (in_out(c3t3),*) (domain,*) )
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0 )
|
(time_limit_, *, 0 )
|
||||||
(sliver_bound_, *, parameters::default_values::perturb_sliver_bound )
|
(sliver_bound_, *, parameters::default_values_for_mesh_3::perturb_sliver_bound )
|
||||||
(sliver_criterion_, *,
|
(sliver_criterion_, *,
|
||||||
parameters::default_values::default_sliver_criterion(c3t3,sliver_bound_))
|
parameters::default_values_for_mesh_3::default_sliver_criterion(c3t3,sliver_bound_))
|
||||||
(perturbation_vector_, *,
|
(perturbation_vector_, *,
|
||||||
default_perturbation_vector(c3t3,domain,sliver_criterion_))
|
default_perturbation_vector(c3t3,domain,sliver_criterion_))
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -254,7 +254,7 @@ CGAL_IGNORE_BOOST_PARAMETER_NAME_WARNINGS
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
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_for_mesh_3::perturb_sliver_bound )))
|
||||||
{
|
{
|
||||||
internal::Perturb_options options(true);
|
internal::Perturb_options options(true);
|
||||||
|
|
||||||
|
|
@ -273,7 +273,7 @@ inline internal::Perturb_options no_perturb() { return internal::Perturb_options
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
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_for_mesh_3::exude_sliver_bound )))
|
||||||
{
|
{
|
||||||
internal::Exude_options options(true);
|
internal::Exude_options options(true);
|
||||||
|
|
||||||
|
|
@ -293,8 +293,8 @@ inline internal::Exude_options no_exude() { return internal::Exude_options(false
|
||||||
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_for_mesh_3::odt_convergence_ratio )
|
||||||
(freeze_bound_, *, default_values::odt_freeze_ratio )))
|
(freeze_bound_, *, default_values_for_mesh_3::odt_freeze_ratio )))
|
||||||
{
|
{
|
||||||
internal::Odt_options options(true);
|
internal::Odt_options options(true);
|
||||||
|
|
||||||
|
|
@ -314,8 +314,8 @@ inline internal::Odt_options no_odt() { return internal::Odt_options(false); }
|
||||||
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_for_mesh_3::lloyd_convergence_ratio )
|
||||||
(freeze_bound_, *, default_values::lloyd_freeze_ratio )))
|
(freeze_bound_, *, default_values_for_mesh_3::lloyd_freeze_ratio )))
|
||||||
{
|
{
|
||||||
internal::Lloyd_options options(true);
|
internal::Lloyd_options options(true);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(required (in_out(c3t3),*) (domain,*))
|
(required (in_out(c3t3),*) (domain,*))
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0)
|
(time_limit_, *, 0)
|
||||||
(sliver_bound_, *, parameters::default_values::perturb_sliver_bound)
|
(sliver_bound_, *, parameters::default_values_for_mesh_3::perturb_sliver_bound)
|
||||||
(sliver_criterion_, *, parameters::default_values::default_sliver_criterion(c3t3, sliver_bound_))
|
(sliver_criterion_, *, parameters::default_values_for_mesh_3::default_sliver_criterion(c3t3, sliver_bound_))
|
||||||
(perturbation_vector_, *, default_perturbation_vector(c3t3,domain,sliver_criterion_))
|
(perturbation_vector_, *, default_perturbation_vector(c3t3,domain,sliver_criterion_))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
@ -63,7 +63,7 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(required (in_out(c3t3),*))
|
(required (in_out(c3t3),*))
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0)
|
(time_limit_, *, 0)
|
||||||
(sliver_bound_, *, parameters::default_values::exude_sliver_bound)
|
(sliver_bound_, *, parameters::default_values_for_mesh_3::exude_sliver_bound)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
@ -81,9 +81,9 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0)
|
(time_limit_, *, 0)
|
||||||
(max_iteration_number_, *, 0)
|
(max_iteration_number_, *, 0)
|
||||||
(convergence_, *, parameters::default_values::odt_convergence_ratio)
|
(convergence_, *, parameters::default_values_for_mesh_3::odt_convergence_ratio)
|
||||||
(freeze_bound_, *, parameters::default_values::odt_freeze_ratio)
|
(freeze_bound_, *, parameters::default_values_for_mesh_3::odt_freeze_ratio)
|
||||||
(do_freeze_, *, parameters::default_values::do_freeze)
|
(do_freeze_, *, parameters::default_values_for_mesh_3::do_freeze)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
@ -103,9 +103,9 @@ BOOST_PARAMETER_FUNCTION(
|
||||||
(optional
|
(optional
|
||||||
(time_limit_, *, 0)
|
(time_limit_, *, 0)
|
||||||
(max_iteration_number_, *, 0)
|
(max_iteration_number_, *, 0)
|
||||||
(convergence_, *, parameters::default_values::lloyd_convergence_ratio)
|
(convergence_, *, parameters::default_values_for_mesh_3::lloyd_convergence_ratio)
|
||||||
(freeze_bound_, *, parameters::default_values::lloyd_freeze_ratio)
|
(freeze_bound_, *, parameters::default_values_for_mesh_3::lloyd_freeze_ratio)
|
||||||
(do_freeze_, *, parameters::default_values::do_freeze)
|
(do_freeze_, *, parameters::default_values_for_mesh_3::do_freeze)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,7 @@ Mesh_3_optimization_plugin::odt()
|
||||||
|
|
||||||
ui.objectName->setText(item->name());
|
ui.objectName->setText(item->name());
|
||||||
|
|
||||||
namespace cgpd = CGAL::parameters::default_values;
|
namespace cgpd = CGAL::parameters::default_values_for_mesh_3;
|
||||||
ui.convergenceRatio->setValue(cgpd::odt_convergence_ratio);
|
ui.convergenceRatio->setValue(cgpd::odt_convergence_ratio);
|
||||||
ui.freezeRatio->setValue(cgpd::odt_freeze_ratio);
|
ui.freezeRatio->setValue(cgpd::odt_freeze_ratio);
|
||||||
|
|
||||||
|
|
@ -310,7 +310,7 @@ Mesh_3_optimization_plugin::lloyd()
|
||||||
|
|
||||||
ui.objectName->setText(item->name());
|
ui.objectName->setText(item->name());
|
||||||
|
|
||||||
namespace cgpd = CGAL::parameters::default_values;
|
namespace cgpd = CGAL::parameters::default_values_for_mesh_3;
|
||||||
ui.convergenceRatio->setValue(cgpd::lloyd_convergence_ratio);
|
ui.convergenceRatio->setValue(cgpd::lloyd_convergence_ratio);
|
||||||
ui.freezeRatio->setValue(cgpd::lloyd_freeze_ratio);
|
ui.freezeRatio->setValue(cgpd::lloyd_freeze_ratio);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue