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

new style peo

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1021 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-02-29 14:08:59 +00:00
commit edb6d65a7b
34 changed files with 407 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/paradiseo-peo/src/core/complete_topo.cpp
View file

@ -39,13 +39,16 @@
void CompleteTopology :: setNeighbors (Cooperative * __mig, void CompleteTopology :: setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from, std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to) { std :: vector <Cooperative *> & __to)
{
__from.clear () ; __from.clear () ;
__to.clear () ; __to.clear () ;
for (unsigned i = 0; i < mig.size (); i ++) { for (unsigned i = 0; i < mig.size (); i ++)
if (mig [i] != __mig) { {
if (mig [i] != __mig)
{
__from.push_back (mig [i]); __from.push_back (mig [i]);
__to.push_back (mig [i]); __to.push_back (mig [i]);
} }

3
trunk/paradiseo-peo/src/core/complete_topo.h
View file

@ -39,7 +39,8 @@
#include "topology.h" #include "topology.h"
class CompleteTopology : public Topology { class CompleteTopology : public Topology
{
public : public :

9
trunk/paradiseo-peo/src/core/random_topo.cpp
View file

@ -41,13 +41,16 @@
void RandomTopology :: setNeighbors (Cooperative * __mig, void RandomTopology :: setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from, std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to) { std :: vector <Cooperative *> & __to)
{
__from.clear () ; __from.clear () ;
__to.clear () ; __to.clear () ;
for (unsigned i = 0; i < mig.size (); i ++) { for (unsigned i = 0; i < mig.size (); i ++)
if (mig [i] != __mig && rng.uniform() < 0.5 ) { {
if (mig [i] != __mig && rng.uniform() < 0.5 )
{
__from.push_back (mig [i]); __from.push_back (mig [i]);
__to.push_back (mig [i]); __to.push_back (mig [i]);
} }

3
trunk/paradiseo-peo/src/core/random_topo.h
View file

@ -39,7 +39,8 @@
#include "topology.h" #include "topology.h"
class RandomTopology : public Topology { class RandomTopology : public Topology
{
public : public :

18
trunk/paradiseo-peo/src/core/star_topo.cpp
View file

@ -41,29 +41,35 @@ StarTopology :: StarTopology () : center( NULL ) {}
void StarTopology :: setNeighbors (Cooperative * __mig, void StarTopology :: setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from, std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to) { std :: vector <Cooperative *> & __to)
{
assert( center != NULL ); assert( center != NULL );
__from.clear () ; __from.clear () ;
__to.clear () ; __to.clear () ;
if ( __mig == center ) { if ( __mig == center )
{
for (unsigned i = 0; i < mig.size (); i ++) { for (unsigned i = 0; i < mig.size (); i ++)
if (mig [i] != center) { {
if (mig [i] != center)
{
__from.push_back (mig [i]); __from.push_back (mig [i]);
__to.push_back (mig [i]); __to.push_back (mig [i]);
} }
} }
} }
else { else
{
__from.push_back (center); __from.push_back (center);
__to.push_back (center); __to.push_back (center);
} }
} }
void StarTopology :: setCenter (Cooperative& __center) { void StarTopology :: setCenter (Cooperative& __center)
{
center = &__center; center = &__center;
} }

3
trunk/paradiseo-peo/src/core/star_topo.h
View file

@ -39,7 +39,8 @@
#include "topology.h" #include "topology.h"
class StarTopology : public Topology { class StarTopology : public Topology
{
public : public :

6
trunk/paradiseo-peo/src/rmc/mpi/synchron.h
View file

@ -65,7 +65,11 @@ struct SyncCompare
std::vector< SyncEntry >::const_iterator itA = syncA.begin(); std::vector< SyncEntry >::const_iterator itA = syncA.begin();
std::vector< SyncEntry >::const_iterator itB = syncB.begin(); std::vector< SyncEntry >::const_iterator itB = syncB.begin();
while ( itA != syncA.end() && (*itA).runner == (*itB).runner ) { itA++; itB++; } while ( itA != syncA.end() && (*itA).runner == (*itB).runner )
{
itA++;
itB++;
}
return ( (itA == syncA.end()) ) ? false : ( (*itA).runner < (*itB).runner ); return ( (itA == syncA.end()) ) ? false : ( (*itA).runner < (*itB).runner );
} }

6
trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp
View file

@ -63,7 +63,8 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover; eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(0.01); eoUniformMutation<Indi> mutation(0.01);
peoTransform<Indi> transform(crossover,0.8,mutation,0.3); peoTransform<Indi> transform(crossover,0.8,mutation,0.3);
/*p*/eoPop < Indi > pop; /*p*/
eoPop < Indi > pop;
pop.append (10, random); pop.append (10, random);
eoPlusReplacement<Indi> replace; eoPlusReplacement<Indi> replace;
eoRandomSelect<Indi> mig_select_one; eoRandomSelect<Indi> mig_select_one;
@ -90,7 +91,8 @@ int main (int __argc, char *__argv[])
eoSegmentCrossover<Indi> crossover2; eoSegmentCrossover<Indi> crossover2;
eoUniformMutation<Indi> mutation2(0.01); eoUniformMutation<Indi> mutation2(0.01);
peoTransform<Indi> transform2(crossover2,0.8,mutation2,0.3); peoTransform<Indi> transform2(crossover2,0.8,mutation2,0.3);
/*p*/eoPop < Indi > pop2; /*p*/
eoPop < Indi > pop2;
pop2.append (10, random2); pop2.append (10, random2);
eoPlusReplacement<Indi> replace2; eoPlusReplacement<Indi> replace2;
eoRandomSelect<Indi> mig_select_one2; eoRandomSelect<Indi> mig_select_one2;