From 4d5f2ee7ca8fb71933e20c8f59ad21684d92de9d Mon Sep 17 00:00:00 2001 From: Lingjie Zhu Date: Tue, 4 Sep 2018 11:22:21 +0200 Subject: [PATCH] change parameter order --- .../Surface_mesh_approximation/NamedParameters.txt | 12 ++++++------ .../include/CGAL/VSA/approximate_mesh.h | 4 ++-- .../include/CGAL/Variational_shape_approximation.h | 2 +- .../parameters_interface.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt b/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt index 05f6e92663c..8ac67c558ef 100644 --- a/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt +++ b/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt @@ -93,18 +93,18 @@ the minimum total error drop to approximate the input mesh.\n \b Default value is `0.1` \cgalNPEnd -\cgalNPBegin{nb_of_iterations} \anchor VSA_nb_of_iterations -the number of partitioning and fitting iterations after seeding.\n -\b Type : `std::size_t` \n -\b Default value is `std::min(std::max(nb_of_faces / max_nb_of_proxies, 20), 60)` -\cgalNPEnd - \cgalNPBegin{nb_of_relaxations} \anchor VSA_nb_of_relaxations the number of relaxation iterations interleaved within seeding.\n \b Type : `std::size_t` \n \b Default value is `5` \cgalNPEnd +\cgalNPBegin{nb_of_iterations} \anchor VSA_nb_of_iterations +the number of partitioning and fitting iterations after seeding.\n +\b Type : `std::size_t` \n +\b Default value is `std::min(std::max(nb_of_faces / max_nb_of_proxies, 20), 60)` +\cgalNPEnd + \cgalNPTableEnd \cgalHeading{2. Parameters for the Meshing Step} diff --git a/Surface_mesh_approximation/include/CGAL/VSA/approximate_mesh.h b/Surface_mesh_approximation/include/CGAL/VSA/approximate_mesh.h index 22ea24d3ff7..091681e4c65 100644 --- a/Surface_mesh_approximation/include/CGAL/VSA/approximate_mesh.h +++ b/Surface_mesh_approximation/include/CGAL/VSA/approximate_mesh.h @@ -70,10 +70,10 @@ unspecified_type all_default(); * \cgalParamEnd * \cgalParamBegin{min_error_drop} minimum error drop of the approximation, expressed in ratio between two iterations of proxy addition. * \cgalParamEnd - * \cgalParamBegin{nb_of_iterations} number of partitioning and fitting iterations after seeding. - * \cgalParamEnd * \cgalParamBegin{nb_of_relaxations} number of relaxation iterations interleaved within seeding. * \cgalParamEnd + * \cgalParamBegin{nb_of_iterations} number of partitioning and fitting iterations after seeding. + * \cgalParamEnd * \cgalNamedParamsEnd * \cgalNamedParamsBegin{Meshing Named Parameters} * \cgalParamBegin{subdivision_ratio} chord subdivision ratio threshold to the chord length or average edge length. diff --git a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h index e392ea816e8..5fa5fabc556 100644 --- a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h +++ b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h @@ -579,7 +579,7 @@ public: /// \name Refinement Operations /// @{ - /*! + /*! * @brief Teleports the local minimum to the worst region by combining the merging and adding processes. * The re-fitting is performed after each teleportation. * Here if we specify more than one proxy this means we teleport in a naive iterative fashion. diff --git a/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h b/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h index 0f63135c92e..81e1fac16ce 100644 --- a/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h +++ b/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h @@ -6,8 +6,8 @@ CGAL_add_named_parameter(verbose_level_t, verbose_level, verbose_level) CGAL_add_named_parameter(seeding_method_t, seeding_method, seeding_method) CGAL_add_named_parameter(max_nb_of_proxies_t, max_nb_of_proxies, max_nb_of_proxies) CGAL_add_named_parameter(min_error_drop_t, min_error_drop, min_error_drop) -CGAL_add_named_parameter(nb_of_iterations_t, nb_of_iterations, nb_of_iterations) CGAL_add_named_parameter(nb_of_relaxations_t, nb_of_relaxations, nb_of_relaxations) +CGAL_add_named_parameter(nb_of_iterations_t, nb_of_iterations, nb_of_iterations) // meshing parameters CGAL_add_named_parameter(subdivision_ratio_t, subdivision_ratio, subdivision_ratio)