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

Add homogeneous test. Pop is not created by the island anymore and has to me given to the island.

Browse source
This commit is contained in:
quemy 2012-11-29 22:21:29 +01:00
commit c90fdc579f
5 changed files with 147 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
smp/src/island.h
View file

@ -34,8 +34,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <vector>
#include <utility>
#include <atomic>
#include <type_traits>
#include <eoEvalFunc.h>
#include <eoSelect.h>
#include <eoAlgo.h>
#include <eoPop.h>
#include <eo>
#include <abstractIsland.h>
#include <islandModel.h>
#include <migPolicy.h>
@ -68,7 +73,7 @@ public:
* @param args Parameters to construct the algorithm.
*/
template<class... Args>
Island(unsigned _popSize, eoInit<EOT>& _chromInit, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args);
Island(eoPop<EOT>& pop, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args);
/**
* Start the island.
@ -118,7 +123,7 @@ protected:
virtual void receive(void);
eoEvalFunc<EOT>& eval;
eoPop<EOT> pop;
eoPop<EOT>& pop;
EOAlgo<EOT> algo;
std::queue<eoPop<EOT>> listImigrants;
IntPolicy<EOT>& intPolicy;