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

Minor internal API changes

This commit is contained in:
Mael Rouxel-Labbé 2020-03-24 11:54:15 +01:00
parent 6f90060e7d
commit 5069bcf813
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/evolution.h
View File

@ -122,8 +122,8 @@ public:
} }
void evolve(const std::size_t generations, void evolve(const std::size_t generations,
const std::size_t population_size = 50, const std::size_t population_size,
const std::size_t nelder_mead_iterations = 150) const std::size_t nelder_mead_iterations)
{ {
// stopping criteria prameters // stopping criteria prameters
FT prev_fit_value = 0; FT prev_fit_value = 0;

4
Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
View File

@ -101,6 +101,8 @@ void compute_best_transformation(const PointRange& points,
CGAL_assertion(points.size() >= 3); CGAL_assertion(points.size() >= 3);
const std::size_t max_generations = 50; // @todo hidden NP const std::size_t max_generations = 50; // @todo hidden NP
const std::size_t population_size = 50;
const std::size_t nelder_mead_iterations = 150;
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_BENCHMARKS #ifdef CGAL_OPTIMAL_BOUNDING_BOX_BENCHMARKS
CGAL::Real_timer timer; CGAL::Real_timer timer;
@ -108,7 +110,7 @@ void compute_best_transformation(const PointRange& points,
#endif #endif
Evolution<PointRange, Traits> search_solution(points, rng, traits); Evolution<PointRange, Traits> search_solution(points, rng, traits);
search_solution.evolve(max_generations); search_solution.evolve(max_generations, population_size, nelder_mead_iterations);
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_BENCHMARKS #ifdef CGAL_OPTIMAL_BOUNDING_BOX_BENCHMARKS
std::cout << "evolve: " << timer.time() << std::endl; std::cout << "evolve: " << timer.time() << std::endl;