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

Addition of the function PSO : Parallel evaluation

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@653 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-10-08 08:21:23 +00:00
commit 50e1f0c0b8
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/paradiseo-peo/src/peoEvalFuncPSO.h
View file

@ -1,4 +1,4 @@
// "peoPSO.h" // "peoEvalFuncPSO.h"
// (c) OPAC Team, October 2007 // (c) OPAC Team, October 2007
@ -11,6 +11,11 @@
#include <eoEvalFunc.h> #include <eoEvalFunc.h>
/** peoEvalFuncPSO: This class
* takes an existing function pointer and converts it into a evaluation
* function class.
*/
#ifdef _MSC_VER #ifdef _MSC_VER
template< class POT, class FitT = POT::Fitness, class FunctionArg = const POT& > template< class POT, class FitT = POT::Fitness, class FunctionArg = const POT& >
#else #else
@ -21,6 +26,7 @@ struct peoEvalFuncPSO: public eoEvalFunc<POT> {
peoEvalFuncPSO( FitT (* _eval)( FunctionArg ) ) peoEvalFuncPSO( FitT (* _eval)( FunctionArg ) )
: eoEvalFunc<POT>(), evalFunc( _eval ) {}; : eoEvalFunc<POT>(), evalFunc( _eval ) {};
//Applies the evaluation function to a PEO
virtual void operator() ( POT & _peo ) virtual void operator() ( POT & _peo )
{ {
_peo.fitness((*evalFunc)( _peo )); _peo.fitness((*evalFunc)( _peo ));

7
trunk/paradiseo-peo/src/peoPSO.h
View file

@ -24,16 +24,19 @@ template < class POT > class peoPSO : public Runner {
public: public:
// Constructor for the Particle Swarm Optimization
peoPSO( peoPSO(
eoContinue< POT >& __cont, eoContinue< POT >& __cont,
peoPopEval< POT >& __pop_eval, peoPopEval< POT >& __pop_eval,
eoVelocity < POT > &_velocity, eoVelocity < POT > &_velocity,
eoFlight < POT > &_flight); eoFlight < POT > &_flight);
// Particle Swarm Optimization function - a side effect of the fact that the class is derived from the Runner class
// thus requiring the existence of a run function, the algorithm being executed on a distinct thread.
void run(); void run();
// Function operator for specifying the population to be associated with the algorithm.
void operator()( eoPop< POT >& __pop ); void operator()( eoPop< POT >& __pop );
private: private: