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

Reaname peoParaSGATransform.h to peoTransform.h

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@847 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-12-13 14:32:12 +00:00
commit 67de54844e
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/paradiseo-peo/src/peo.h
View file

@ -327,7 +327,7 @@
#include "peoWrapper.h" #include "peoWrapper.h"
/* <------- components for parallel algorithms -------> */ /* <------- components for parallel algorithms -------> */
#include "peoParaSGATransform.h" #include "peoTransform.h"
#include "peoEvalFunc.h" #include "peoEvalFunc.h"
#include "peoPopEval.h" #include "peoPopEval.h"

30
trunk/paradiseo-peo/src/peoParaSGATransform.h → trunk/paradiseo-peo/src/peoTransform.h
View file

@ -1,5 +1,5 @@
/* /*
* <peoParaSGATransform.h> * <peoTransform.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007 * (C) OPAC Team, LIFL, 2002-2007
* *
@ -34,8 +34,8 @@
* *
*/ */
#ifndef __peoParaSGATransform_h #ifndef __peoTransform_h
#define __peoParaSGATransform_h #define __peoTransform_h
#include "core/thread.h" #include "core/thread.h"
#include "core/messaging.h" #include "core/messaging.h"
@ -46,12 +46,12 @@
extern int getNodeRank(); extern int getNodeRank();
template< class EOT > class peoParaSGATransform : public Service, public eoTransform< EOT > template< class EOT > class peoTransform : public Service, public eoTransform< EOT >
{ {
public: public:
peoParaSGATransform( peoTransform(
eoQuadOp< EOT >& __cross, eoQuadOp< EOT >& __cross,
double __cross_rate, double __cross_rate,
@ -91,7 +91,7 @@ private:
unsigned num_term; unsigned num_term;
}; };
template< class EOT > peoParaSGATransform< EOT > :: peoParaSGATransform( template< class EOT > peoTransform< EOT > :: peoTransform(
eoQuadOp< EOT >& __cross, eoQuadOp< EOT >& __cross,
double __cross_rate, double __cross_rate,
@ -102,7 +102,7 @@ template< class EOT > peoParaSGATransform< EOT > :: peoParaSGATransform(
{} {}
template< class EOT > void peoParaSGATransform< EOT > :: packData() template< class EOT > void peoTransform< EOT > :: packData()
{ {
pack( idx ); pack( idx );
@ -111,7 +111,7 @@ template< class EOT > void peoParaSGATransform< EOT > :: packData()
} }
template< class EOT > void peoParaSGATransform< EOT > :: unpackData() template< class EOT > void peoTransform< EOT > :: unpackData()
{ {
unpack( idx ); unpack( idx );
@ -120,7 +120,7 @@ template< class EOT > void peoParaSGATransform< EOT > :: unpackData()
} }
template< class EOT > void peoParaSGATransform< EOT > :: execute() template< class EOT > void peoTransform< EOT > :: execute()
{ {
if ( rng.uniform() < cross_rate ) cross( mother, father ); if ( rng.uniform() < cross_rate ) cross( mother, father );
@ -130,7 +130,7 @@ template< class EOT > void peoParaSGATransform< EOT > :: execute()
} }
template< class EOT > void peoParaSGATransform< EOT > :: packResult() template< class EOT > void peoTransform< EOT > :: packResult()
{ {
pack( idx ); pack( idx );
@ -139,7 +139,7 @@ template< class EOT > void peoParaSGATransform< EOT > :: packResult()
} }
template< class EOT > void peoParaSGATransform< EOT > :: unpackResult() template< class EOT > void peoTransform< EOT > :: unpackResult()
{ {
unsigned sidx; unsigned sidx;
@ -159,10 +159,10 @@ template< class EOT > void peoParaSGATransform< EOT > :: unpackResult()
} }
template< class EOT > void peoParaSGATransform< EOT > :: operator()( eoPop < EOT >& __pop ) template< class EOT > void peoTransform< EOT > :: operator()( eoPop < EOT >& __pop )
{ {
printDebugMessage( "peoParaSGATransform: performing the parallel transformation step." ); printDebugMessage( "peoTransform: performing the parallel transformation step." );
pop = &__pop; pop = &__pop;
idx = 0; idx = 0;
num_term = 0; num_term = 0;
@ -171,11 +171,11 @@ template< class EOT > void peoParaSGATransform< EOT > :: operator()( eoPop < EOT
} }
template< class EOT > void peoParaSGATransform< EOT > :: notifySendingData() template< class EOT > void peoTransform< EOT > :: notifySendingData()
{} {}
template< class EOT > void peoParaSGATransform< EOT > :: notifySendingAllResourceRequests() template< class EOT > void peoTransform< EOT > :: notifySendingAllResourceRequests()
{ {
getOwner()->setPassive(); getOwner()->setPassive();

2
trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp
View file

@ -41,7 +41,7 @@ int main( int __argc, char** __argv )
eoSegmentCrossover<Indi> crossover; eoSegmentCrossover<Indi> crossover;
eoUniformMutation<Indi> mutation(EPSILON); eoUniformMutation<Indi> mutation(EPSILON);
peoParaSGATransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE); peoTransform<Indi> transform(crossover,CROSS_RATE,mutation,MUT_RATE);
eoPlusReplacement<Indi> replace; eoPlusReplacement<Indi> replace;
eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace ); eoEasyEA< Indi > eaAlg( checkpoint, eval, select, transform, replace );