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

use boost named parameters as done in Mesh_3

This commit is contained in:
Jane Tournois 2014-11-17 16:54:24 +01:00
parent b641f2f257
commit 338a9593f7
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_2/examples/Mesh_2/mesh_optimization.cpp
View File

@ -49,7 +49,9 @@ int main()
std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl; std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl;
std::cout << "Run Lloyd optimization..."; std::cout << "Run Lloyd optimization...";
CGAL::lloyd_optimize_mesh_2(cdt, 10); CGAL::lloyd_optimize_mesh_2(cdt,
convergence = 0,
time_limit = 10);
std::cout << " done." << std::endl; std::cout << " done." << std::endl;
std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl; std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl;

46
Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
View File

@ -6,19 +6,52 @@
#include <CGAL/Mesh_2/Mesh_sizing_field.h> #include <CGAL/Mesh_2/Mesh_sizing_field.h>
#include <fstream> #include <fstream>
#include <boost/parameter.hpp>
#include <boost/parameter/name.hpp>
BOOST_PARAMETER_NAME( cdt )
BOOST_PARAMETER_NAME( (max_iteration_number, tag) max_iteration_number_ )
BOOST_PARAMETER_NAME( (convergence, tag) convergence_)
BOOST_PARAMETER_NAME( (time_limit, tag) time_limit_ )
BOOST_PARAMETER_NAME( (freeze_bound, tag) freeze_bound_)
namespace CGAL namespace CGAL
{ {
BOOST_PARAMETER_FUNCTION(
(void),
lloyd_optimize_mesh_2,
tag,
(required (in_out(cdt),*))
(optional
(max_iteration_number_, *, 0 )
(convergence_, *, 0.001 )
(time_limit_, *, 0. )
(freeze_bound_, *, 0.001 )
)
)
{
return lloyd_optimize_mesh_2_impl(cdt,
max_iteration_number_,
convergence_,
freeze_bound_,
time_limit_);
}
template<typename CDT> template<typename CDT>
void lloyd_optimize_mesh_2(CDT& cdt, void lloyd_optimize_mesh_2_impl(CDT& cdt,
const unsigned int nb_iterations = 1, const unsigned int max_iterations,
const double convergence_ratio = 0.001) const double convergence_ratio,
const double freeze_bound,
const double time_limit)
{ {
typedef Mesh_2::Mesh_sizing_field<CDT> Sizing; typedef Mesh_2::Mesh_sizing_field<CDT> Sizing;
typedef Mesh_2::Lloyd_move_2<CDT, Sizing> Mv; typedef Mesh_2::Lloyd_move_2<CDT, Sizing> Mv;
typedef Mesh_2::Mesh_global_optimizer_2<CDT, Mv> Optimizer; typedef Mesh_2::Mesh_global_optimizer_2<CDT, Mv> Optimizer;
Optimizer lloyd(cdt, convergence_ratio); Optimizer lloyd(cdt,
convergence_ratio,
freeze_bound);
lloyd.set_time_limit(time_limit);
#ifdef CGAL_MESH_2_OPTIMIZERS_DEBUG #ifdef CGAL_MESH_2_OPTIMIZERS_DEBUG
std::ofstream os("before_lloyd.angles.txt"); std::ofstream os("before_lloyd.angles.txt");
@ -26,6 +59,11 @@ namespace CGAL
os.close(); os.close();
#endif #endif
// 1000 iteration max to avoid infinite loop
int nb_iterations = (0 == max_iterations)
? 1000
: max_iterations;
//run optimization //run optimization
lloyd(nb_iterations); lloyd(nb_iterations);