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

4
trunk/paradiseo-peo/src/core/communicable.cpp
View file

@ -80,10 +80,10 @@ COMM_ID getKey (const Communicable * __comm)
}
void Communicable :: lock ()
{
{
sem_wait (& sem_lock);
}
}
void Communicable :: unlock ()
{

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

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

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

@ -39,13 +39,14 @@
#include "topology.h"
class CompleteTopology : public Topology {
class CompleteTopology : public Topology
{
public :
public :
void setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to);
};
};
#endif

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

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

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

@ -39,13 +39,14 @@
#include "topology.h"
class RandomTopology : public Topology {
class RandomTopology : public Topology
{
public :
public :
void setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to);
};
};
#endif

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

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

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

@ -39,9 +39,10 @@
#include "topology.h"
class StarTopology : public Topology {
class StarTopology : public Topology
{
public :
public :
StarTopology ();
@ -51,9 +52,9 @@ public :
void setCenter (Cooperative& __center);
private :
private :
Cooperative* center;
};
};
#endif

4
trunk/paradiseo-peo/src/core/topology.cpp
View file

@ -43,10 +43,10 @@ Topology :: ~ Topology ()
}
void Topology :: add (Cooperative & __mig)
{
{
mig.push_back (& __mig) ;
}
}
Topology :: operator std :: vector <Cooperative *>& ()
{

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 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 );
}

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

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

8
trunk/paradiseo-peo/test/t-MultiStart.cpp
View file

@ -40,12 +40,12 @@
#include <peo>
struct Algorithm
{
{
void operator()(double & _d)
{
_d = _d * _d;
}
};
};
int main (int __argc, char * * __argv)
{
@ -56,7 +56,7 @@ int main (int __argc, char * * __argv)
std::vector < double > v;
if (getNodeRank()==1)
std::cout<<"\n\nBefore :";
for(unsigned i = 0; i< 10; i++)
for (unsigned i = 0; i< 10; i++)
{
v.push_back(i);
if (getNodeRank()==1)
@ -71,7 +71,7 @@ int main (int __argc, char * * __argv)
if (getNodeRank()==1)
{
std::cout<<"\n\nAfter :\n";
for(unsigned i = 0; i< 10; i++)
for (unsigned i = 0; i< 10; i++)
std::cout<<v[i]<<"\n";
}
}

4
trunk/paradiseo-peo/test/t-ParallelEval.cpp
View file

@ -45,7 +45,7 @@ double f (const Indi & _indi)
return (-sum);
}
struct Algorithm
{
{
Algorithm( peoPopEval < Indi > & _eval): eval( _eval ){}
void operator()(eoPop < Indi > & _pop)
{
@ -53,7 +53,7 @@ struct Algorithm
eval(empty_pop, _pop);
}
peoPopEval < Indi > & eval;
};
};
int main (int __argc, char *__argv[])
{

4
trunk/paradiseo-peo/test/t-ParallelTransform.cpp
View file

@ -45,7 +45,7 @@ double f (const Indi & _indi)
return (-sum);
}
struct Algorithm
{
{
Algorithm( eoEvalFunc < Indi > & _eval, eoSelect < Indi > & _select, peoTransform < Indi > & _transform):
loopEval(_eval),
eval(loopEval),
@ -66,7 +66,7 @@ struct Algorithm
eoPopEvalFunc < Indi > & eval;
eoSelectTransform < Indi > selectTransform;
eoBreed < Indi > & breed;
};
};
int main (int __argc, char *__argv[])
{

4
trunk/paradiseo-peo/tutorial/examples/tsp/edge_xover.cpp
View file

@ -63,7 +63,7 @@ void EdgeXover :: build_map (const Route & __par1, const Route & __par2)
}
void EdgeXover :: remove_entry (unsigned __vertex, std :: vector <std :: set <unsigned> > & __map)
{
{
std :: set <unsigned> & neigh = __map [__vertex] ;
@ -72,7 +72,7 @@ void EdgeXover :: remove_entry (unsigned __vertex, std :: vector <std :: set <un
it ++)
__map [* it].erase (__vertex) ;
}
}
void EdgeXover :: add_vertex (unsigned __vertex, Route & __child)
{