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

6
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);
}
sem_wait (& sem_lock);
}
void Communicable :: unlock ()
{

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

@ -1,4 +1,4 @@
/*
/*
* <complete_topo.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
@ -38,16 +38,19 @@
#include "complete_topo.h"
void CompleteTopology :: setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to) {
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to)
{
__from.clear () ;
__to.clear () ;
for (unsigned i = 0; i < mig.size (); i ++) {
if (mig [i] != __mig) {
__from.push_back (mig [i]);
__to.push_back (mig [i]);
}
for (unsigned i = 0; i < mig.size (); i ++)
{
if (mig [i] != __mig)
{
__from.push_back (mig [i]);
__to.push_back (mig [i]);
}
}
}

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

@ -1,4 +1,4 @@
/*
/*
* <complete_topo.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
@ -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);
};
void setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to);
};
#endif

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

@ -1,4 +1,4 @@
/*
/*
* <random_topo.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
@ -40,16 +40,19 @@
#include <utils/eoRNG.h>
void RandomTopology :: setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to) {
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to)
{
__from.clear () ;
__to.clear () ;
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]);
}
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]);
}
}
}

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

@ -1,4 +1,4 @@
/*
/*
* <random_topo.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
@ -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);
};
void setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to);
};
#endif

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

@ -1,4 +1,4 @@
/*
/*
* <star_topo.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
@ -40,30 +40,36 @@
StarTopology :: StarTopology () : center( NULL ) {}
void StarTopology :: setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to) {
std :: vector <Cooperative *> & __from,
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) {
__from.push_back (mig [i]);
__to.push_back (mig [i]);
}
for (unsigned i = 0; i < mig.size (); i ++)
{
if (mig [i] != center)
{
__from.push_back (mig [i]);
__to.push_back (mig [i]);
}
}
}
else
{
__from.push_back (center);
__to.push_back (center);
}
}
else {
__from.push_back (center);
__to.push_back (center);
}
}
void StarTopology :: setCenter (Cooperative& __center) {
void StarTopology :: setCenter (Cooperative& __center)
{
center = &__center;
}

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

@ -1,4 +1,4 @@
/*
/*
* <star_topo.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
@ -39,21 +39,22 @@
#include "topology.h"
class StarTopology : public Topology {
class StarTopology : public Topology
{
public :
public :
StarTopology ();
StarTopology ();
void setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to);
void setNeighbors (Cooperative * __mig,
std :: vector <Cooperative *> & __from,
std :: vector <Cooperative *> & __to);
void setCenter (Cooperative& __center);
void setCenter (Cooperative& __center);
private :
private :
Cooperative* center;
};
Cooperative* center;
};
#endif

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

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