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

added eoExtendedvelocity (+doc + test) that takes both the local best and the global of a PSO topology into account. Also updated the doc tags for the other topologies and velocities

Browse source
This commit is contained in:
tlegrand 2008-04-18 08:50:22 +00:00
commit 78a798d169
7 changed files with 110 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eo/src/eoLinearTopology.h
View file

@ -162,17 +162,19 @@ public:
return (neighborhoods[theGoodNhbd].best());
}
/*
/*
* Return the global best of the topology
*/
virtual POT & globalBest(const eoPop<POT>& _pop)
*/
virtual POT & globalBest()
{
unsigned howManyNeighborhood=_pop.size()/ neighborhoodSize;
POT gBest,tmp;
unsigned indGlobalBest=0;
unsigned indGlobalBest=0;
if(neighborhoods.size()==1)
return neighborhoods[0].best();
gBest=neighborhoods[0].best();
for(unsigned i=1;i<howManyNeighborhood;i++)
for(unsigned i=1;i<neighborhoods.size();i++)
{
tmp=neighborhoods[i].best();
if(gBest.best() < tmp.best())