nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor UF_random_generator to fit the new std::shuffle

Browse source
This commit is contained in:
Johann Dreo 2022-01-23 18:17:48 +01:00
commit 4ee48e760b
7 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moeo/src/selection/moeoDetArchiveSelect.h
View file

@ -71,10 +71,10 @@ class moeoDetArchiveSelect : public eoSelect<MOEOT>
_dest.push_back(archive[i]);
}
else if (archive_size > max){
UF_random_generator<unsigned int> rndGen;
std::vector <int> permutation;
for(unsigned int i=0; i < archive_size; i++)
permutation.push_back(i);
UF_random_generator<unsigned int> rndGen(permutation.size());
random_shuffle(permutation.begin(), permutation.end(), rndGen);
for (unsigned int i=0; i<max; i++)
_dest.push_back(archive[permutation[i]]);

2
moeo/src/selection/moeoNumberUnvisitedSelect.h
View file

@ -72,7 +72,7 @@ public:
res.push_back(i);
}
if(number < res.size()){
UF_random_generator<unsigned int> rndGen;
UF_random_generator<unsigned int> rndGen(res.size());
std::random_shuffle(res.begin(), res.end(), rndGen);
res.resize(number);
}