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

CLeaned up the comments in files related to Sharing (added t-eoSharing in test)

Browse source
This commit is contained in:
evomarc 2004-08-28 16:26:03 +00:00
commit 57881e56c4
2 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
eo/src/eoSharing.h
View file

@ -24,7 +24,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef eoSharing_h #ifndef eoSharing_h
#define eoPerf2Worth_h #define eoSharing_h
#include <eoPerf2Worth.h> #include <eoPerf2Worth.h>
#include <utils/eoDistance.h> #include <utils/eoDistance.h>
@ -33,8 +33,7 @@
* Goldberg and Richardson's basic sharing * Goldberg and Richardson's basic sharing
*/ */
// First a helper class /** A helper class for Sharing - to hold distances */
// helper class to hold distances
class dMatrix : public std::vector<double> class dMatrix : public std::vector<double>
{ {
public: public:
@ -71,7 +70,11 @@
}; };
// template <class EOT, class Dist = eoQuadDistance<EOT> > /** Sharing is a perf2worth class that implements
* Goldberg and Richardson's basic sharing
* see eoSharingSelect for how to use it
* and test/t-eoSharing.cpp for a sample use of both
*/
template <class EOT> template <class EOT>
class eoSharing : public eoPerf2Worth<EOT> class eoSharing : public eoPerf2Worth<EOT>
{ {
@ -107,28 +110,13 @@ class eoSharing : public eoPerf2Worth<EOT>
} }
} }
// cout << "Matrice des similarités\n";
// for (i=0; i<pSize; i++)
// {
// for (j=0; j<pSize; j++)
// {
// cout << distMatrix(i,j) << " ";
// }
// cout << "\n";
// }
// cout << endl;
// cout << "Les similarités cumulées\n";
// compute the cumulated similarities
for (i=0; i<pSize; i++) for (i=0; i<pSize; i++)
{ {
double sum=0.0; double sum=0.0;
for (j=0; j<pSize; j++) for (j=0; j<pSize; j++)
sum += distMatrix(i,j); sum += distMatrix(i,j);
sim[i] = sum; sim[i] = sum;
// cout << sim[i] << " ";
} }
// cout << endl;
// now set the worthes values // now set the worthes values
for (i = 0; i < _pop.size(); ++i) for (i = 0; i < _pop.size(); ++i)

10
eo/src/eoSharingSelect.h
View file

@ -31,10 +31,12 @@
#include <eoSelectFromWorth.h> #include <eoSelectFromWorth.h>
#include <eoSharing.h> #include <eoSharing.h>
/** eoRankingSelect: select an individual by roulette wheel on its rank /** eoSharingSelect: select an individual by roulette wheel
* is an eoRouletteWorthSelect, i.e. a selector using a std::vector of worthes * on its SHARED fitness. It is an eoRouletteWorthSelect,
* rather than the raw fitness (see eoSelectFromWorth.h) * i.e. a selector using a std::vector of worthes
* uses an internal eoRanking object which is an eoPerf2Worth<EOT, double> * rather than the raw fitness (see eoSelectFromWorth.h)
* It uses an internal eoSharing object which is
* an eoPerf2Worth<EOT, double>
*/ */
template <class EOT> template <class EOT>