update with new crodwing dist

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@348 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-21 14:30:51 +00:00
commit 93b87adc3a

View file

@ -42,7 +42,7 @@ public:
* @param _maxGen number of generations before stopping * @param _maxGen number of generations before stopping
* @param _eval evaluation function * @param _eval evaluation function
* @param _op variation operator * @param _op variation operator
*/ */
moeoNSGAII (unsigned _maxGen, eoEvalFunc < MOEOT > & _eval, eoGenOp < MOEOT > & _op) : moeoNSGAII (unsigned _maxGen, eoEvalFunc < MOEOT > & _eval, eoGenOp < MOEOT > & _op) :
defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select(2), defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select(2),
replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed)
@ -54,7 +54,7 @@ public:
* @param _maxGen number of generations before stopping * @param _maxGen number of generations before stopping
* @param _eval evaluation function * @param _eval evaluation function
* @param _op variation operator * @param _op variation operator
*/ */
moeoNSGAII (unsigned _maxGen, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _op) : moeoNSGAII (unsigned _maxGen, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _op) :
defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select(2), defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select(2),
replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed)
@ -64,11 +64,11 @@ public:
/** /**
* Ctor with a crossover, a mutation and their corresponding rates. * Ctor with a crossover, a mutation and their corresponding rates.
* @param _maxGen number of generations before stopping * @param _maxGen number of generations before stopping
* @param _eval evaluation function * @param _eval evaluation function
* @param _crossover crossover * @param _crossover crossover
* @param _pCross crossover probability * @param _pCross crossover probability
* @param _mutation mutation * @param _mutation mutation
* @param _pMut mutation probability * @param _pMut mutation probability
*/ */
moeoNSGAII (unsigned _maxGen, eoEvalFunc < MOEOT > & _eval, eoQuadOp < MOEOT > & _crossover, double _pCross, eoMonOp < MOEOT > & _mutation, double _pMut) : moeoNSGAII (unsigned _maxGen, eoEvalFunc < MOEOT > & _eval, eoQuadOp < MOEOT > & _crossover, double _pCross, eoMonOp < MOEOT > & _mutation, double _pMut) :
defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select (2), defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select (2),
@ -78,11 +78,11 @@ public:
/** /**
* Ctor with a continuator (instead of _maxGen) and a eoGenOp. * Ctor with a continuator (instead of _maxGen) and a eoGenOp.
* @param _continuator stopping criteria * @param _continuator stopping criteria
* @param _eval evaluation function * @param _eval evaluation function
* @param _op variation operator * @param _op variation operator
*/ */
moeoNSGAII (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoGenOp < MOEOT > & _op) : moeoNSGAII (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoGenOp < MOEOT > & _op) :
continuator(_continuator), popEval(_eval), select(2), continuator(_continuator), popEval(_eval), select(2),
replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed)
@ -94,7 +94,7 @@ public:
* @param _continuator stopping criteria * @param _continuator stopping criteria
* @param _eval evaluation function * @param _eval evaluation function
* @param _op variation operator * @param _op variation operator
*/ */
moeoNSGAII (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _op) : moeoNSGAII (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _op) :
continuator(_continuator), popEval(_eval), select(2), continuator(_continuator), popEval(_eval), select(2),
replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed)
@ -137,7 +137,7 @@ protected:
/** fitness assignment used in NSGA-II */ /** fitness assignment used in NSGA-II */
moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment; moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment;
/** diversity assignment used in NSGA-II */ /** diversity assignment used in NSGA-II */
moeoCrowdingDistanceDiversityAssignment < MOEOT > diversityAssignment; moeoFrontByFrontCrowdingDistanceDiversityAssignment < MOEOT > diversityAssignment;
/** elitist replacement */ /** elitist replacement */
moeoElitistReplacement < MOEOT > replace; moeoElitistReplacement < MOEOT > replace;
/** an object for genetic operators (used as default) */ /** an object for genetic operators (used as default) */