From c95c38201c50eb90d01e606ecd0c265f0bee9ad7 Mon Sep 17 00:00:00 2001 From: liefooga Date: Thu, 26 Jun 2008 14:08:34 +0000 Subject: [PATCH] bug corrected on some Ctors git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1217 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-moeo/src/algo/moeoNSGA.h | 165 ++++++++++++++--------- 1 file changed, 98 insertions(+), 67 deletions(-) diff --git a/trunk/paradiseo-moeo/src/algo/moeoNSGA.h b/trunk/paradiseo-moeo/src/algo/moeoNSGA.h index 5c8d1fd28..8ca918ecf 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoNSGA.h +++ b/trunk/paradiseo-moeo/src/algo/moeoNSGA.h @@ -53,45 +53,19 @@ #include /** - * NSGA (Non-dominated Sorting Genetic Algorithm) as described in: + * NSGA (Non-dominated Sorting Genetic Algorithm). * N. Srinivas, K. Deb, "Multiobjective Optimization Using Nondominated Sorting in Genetic Algorithms". * Evolutionary Computation, Vol. 2(3), No 2, pp. 221-248 (1994). * This class builds the NSGA algorithm only by using the fine-grained components of the ParadisEO-MOEO framework. */ template < class MOEOT > class moeoNSGA: public moeoEA < MOEOT > - { - public: - - /** - * Simple ctor with a eoGenOp. - * @param _maxGen number of generations before stopping - * @param _eval evaluation function - * @param _op variation operator - * @param _nicheSize niche size - */ - moeoNSGA (unsigned int _maxGen, eoEvalFunc < MOEOT > & _eval, eoGenOp < MOEOT > & _op, double _nicheSize = 0.5) : - defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select(2), - diversityAssignment(_nicheSize), replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) - {} - - - /** - * Simple ctor with a eoTransform. - * @param _maxGen number of generations before stopping - * @param _eval evaluation function - * @param _op variation operator - * @param _nicheSize niche size - */ - moeoNSGA (unsigned int _maxGen, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _op, double _nicheSize = 0.5) : - defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select(2), - diversityAssignment(_nicheSize), replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) - {} - +{ +public: /** * Ctor with a crossover, a mutation and their corresponding rates. - * @param _maxGen number of generations before stopping + * @param _maxGen maximum number of generations before stopping * @param _eval evaluation function * @param _crossover crossover * @param _pCross crossover probability @@ -100,85 +74,142 @@ class moeoNSGA: public moeoEA < MOEOT > * @param _nicheSize niche size */ moeoNSGA (unsigned int _maxGen, eoEvalFunc < MOEOT > & _eval, eoQuadOp < MOEOT > & _crossover, double _pCross, eoMonOp < MOEOT > & _mutation, double _pMut, double _nicheSize = 0.5) : - defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), popEval(_eval), select (2), - diversityAssignment(_nicheSize), replace (fitnessAssignment, diversityAssignment), - defaultSGAGenOp(_crossover, _pCross, _mutation, _pMut), genBreed (select, defaultSGAGenOp), breed (genBreed) + defaultGenContinuator(_maxGen), continuator(defaultGenContinuator), eval(_eval), defaultPopEval(_eval), popEval(defaultPopEval), select (2), selectMany(select,0.0), selectTransform(defaultSelect, defaultTransform), defaultSGAGenOp(_crossover, _pCross, _mutation, _pMut), genBreed (select, defaultSGAGenOp), breed (genBreed), diversityAssignment(_nicheSize), replace (fitnessAssignment, diversityAssignment) {} /** - * Ctor with a continuator (instead of _maxGen) and a eoGenOp. + * Ctor with a eoContinue and a eoGenOp. * @param _continuator stopping criteria * @param _eval evaluation function - * @param _op variation operator + * @param _op variation operators * @param _nicheSize niche size */ moeoNSGA (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoGenOp < MOEOT > & _op, double _nicheSize = 0.5) : - continuator(_continuator), popEval(_eval), select(2), - diversityAssignment(_nicheSize), replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) + defaultGenContinuator(0), continuator(_continuator), eval(_eval), defaultPopEval(_eval), popEval(defaultPopEval), select(2), + selectMany(select,0.0), selectTransform(defaultSelect, defaultTransform), defaultSGAGenOp(defaultQuadOp, 1.0, defaultMonOp, 1.0), genBreed(select, _op), breed(genBreed), diversityAssignment(_nicheSize), replace (fitnessAssignment, diversityAssignment) {} /** - * Ctor with a continuator (instead of _maxGen) and a eoTransform. + * Ctor with a eoContinue, a eoPopEval and a eoGenOp. * @param _continuator stopping criteria - * @param _eval evaluation function - * @param _op variation operator + * @param _popEval population evaluation function + * @param _op variation operators * @param _nicheSize niche size */ - moeoNSGA (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _op, double _nicheSize = 0.5) : - continuator(_continuator), popEval(_eval), select(2), - diversityAssignment(_nicheSize), replace(fitnessAssignment, diversityAssignment), genBreed(select, _op), breed(genBreed) + moeoNSGA (eoContinue < MOEOT > & _continuator, eoPopEvalFunc < MOEOT > & _popEval, eoGenOp < MOEOT > & _op, double _nicheSize = 0.5) : + defaultGenContinuator(0), continuator(_continuator), eval(defaultEval), defaultPopEval(eval), popEval(_popEval), select(2), + selectMany(select,0.0), selectTransform(defaultSelect, defaultTransform), defaultSGAGenOp(defaultQuadOp, 1.0, defaultMonOp, 1.0), genBreed(select, _op), breed(genBreed), diversityAssignment(_nicheSize), replace (fitnessAssignment, diversityAssignment) {} /** - * Apply a few generation of evolution to the population _pop until the stopping criteria is verified. + * Ctor with a eoContinue and a eoTransform. + * @param _continuator stopping criteria + * @param _eval evaluation function + * @param _transform variation operator + * @param _nicheSize niche size + */ + moeoNSGA (eoContinue < MOEOT > & _continuator, eoEvalFunc < MOEOT > & _eval, eoTransform < MOEOT > & _transform, double _nicheSize = 0.5) : + defaultGenContinuator(0), continuator(_continuator), eval(_eval), defaultPopEval(_eval), popEval(defaultPopEval), + select(2), selectMany(select, 1.0), selectTransform(selectMany, _transform), defaultSGAGenOp(defaultQuadOp, 0.0, defaultMonOp, 0.0), genBreed(select, defaultSGAGenOp), breed(selectTransform), diversityAssignment(_nicheSize), replace(fitnessAssignment, diversityAssignment) + {} + + + /** + * Ctor with a eoContinue, a eoPopEval and a eoTransform. + * @param _continuator stopping criteria + * @param _popEval population evaluation function + * @param _transform variation operator + * @param _nicheSize niche size + */ + moeoNSGA (eoContinue < MOEOT > & _continuator, eoPopEvalFunc < MOEOT > & _popEval, eoTransform < MOEOT > & _transform, double _nicheSize = 0.5) : + defaultGenContinuator(0), continuator(_continuator), eval(defaultEval), defaultPopEval(eval), popEval(_popEval), + select(2), selectMany(select, 1.0), selectTransform(selectMany, _transform), defaultSGAGenOp(defaultQuadOp, 0.0, defaultMonOp, 0.0), genBreed(select, defaultSGAGenOp), breed(selectTransform), diversityAssignment(_nicheSize), replace(fitnessAssignment, diversityAssignment) + {} + + + /** + * Apply the algorithm to the population _pop until the stopping criteria is satified. * @param _pop the population */ virtual void operator () (eoPop < MOEOT > &_pop) { - eoPop < MOEOT > offspring, empty_pop; - popEval (empty_pop, _pop); // a first eval of _pop - // evaluate fitness and diversity - fitnessAssignment(_pop); - diversityAssignment(_pop); - do + eoPop < MOEOT > offspring, empty_pop; + popEval (empty_pop, _pop); // a first eval of _pop + // evaluate fitness and diversity + fitnessAssignment(_pop); + diversityAssignment(_pop); + do { - // generate offspring, worths are recalculated if necessary - breed (_pop, offspring); - // eval of offspring - popEval (_pop, offspring); - // after replace, the new pop is in _pop. Worths are recalculated if necessary - replace (_pop, offspring); + // generate offspring, worths are recalculated if necessary + breed (_pop, offspring); + // eval of offspring + popEval (_pop, offspring); + // after replace, the new pop is in _pop. Worths are recalculated if necessary + replace (_pop, offspring); } - while (continuator (_pop)); + while (continuator (_pop)); } - protected: +protected: /** a continuator based on the number of generations (used as default) */ eoGenContinue < MOEOT > defaultGenContinuator; /** stopping criteria */ eoContinue < MOEOT > & continuator; + /** default eval */ + class DummyEval : public eoEvalFunc < MOEOT > + { + public: + void operator()(MOEOT &) {} + } + defaultEval; + /** evaluation function */ + eoEvalFunc < MOEOT > & eval; + /** default popEval */ + eoPopLoopEval < MOEOT > defaultPopEval; /** evaluation function used to evaluate the whole population */ - eoPopLoopEval < MOEOT > popEval; + eoPopEvalFunc < MOEOT > & popEval; + /** default select */ + class DummySelect : public eoSelect < MOEOT > + { + public : + void operator()(const eoPop&, eoPop&) {} + } + defaultSelect; /** binary tournament selection */ moeoDetTournamentSelect < MOEOT > select; + /** default select many */ + eoSelectMany < MOEOT > selectMany; + /** select transform */ + eoSelectTransform < MOEOT > selectTransform; + /** a default crossover */ + eoQuadCloneOp < MOEOT > defaultQuadOp; + /** a default mutation */ + eoMonCloneOp < MOEOT > defaultMonOp; + /** an object for genetic operators (used as default) */ + eoSGAGenOp < MOEOT > defaultSGAGenOp; + /** default transform */ + class DummyTransform : public eoTransform < MOEOT > + { + public : + void operator()(eoPop&) {} + } + defaultTransform; + /** general breeder */ + eoGeneralBreeder < MOEOT > genBreed; + /** breeder */ + eoBreed < MOEOT > & breed; /** fitness assignment used in NSGA-II */ moeoFastNonDominatedSortingFitnessAssignment < MOEOT > fitnessAssignment; /** diversity assignment used in NSGA-II */ moeoFrontByFrontSharingDiversityAssignment < MOEOT > diversityAssignment; /** elitist replacement */ moeoElitistReplacement < MOEOT > replace; - /** an object for genetic operators (used as default) */ - eoSGAGenOp < MOEOT > defaultSGAGenOp; - /** general breeder */ - eoGeneralBreeder < MOEOT > genBreed; - /** breeder */ - eoBreed < MOEOT > & breed; - }; +}; -#endif /*MOEONSGAII_H_*/ +#endif /*MOEONSGA_H_*/