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

New style for PEO

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@789 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-11-16 11:34:20 +00:00
commit 9c87b3b0c0
132 changed files with 3781 additions and 3396 deletions
Download patch file Download diff file Expand all files Collapse all files

59
trunk/paradiseo-peo/src/peoPSOVelocity.h
View file

@ -3,7 +3,7 @@
* (c) OPAC Team, October 2007
*
* Clive Canape
*
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
@ -29,7 +29,7 @@
* knowledge of the CeCILL license and that you accept its terms.
*
* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
* Contact: paradiseo-help@lists.gforge.inria.fr
* Contact: paradiseo-help@lists.gforge.inria.fr
* Contact: clive.canape@inria.fr
*/
@ -48,33 +48,34 @@
template <class POT>
class peoPSOVelocity : public eoReplacement<POT>
{
public:
typedef typename POT::ParticleVelocityType VelocityType;
peoPSOVelocity( const double & _c3,
eoVelocity < POT > &_velocity):
c3 (_c3),
velocity (_velocity){}
{
public:
void operator()(eoPop<POT>& _dest, eoPop<POT>& _source)
{
VelocityType newVelocity,r3;
r3 = (VelocityType) rng.uniform (1) * c3;
for(unsigned i=0;i<_dest.size();i++)
for(unsigned j=0;j<_dest[i].size();j++)
{
newVelocity= _dest[i].velocities[j] + r3 * (_source[0].bestPositions[j] - _dest[i][j]);
_dest[i].velocities[j]=newVelocity;
}
}
protected:
const double & c3;
eoVelocity < POT > & velocity;
};
typedef typename POT::ParticleVelocityType VelocityType;
peoPSOVelocity( const double & _c3,
eoVelocity < POT > &_velocity):
c3 (_c3),
velocity (_velocity)
{}
void operator()(eoPop<POT>& _dest, eoPop<POT>& _source)
{
VelocityType newVelocity,r3;
r3 = (VelocityType) rng.uniform (1) * c3;
for (unsigned i=0;i<_dest.size();i++)
for (unsigned j=0;j<_dest[i].size();j++)
{
newVelocity= _dest[i].velocities[j] + r3 * (_source[0].bestPositions[j] - _dest[i][j]);
_dest[i].velocities[j]=newVelocity;
}
}
protected:
const double & c3;
eoVelocity < POT > & velocity;
};
#endif