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

Invalidate individuals in order to force evaluation in Island. Remove some debug messages.

Browse source
This commit is contained in:
quemy 2013-11-22 08:31:46 +01:00
commit 84b3601f90
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
smp/src/island.cpp
View file

@ -140,7 +140,6 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::receive(void)
std::lock_guard<std::mutex> lock(this->m); std::lock_guard<std::mutex> lock(this->m);
while (!listImigrants.empty()) while (!listImigrants.empty())
{ {
//std::cout << "On reçoit dans l'île : " << listImigrants.size() << std::endl;
eoPop<bEOT> base_offspring = std::move(listImigrants.front()); eoPop<bEOT> base_offspring = std::move(listImigrants.front());
// Convert objects from base to our objects type // Convert objects from base to our objects type
@ -149,8 +148,12 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::receive(void)
offspring.push_back(std::move(convertFromBase(indi))); offspring.push_back(std::move(convertFromBase(indi)));
// Evaluate objects to integrate // Evaluate objects to integrate
// We first invalidate the individuals in order to explicitly force the evaluation
for(auto& indi : offspring) for(auto& indi : offspring)
{
indi.invalidate();
eval(indi); eval(indi);
}
intPolicy(pop, offspring); intPolicy(pop, offspring);
listImigrants.pop(); listImigrants.pop();

1
smp/src/islandModel.cpp
View file

@ -118,7 +118,6 @@ void paradiseo::smp::IslandModel<EOT>::operator()()
thread.join(); thread.join();
running = false; running = false;
std::cout << "hhhhhhh" << listEmigrants.size() << std::endl;
} }
template<class EOT> template<class EOT>