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

Don't generate a new population at each generation... 

Obviously, the algorithm is now much more efficient.
This commit is contained in:
Mael Rouxel-Labbé 2020-03-25 12:37:45 +01:00
parent 3c6e5875d5
commit 0c2b32ea48
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,13 +55,13 @@ public:
m_traits(traits) m_traits(traits)
{ } { }
void genetic_algorithm(const std::size_t population_size = 50) void genetic_algorithm()
{ {
// random permutations // This evolves an existing population
m_population.initialize(population_size, m_points, m_rng); CGAL_precondition(m_population.empty());
//groups 1,2 : size m/2 groups 3,4 : size (m - m/2). m/2 is floored //groups 1,2 : size = floor(m/2) groups 3,4 : size = ceil(m/2).
const std::size_t m = population_size; const std::size_t m = m_population.size();
const std::size_t first_group_size = m / 2; const std::size_t first_group_size = m / 2;
const std::size_t second_group_size = m - first_group_size; const std::size_t second_group_size = m - first_group_size;
@ -131,6 +131,8 @@ public:
const FT tolerance = 1e-9; const FT tolerance = 1e-9;
int stale = 0; int stale = 0;
m_population.initialize(population_size, m_points, m_rng);
std::size_t gen_iter = 0; std::size_t gen_iter = 0;
for(;;) for(;;)
{ {
@ -138,7 +140,7 @@ public:
std::cout << "- - - - generation #" << gen_iter << "\n"; std::cout << "- - - - generation #" << gen_iter << "\n";
#endif #endif
genetic_algorithm(population_size); genetic_algorithm();
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP #ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP
std::cout << "population after genetic" << std::endl; std::cout << "population after genetic" << std::endl;