diff --git a/trunk/paradiseo-moeo/AUTHORS b/trunk/paradiseo-moeo/AUTHORS index 6ec6becf5..50787a3ef 100644 --- a/trunk/paradiseo-moeo/AUTHORS +++ b/trunk/paradiseo-moeo/AUTHORS @@ -1,3 +1,4 @@ Sébastien Cahon Arnaud Liefooghe Thomas Legrand +Abdelhakim Deneche diff --git a/trunk/paradiseo-moeo/docs/html/annotated.html b/trunk/paradiseo-moeo/docs/html/annotated.html index c8602d797..65dc0e43c 100644 --- a/trunk/paradiseo-moeo/docs/html/annotated.html +++ b/trunk/paradiseo-moeo/docs/html/annotated.html @@ -4,7 +4,7 @@ - +

ParadisEO-MOEO Class List

Here are the classes, structs, unions and interfaces with brief descriptions: - - - - - - - - - - - - + + + + - + + + + + - - + + + + + + @@ -66,8 +66,8 @@
eoAdditiveBinaryEpsilonIndicator< EOFitness >Functor Additive binary epsilon indicator for eoParetoFitness
eoBinaryHypervolumeIndicator< EOFitness >Functor Binary hypervolume indicator for eoParetoFitness
eoBinaryQualityIndicator< EOFitness >Functor Binary quality indicator Binary performance measure to use in the replacement selection process of IBEA (Indicator-Based Evolutionary Algorithm) Of course, EOFitness needs to be an eoParetoFitness object
eoBinaryQualityIndicator< EOFitness >::RangePrivate class to represent the bounds
eoIBEA< EOT, Fitness >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm)
eoIBEAAvgSorting< EOT, FitnessEval >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty using averaged values for each objective Follow the idea presented in the Deb & Gupta paper "Searching for Robust Pareto-Optimal Solutions in Multi-Objective Optimization", 2005 Of course, the fitness of an individual needs to be an eoStochasticParetoFitness object
eoIBEASorting< EOT, Fitness >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) without uncertainty Adapted from the Zitzler and Künzli paper "Indicator-Based Selection in Multiobjective Search" (2004) Of course, Fitness needs to be an eoParetoFitness object
eoIBEAStochSorting< EOT, FitnessEval >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty Adapted from the Basseur and Zitzler paper "Handling Uncertainty in Indicator-Based Multiobjective Optimization" (2006) Of course, the fitness of an individual needs to be an eoStochasticParetoFitness object
eoParetoEuclidDist< EOT, DistType >
eoParetoPhenDist< EOT, DistType >
eoParetoSharing< EOT, worthT >
eoParetoSharing< EOT, worthT >::dMatrix
moeoAdditiveBinaryEpsilonIndicator< EOFitness >Functor Additive binary epsilon indicator for eoParetoFitness
moeoArchive< EOT >An archive is a secondary population that stores non-dominated solutions
moeoArchiveFitnessSavingUpdater< EOT >This class allows to save the fitnesses of solutions contained in an archive into a file at each generation
moeoArchiveUpdater< EOT >This class allows to update the archive at each generation with newly found non-dominated solutions
moeoBinaryHypervolumeIndicator< EOFitness >Functor Binary hypervolume indicator for eoParetoFitness
moeoBinaryMetricSavingUpdater< EOT >This class allows to save the progression of a binary metric comparing the fitness values of the current population (or archive) with the fitness values of the population (or archive) of the generation (n-1) into a file
moeoBinaryQualityIndicator< EOFitness >Functor Binary quality indicator Binary performance measure to use in the replacement selection process of IBEA (Indicator-Based Evolutionary Algorithm) Of course, EOFitness needs to be an eoParetoFitness object
moeoBinaryQualityIndicator< EOFitness >::RangePrivate class to represent the bounds
moeoBM< A1, A2, R >Base class for binary metrics
moeoCombinedMOLS< EOT >This class allows to embed a set of local searches that are sequentially applied, and so working and updating the same archive of non-dominated solutions
moeoContributionMetric< EOT >The contribution metric evaluates the proportion of non-dominated solutions given by a Pareto set relatively to another Pareto set
moeoDisctinctElitistReplacement< EOT, WorthT >Same than moeoElitistReplacement except that distinct individuals are privilegied
moeoElitistReplacement< EOT, WorthT >Keep all the best individuals (almost cut-and-pasted from eoNDPlusReplacement, (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2002)
moeoElitistReplacement< EOT, WorthT >Keep all the best individuals (almost cut-and-pasted from eoNDPlusReplacement, (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2002)
moeoEntropyMetric< EOT >The entropy gives an idea of the diversity of a Pareto set relatively to another Pareto set
moeoHybridMOLS< EOT >This class allows to apply a multi-objective local search to a number of selected individuals contained in the archive at every generation until a stopping criteria is verified
moeoIBEA< EOT, Fitness >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm)
moeoIBEAAvgSorting< EOT, FitnessEval >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty using averaged values for each objective Follow the idea presented in the Deb & Gupta paper "Searching for Robust Pareto-Optimal Solutions in Multi-Objective Optimization", 2005 Of course, the fitness of an individual needs to be an eoStochasticParetoFitness object
moeoIBEASorting< EOT, Fitness >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) without uncertainty Adapted from the Zitzler and Künzli paper "Indicator-Based Selection in Multiobjective Search" (2004) Of course, Fitness needs to be an eoParetoFitness object
moeoIBEAStochSorting< EOT, FitnessEval >Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty Adapted from the Basseur and Zitzler paper "Handling Uncertainty in Indicator-Based Multiobjective Optimization" (2006) Of course, the fitness of an individual needs to be an eoStochasticParetoFitness object
moeoMetricBase class for performance metrics (also called quality indicators)
moeoMOLS< EOT >Abstract class for local searches applied to multi-objective optimization
moeoNDSorting_II< EOT >Fast Elitist Non-Dominant Sorting Genetic Algorithm
moeoNDSorting_II< EOT >::compare_nodes
moeoNDSorting_II< EOT >Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie Note : This is a corrected version of the original eoNDSorting_II class
moeoNDSorting_II< EOT >::compare_nodesA class to compare the nodes
moeoNSGA_II< EOT >
moeoParetoEuclidDist< EOT, DistType >
moeoParetoPhenDist< EOT, DistType >
moeoParetoSharing< EOT, worthT >
moeoParetoSharing< EOT, worthT >::dMatrix
moeoReplacement< EOT, WorthT >Replacement strategy for multi-objective optimization
moeoSelectOneFromPopAndArch< EOT >Elitist selection process that consists in choosing individuals in the archive as well as in the current population
moeoSolutionUM< EOT, R, EOFitness >Base class for unary metrics dedicated to the performance evaluation of a single solution's Pareto fitness
moeoVectorVsSolutionBM< EOT, R, EOFitness >Base class for binary metrics dedicated to the performance comparison between a Pareto set (a vector of Pareto fitnesses) and a single solution's Pareto fitness
moeoVectorVsVectorBM< EOT, R, EOFitness >Base class for binary metrics dedicated to the performance comparison between two Pareto sets (two vectors of Pareto fitnesses)
-
Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classes.html b/trunk/paradiseo-moeo/docs/html/classes.html index 775503a22..6e9003d1c 100644 --- a/trunk/paradiseo-moeo/docs/html/classes.html +++ b/trunk/paradiseo-moeo/docs/html/classes.html @@ -4,7 +4,7 @@ - +
-

ParadisEO-MOEO Class Index

A | B | C | D | E | H | M | N | R | S | U | V

+

ParadisEO-MOEO Class Index

A | B | C | D | E | H | I | M | N | P | R | S | U | V

  A  
-		eoBinaryHypervolumeIndicator   
  N  
-
moeoArchive   eoBinaryQualityIndicator   moeoNDSorting_II   
moeoArchiveFitnessSavingUpdater   eoBinaryQualityIndicator::Range   moeoNDSorting_II::compare_nodes   
moeoArchiveUpdater   eoIBEA   moeoNSGA_II   
  B  
-		eoIBEAAvgSorting   
  R  
-
moeoBinaryMetricSavingUpdater   eoIBEASorting   moeoReplacement   
moeoBM   eoIBEAStochSorting   
  S  
+		moeoElitistReplacement   moeoParetoEuclidDist   
moeoAdditiveBinaryEpsilonIndicator   moeoEntropyMetric   moeoParetoPhenDist   
moeoArchive   
  H  
+		moeoParetoSharing   
moeoArchiveFitnessSavingUpdater   moeoHybridMOLS   moeoParetoSharing::dMatrix   
moeoArchiveUpdater   
  I  
+
  R  
+
  B  
+		moeoIBEA   moeoReplacement   
moeoBinaryHypervolumeIndicator   moeoIBEAAvgSorting   
  S  
+
moeoBinaryMetricSavingUpdater   moeoIBEASorting   moeoSelectOneFromPopAndArch   
moeoBinaryQualityIndicator   moeoIBEAStochSorting   moeoSolutionUM   
moeoBinaryQualityIndicator::Range   
  M  
+		moeoSolutionVsSolutionBM   
moeoBM   moeoMetric   
  U  
  C  
-		eoParetoEuclidDist   moeoSelectOneFromPopAndArch   
moeoCombinedMOLS   eoParetoPhenDist   moeoSolutionUM   
moeoContributionMetric   eoParetoSharing   moeoSolutionVsSolutionBM   
  D  
-		eoParetoSharing::dMatrix   
  U  
-
moeoDisctinctElitistReplacement   
  H  
-		moeoUM   
  E  
-		moeoHybridMOLS   
  V  
-
moeoElitistReplacement   
  M  
-		moeoVectorUM   
moeoEntropyMetric   moeoMetric   moeoVectorVsSolutionBM   
eoAdditiveBinaryEpsilonIndicator   moeoMOLS   moeoVectorVsVectorBM   

A | B | C | D | E | H | M | N | R | S | U | V

-

Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +moeoMOLS   moeoUM   moeoCombinedMOLS   
  N  
+
  V  
+moeoContributionMetric   moeoNDSorting_II   moeoVectorUM   
  D  
+moeoNDSorting_II::compare_nodes   moeoVectorVsSolutionBM   moeoDisctinctElitistReplacement   moeoNSGA_II   moeoVectorVsVectorBM   
  E  
+
  P  
+

A | B | C | D | E | H | I | M | N | P | R | S | U | V

+

Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoArchive-members.html b/trunk/paradiseo-moeo/docs/html/classmoeoArchive-members.html index 0f4e8a982..416e07db6 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoArchive-members.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoArchive-members.html @@ -4,7 +4,7 @@ - +

moeoArchive< EOT > Member List

This is the complete list of members for moeoArchive< EOT >, including all inherited members.

- - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
append(unsigned _newPopSize, eoInit< EOT > &_chromInit)eoPop< EOT >
best_element() const eoPop< EOT >
className() const eoPop< EOT > [virtual]
contains(const EOFitness &_fit) const moeoArchive< EOT > [inline]
dominates(const EOFitness &_fit) const moeoArchive< EOT > [inline]
append(unsigned _newPopSize, eoInit< EOT > &_chromInit)eoPop< EOT >
best_element() consteoPop< EOT >
className() consteoPop< EOT > [virtual]
contains(const EOFitness &_fit) constmoeoArchive< EOT > [inline]
dominates(const EOFitness &_fit) constmoeoArchive< EOT > [inline]
EOFitness typedefmoeoArchive< EOT >
eoPop()eoPop< EOT >
eoPop(unsigned _popSize, eoInit< EOT > &_chromInit)eoPop< EOT >
eoPop(std::istream &_is)eoPop< EOT >
Fitness typedefeoPop< EOT >
fitness_traits typedefeoPop< EOT >
getPerf2Worth()eoPop< EOT >
invalidate()eoPop< EOT > [virtual]
it_best_element()eoPop< EOT >
it_worse_element()eoPop< EOT >
nth_element(int nth)eoPop< EOT >
nth_element(int which, std::vector< const EOT * > &result) const eoPop< EOT >
nth_element_fitness(int which) const eoPop< EOT >
printOn(std::ostream &_os) const eoPop< EOT > [virtual]
readFrom(std::istream &_is)eoPop< EOT > [virtual]
scale()eoPop< EOT >
setPerf2Worth(eoPerf2Worth< EOT > &_p2w)eoPop< EOT >
setPerf2Worth(eoPerf2Worth< EOT > *_p2w)eoPop< EOT >
shuffle(void)eoPop< EOT >
shuffle(std::vector< const EOT * > &result) const eoPop< EOT >
sort(void)eoPop< EOT >
sort(std::vector< const EOT * > &result) const eoPop< EOT >
sort()eoPop< EOT >
sortedPrintOn(std::ostream &_os) const eoPop< EOT > [virtual]
swap(eoPop< EOT > &other)eoPop< EOT >
swap(eoPop< EOT > &other)eoPop< EOT >
eoPop()eoPop< EOT >
eoPop(unsigned _popSize, eoInit< EOT > &_chromInit)eoPop< EOT >
eoPop(std::istream &_is)eoPop< EOT >
Fitness typedefeoPop< EOT >
fitness_traits typedefeoPop< EOT >
getPerf2Worth()eoPop< EOT >
invalidate()eoPop< EOT > [virtual]
it_best_element()eoPop< EOT >
it_worse_element()eoPop< EOT >
nth_element(int nth)eoPop< EOT >
nth_element(int which, std::vector< const EOT * > &result) consteoPop< EOT >
nth_element_fitness(int which) consteoPop< EOT >
printOn(std::ostream &_os) consteoPop< EOT > [virtual]
readFrom(std::istream &_is)eoPop< EOT > [virtual]
scale()eoPop< EOT >
setPerf2Worth(eoPerf2Worth< EOT > &_p2w)eoPop< EOT >
setPerf2Worth(eoPerf2Worth< EOT > *_p2w)eoPop< EOT >
shuffle(void)eoPop< EOT >
shuffle(std::vector< const EOT * > &result) consteoPop< EOT >
sort(void)eoPop< EOT >
sort(std::vector< const EOT * > &result) consteoPop< EOT >
sort()eoPop< EOT >
sortedPrintOn(std::ostream &_os) consteoPop< EOT > [virtual]
swap(eoPop< EOT > &other)eoPop< EOT >
swap(eoPop< EOT > &other)eoPop< EOT >
update(const EOT &_eo)moeoArchive< EOT > [inline]
update(const eoPop< EOT > &_pop)moeoArchive< EOT > [inline]
worse_element() const eoPop< EOT >
~eoObject()eoObject [virtual]
~eoPersistent()eoPersistent [virtual]
~eoPop()eoPop< EOT > [virtual]
~eoPrintable()eoPrintable [virtual]

Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  + worse_element() consteoPop< EOT > + ~eoObject()eoObject [virtual] + ~eoPersistent()eoPersistent [virtual] + ~eoPop()eoPop< EOT > [virtual] + ~eoPrintable()eoPrintable [virtual] +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoArchive.html b/trunk/paradiseo-moeo/docs/html/classmoeoArchive.html index 8acd720b2..086c3b81e 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoArchive.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoArchive.html @@ -4,7 +4,7 @@ - +
+

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater-members.html b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater-members.html index dde59cab5..ef776c99b 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater-members.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater-members.html @@ -4,7 +4,7 @@ - +

moeoArchiveFitnessSavingUpdater< EOT > Member List

This is the complete list of members for moeoArchiveFitnessSavingUpdater< EOT >, including all inherited members.

- + - + - + - - - -
archmoeoArchiveFitnessSavingUpdater< EOT > [private]
className(void) const eoUpdater [virtual]
className(void) consteoUpdater [virtual]
countermoeoArchiveFitnessSavingUpdater< EOT > [private]
filenamemoeoArchiveFitnessSavingUpdater< EOT > [private]
functor_category()eoF< void > [static]
functor_category()eoF< void > [static]
idmoeoArchiveFitnessSavingUpdater< EOT > [private]
lastCall()eoUpdater [virtual]
lastCall()eoUpdater [virtual]
moeoArchiveFitnessSavingUpdater(moeoArchive< EOT > &_arch, const std::string &_filename="Res/Arch", int _id=-1)moeoArchiveFitnessSavingUpdater< EOT > [inline]
operator()()moeoArchiveFitnessSavingUpdater< EOT > [inline, virtual]
result_type typedefeoF< void >
~eoF()eoF< void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  + result_type typedefeoF< void > + ~eoF()eoF< void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater.html b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater.html index d972dcbc2..2b2432e73 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveFitnessSavingUpdater.html @@ -4,7 +4,7 @@ - +
+

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater-members.html b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater-members.html index c8ce368cc..96f5a79b1 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater-members.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater-members.html @@ -4,7 +4,7 @@ - +

moeoArchiveUpdater< EOT > Member List

This is the complete list of members for moeoArchiveUpdater< EOT >, including all inherited members.

- - - + + + - - - -
archmoeoArchiveUpdater< EOT > [private]
className(void) const eoUpdater [virtual]
functor_category()eoF< void > [static]
lastCall()eoUpdater [virtual]
className(void) consteoUpdater [virtual]
functor_category()eoF< void > [static]
lastCall()eoUpdater [virtual]
moeoArchiveUpdater(moeoArchive< EOT > &_arch, const eoPop< EOT > &_pop)moeoArchiveUpdater< EOT > [inline]
operator()()moeoArchiveUpdater< EOT > [inline, virtual]
popmoeoArchiveUpdater< EOT > [private]
result_type typedefeoF< void >
~eoF()eoF< void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  + result_type typedefeoF< void > + ~eoF()eoF< void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater.html b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater.html index 7acae7d88..218b2ffa6 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoArchiveUpdater.html @@ -4,7 +4,7 @@ - +
+

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoBM.html b/trunk/paradiseo-moeo/docs/html/classmoeoBM.html index 97e782ef1..e4542d04a 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoBM.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoBM.html @@ -4,7 +4,7 @@ - +
+

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement-members.html b/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement-members.html index c1115f8c1..2709e535a 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement-members.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement-members.html @@ -4,7 +4,7 @@ - +

moeoElitistReplacement< EOT, WorthT > Member List

This is the complete list of members for moeoElitistReplacement< EOT, WorthT >, including all inherited members.

- - - -
functor_category()eoBF< eoPop< EOT > &, eoPop< EOT > &, void > [static]
moeoElitistReplacement(eoPerf2Worth< EOT, WorthT > &_perf2worth)moeoElitistReplacement< EOT, WorthT > [inline]
operator()(eoPop< EOT > &_parents, eoPop< EOT > &_offspring)moeoElitistReplacement< EOT, WorthT > [inline, virtual]
perf2worthmoeoElitistReplacement< EOT, WorthT > [private]
~eoBF()eoBF< eoPop< EOT > &, eoPop< EOT > &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement.html b/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement.html index f203290b1..3426d034a 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoElitistReplacement.html @@ -4,7 +4,7 @@ - +
-

moeoElitistReplacement< EOT, WorthT > Class Template Reference

Keep all the best individuals (almost cut-and-pasted from eoNDPlusReplacement, (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2002). +

moeoElitistReplacement< EOT, WorthT > Class Template Reference

Keep all the best individuals (almost cut-and-pasted from eoNDPlusReplacement, (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2002). More...

#include <moeoReplacement.h> @@ -37,22 +37,22 @@

moeoReplacement< EOT, WorthT > -eoReplacement< EOT > -eoBF< eoPop< EOT > &, eoPop< EOT > &, void > -eoFunctorBase +eoReplacement< EOT > +eoBF< eoPop< EOT > &, eoPop< EOT > &, void > +eoFunctorBase List of all members. - + - + +eoPerf2Worth< EOT, WorthT > & 

Public Member Functions

 moeoElitistReplacement (eoPerf2Worth< EOT, WorthT > &_perf2worth)
 moeoElitistReplacement (eoPerf2Worth< EOT, WorthT > &_perf2worth)
 constructor
void operator() (eoPop< EOT > &_parents, eoPop< EOT > &_offspring)
void operator() (eoPop< EOT > &_parents, eoPop< EOT > &_offspring)
 replacement - result in _parents

Private Attributes

-eoPerf2Worth< EOT, WorthT > & perf2worth
perf2worth
 the functor object to transform raw fitnesses into fitness for selection
@@ -60,38 +60,28 @@

template<class EOT, class WorthT = double>
class moeoElitistReplacement< EOT, WorthT >

-Keep all the best individuals (almost cut-and-pasted from eoNDPlusReplacement, (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2002). +Keep all the best individuals (almost cut-and-pasted from eoNDPlusReplacement, (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2002).

Definition at line 35 of file moeoReplacement.h.

Constructor & Destructor Documentation

-

- - - - -
- + +
+
+
+template<class EOT, class WorthT = double>
+
- - - - - - - - - + + + + + +
-template<class EOT, class WorthT = double>
moeoElitistReplacement< EOT, WorthT >::moeoElitistReplacement ( eoPerf2Worth< EOT, WorthT > &  _perf2worth  )  [inline]moeoElitistReplacement< EOT, WorthT >::moeoElitistReplacement (eoPerf2Worth< EOT, WorthT > &  _perf2worth  )  [inline]
-
- - - - - -
-   - + +

constructor @@ -103,46 +93,36 @@ constructor

-Definition at line 43 of file moeoReplacement.h.

+Definition at line 43 of file moeoReplacement.h. + +

Member Function Documentation

-

- - - - -
- + +
+
+
+template<class EOT, class WorthT = double>
+
- + + + + - - - - + + + + - - - - - - - - - + + +
-template<class EOT, class WorthT = double> void moeoElitistReplacement< EOT, WorthT >::operator() (eoPop< EOT > &  _parents,
void moeoElitistReplacement< EOT, WorthT >::operator() ( eoPop< EOT > &  _parents, eoPop< EOT > &  _offspring 
eoPop< EOT > &  _offspring
)  [inline, virtual]) [inline, virtual]
-
- - - - - -
-   - + +

replacement - result in _parents @@ -155,15 +135,15 @@ replacement - result in _parents

-Implements eoBF< eoPop< EOT > &, eoPop< EOT > &, void >. +Implements eoBF< eoPop< EOT > &, eoPop< EOT > &, void >.

-Definition at line 54 of file moeoReplacement.h.

+Definition at line 54 of file moeoReplacement.h. + +

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric-members.html b/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric-members.html index c3fe4b3aa..1fa6541da 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric-members.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric-members.html @@ -4,7 +4,7 @@ - +

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric.png b/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric.png index ba78014c7..bcc3bdbfd 100644 Binary files a/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric.png and b/trunk/paradiseo-moeo/docs/html/classmoeoEntropyMetric.png differ diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS-members.html b/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS-members.html index 44753d0e1..bf2af2d7b 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS-members.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS-members.html @@ -4,7 +4,7 @@ - +

moeoHybridMOLS< EOT > Member List

This is the complete list of members for moeoHybridMOLS< EOT >, including all inherited members.

- + - - + + - + - - -
archmoeoHybridMOLS< EOT > [private]
className(void) const eoUpdater [virtual]
className(void) consteoUpdater [virtual]
eoHybridMOLS(eoContinue< EOT > &_term, eoSelect< EOT > &_select, moeoMOLS< EOT > &_mols, moeoArchive< EOT > &_arch)moeoHybridMOLS< EOT > [inline]
functor_category()eoF< void > [static]
lastCall()eoUpdater [virtual]
functor_category()eoF< void > [static]
lastCall()eoUpdater [virtual]
molsmoeoHybridMOLS< EOT > [private]
operator()()moeoHybridMOLS< EOT > [inline, virtual]
result_type typedefeoF< void >
result_type typedefeoF< void >
selectmoeoHybridMOLS< EOT > [private]
termmoeoHybridMOLS< EOT > [private]
~eoF()eoF< void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  + ~eoF()eoF< void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS.html b/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS.html index c04763be9..6d6016f44 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoHybridMOLS.html @@ -4,7 +4,7 @@ - +

The documentation for this class was generated from the following file: -
Generated on Fri Dec 22 09:37:12 2006 for ParadisEO-MOEO by  +
Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
+doxygen 1.5.1
diff --git a/trunk/paradiseo-moeo/docs/html/classmoeoSolutionUM.html b/trunk/paradiseo-moeo/docs/html/classmoeoSolutionUM.html index 5722adcff..d2b0aa84f 100644 --- a/trunk/paradiseo-moeo/docs/html/classmoeoSolutionUM.html +++ b/trunk/paradiseo-moeo/docs/html/classmoeoSolutionUM.html @@ -4,7 +4,7 @@ - +

- e -

+
  • EOFitness +: moeoBinaryMetricSavingUpdater< EOT > +, moeoContributionMetric< EOT > +, moeoArchive< EOT > +, moeoEntropyMetric< EOT > +
  • eoHybridMOLS() +: moeoHybridMOLS< EOT > +
  • epsilonValue() +: moeoAdditiveBinaryEpsilonIndicator< EOFitness > +
  • euc_dist +: moeoParetoSharing< EOT, worthT > +
  • euclidianDistance() +: moeoEntropyMetric< EOT > +
  • eval +: moeoCombinedMOLS< EOT > +, moeoNSGA_II< EOT > +

    - f -

    +: moeoBinaryMetricSavingUpdater< EOT > +, moeoArchiveFitnessSavingUpdater< EOT > +
  • firstGen +: moeoBinaryMetricSavingUpdater< EOT > +
  • fitnesses() +: moeoIBEASorting< EOT, Fitness > +, moeoIBEAAvgSorting< EOT, FitnessEval > +, moeoIBEAStochSorting< EOT, FitnessEval > +

    - g -

    +: moeoNSGA_II< EOT > +

    - h -

    +: moeoEntropyMetric< EOT > +
  • hypervolumeIndicatorValue() +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • hypervolumeIndicatorValueMax() +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • hypervolumeIndicatorValueMin() +: moeoBinaryHypervolumeIndicator< EOFitness > +

    - i -

    +: moeoIBEA< EOT, Fitness > +
  • id +: moeoArchiveFitnessSavingUpdater< EOT > +

    - k -

    +: moeoIBEASorting< EOT, Fitness > +, moeoIBEAAvgSorting< EOT, FitnessEval > +

    - l -

    +: moeoNSGA_II< EOT > +

    - m -

    +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • maximum() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • metric +: moeoBinaryMetricSavingUpdater< EOT > +
  • min +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • minimum() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • moeoAdditiveBinaryEpsilonIndicator() +: moeoAdditiveBinaryEpsilonIndicator< EOFitness > +
  • moeoArchiveFitnessSavingUpdater() +: moeoArchiveFitnessSavingUpdater< EOT > +
  • moeoArchiveUpdater() +: moeoArchiveUpdater< EOT > +
  • moeoBinaryHypervolumeIndicator() +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • moeoBinaryMetricSavingUpdater() +: moeoBinaryMetricSavingUpdater< EOT > +
  • moeoBinaryQualityIndicator() +: moeoBinaryQualityIndicator< EOFitness > +
  • moeoCombinedMOLS() +: moeoCombinedMOLS< EOT > +
  • moeoDisctinctElitistReplacement() +: moeoDisctinctElitistReplacement< EOT, WorthT > +
  • moeoElitistReplacement() +: moeoElitistReplacement< EOT, WorthT > +
  • moeoIBEA() +: moeoIBEA< EOT, Fitness > +
  • moeoIBEAAvgSorting() +: moeoIBEAAvgSorting< EOT, FitnessEval > +
  • moeoIBEASorting() +: moeoIBEASorting< EOT, Fitness > +
  • moeoIBEAStochSorting() +: moeoIBEAStochSorting< EOT, FitnessEval > +
  • moeoNDSorting_II() +: moeoNDSorting_II< EOT > +
  • moeoNSGA_II() +: moeoNSGA_II< EOT > +
  • moeoParetoSharing() +: moeoParetoSharing< EOT, worthT > +
  • moeoSelectOneFromPopAndArch() +: moeoSelectOneFromPopAndArch< EOT > +
  • mols +: moeoHybridMOLS< EOT > +

    - n -

    +: moeoNDSorting_II< EOT > +
  • nicheSize +: moeoParetoSharing< EOT, worthT > +
  • normalize() +: moeoEntropyMetric< EOT > +

    - o -

    +: moeoBinaryMetricSavingUpdater< EOT > +
  • operator() +: moeoParetoSharing< EOT, worthT > +
  • operator()() +: moeoParetoEuclidDist< EOT, DistType > +, moeoBinaryHypervolumeIndicator< EOFitness > +, moeoAdditiveBinaryEpsilonIndicator< EOFitness > +, moeoSelectOneFromPopAndArch< EOT > +, moeoDisctinctElitistReplacement< EOT, WorthT > +, moeoElitistReplacement< EOT, WorthT > +, moeoNSGA_II< EOT > +, moeoNDSorting_II< EOT >::compare_nodes +, moeoEntropyMetric< EOT > +, moeoCombinedMOLS< EOT > +, moeoArchiveUpdater< EOT > +, moeoArchiveFitnessSavingUpdater< EOT > +, moeoBinaryMetricSavingUpdater< EOT > +, moeoContributionMetric< EOT > +, moeoHybridMOLS< EOT > +

    - p -

    +: moeoElitistReplacement< EOT, WorthT > +, moeoDisctinctElitistReplacement< EOT, WorthT > +
  • pop +: moeoArchiveUpdater< EOT > +, moeoBinaryMetricSavingUpdater< EOT > +
  • popEval +: moeoNSGA_II< EOT > +
  • popSelectOne +: moeoSelectOneFromPopAndArch< EOT > +
  • prenormalize() +: moeoEntropyMetric< EOT > +
  • printOn() +: moeoParetoSharing< EOT, worthT >::dMatrix +

    - r -

    +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • randomSelect +: moeoSelectOneFromPopAndArch< EOT > +
  • Range() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • range() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • ratioFromPop +: moeoSelectOneFromPopAndArch< EOT > +
  • removeDominated() +: moeoEntropyMetric< EOT > +
  • replace +: moeoNSGA_II< EOT > +
  • rho +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • rSize +: moeoParetoSharing< EOT, worthT >::dMatrix +

    - s -

    +: moeoHybridMOLS< EOT > +
  • selectOne +: moeoNSGA_II< EOT > +
  • setBounds() +: moeoBinaryQualityIndicator< EOFitness > +, moeoIBEAStochSorting< EOT, FitnessEval > +, moeoIBEAAvgSorting< EOT, FitnessEval > +, moeoIBEASorting< EOT, Fitness > +
  • setup() +: moeoSelectOneFromPopAndArch< EOT > +
  • sh() +: moeoParetoSharing< EOT, worthT > +
  • sorting +: moeoNSGA_II< EOT > +

    - t -

    +: moeoHybridMOLS< EOT > +
  • traits +: moeoBinaryHypervolumeIndicator< EOFitness > +, moeoAdditiveBinaryEpsilonIndicator< EOFitness > +, moeoBinaryQualityIndicator< EOFitness > +

    - u -

    +: moeoArchive< EOT > +

    - v -

    +: moeoEntropyMetric< EOT > +
  • vect_min_val +: moeoEntropyMetric< EOT > +

    - z -

    -
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +: moeoIBEAStochSorting< EOT, FitnessEval > + +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/functions_func.html b/trunk/paradiseo-moeo/docs/html/functions_func.html index efab9e850..b93c2b304 100644 --- a/trunk/paradiseo-moeo/docs/html/functions_func.html +++ b/trunk/paradiseo-moeo/docs/html/functions_func.html @@ -4,7 +4,7 @@ - +

    - c -

    +: moeoIBEA< EOT, Fitness > +
  • card_C() +: moeoContributionMetric< EOT > +
  • card_N() +: moeoContributionMetric< EOT > +
  • card_W() +: moeoContributionMetric< EOT > +
  • computeUnion() +: moeoEntropyMetric< EOT > +
  • contains() +: moeoArchive< EOT > +
  • createNewPop() +: moeoDisctinctElitistReplacement< EOT, WorthT > +

    - d -

    +: moeoParetoSharing< EOT, worthT >::dMatrix +
  • dominates() +: moeoArchive< EOT > +

    - e -

    +
  • eoHybridMOLS() +: moeoHybridMOLS< EOT > +
  • epsilonValue() +: moeoAdditiveBinaryEpsilonIndicator< EOFitness > +
  • euclidianDistance() +: moeoEntropyMetric< EOT > +

    - f -

    +: moeoIBEASorting< EOT, Fitness > +, moeoIBEAAvgSorting< EOT, FitnessEval > +, moeoIBEAStochSorting< EOT, FitnessEval > +

    - h -

    +: moeoEntropyMetric< EOT > +
  • hypervolumeIndicatorValue() +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • hypervolumeIndicatorValueMax() +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • hypervolumeIndicatorValueMin() +: moeoBinaryHypervolumeIndicator< EOFitness > +

    - m -

    +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • minimum() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • moeoAdditiveBinaryEpsilonIndicator() +: moeoAdditiveBinaryEpsilonIndicator< EOFitness > +
  • moeoArchiveFitnessSavingUpdater() +: moeoArchiveFitnessSavingUpdater< EOT > +
  • moeoArchiveUpdater() +: moeoArchiveUpdater< EOT > +
  • moeoBinaryHypervolumeIndicator() +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • moeoBinaryMetricSavingUpdater() +: moeoBinaryMetricSavingUpdater< EOT > +
  • moeoBinaryQualityIndicator() +: moeoBinaryQualityIndicator< EOFitness > +
  • moeoCombinedMOLS() +: moeoCombinedMOLS< EOT > +
  • moeoDisctinctElitistReplacement() +: moeoDisctinctElitistReplacement< EOT, WorthT > +
  • moeoElitistReplacement() +: moeoElitistReplacement< EOT, WorthT > +
  • moeoIBEA() +: moeoIBEA< EOT, Fitness > +
  • moeoIBEAAvgSorting() +: moeoIBEAAvgSorting< EOT, FitnessEval > +
  • moeoIBEASorting() +: moeoIBEASorting< EOT, Fitness > +
  • moeoIBEAStochSorting() +: moeoIBEAStochSorting< EOT, FitnessEval > +
  • moeoNDSorting_II() +: moeoNDSorting_II< EOT > +
  • moeoNSGA_II() +: moeoNSGA_II< EOT > +
  • moeoParetoSharing() +: moeoParetoSharing< EOT, worthT > +
  • moeoSelectOneFromPopAndArch() +: moeoSelectOneFromPopAndArch< EOT > +

    - n -

    +: moeoNDSorting_II< EOT > +
  • normalize() +: moeoEntropyMetric< EOT > +

    - o -

    +: moeoParetoSharing< EOT, worthT > +
  • operator()() +: moeoNDSorting_II< EOT >::compare_nodes +, moeoParetoEuclidDist< EOT, DistType > +, moeoBinaryHypervolumeIndicator< EOFitness > +, moeoAdditiveBinaryEpsilonIndicator< EOFitness > +, moeoSelectOneFromPopAndArch< EOT > +, moeoDisctinctElitistReplacement< EOT, WorthT > +, moeoElitistReplacement< EOT, WorthT > +, moeoNSGA_II< EOT > +, moeoArchiveFitnessSavingUpdater< EOT > +, moeoHybridMOLS< EOT > +, moeoCombinedMOLS< EOT > +, moeoArchiveUpdater< EOT > +, moeoContributionMetric< EOT > +, moeoEntropyMetric< EOT > +, moeoBinaryMetricSavingUpdater< EOT > +

    - p -

    +: moeoEntropyMetric< EOT > +
  • printOn() +: moeoParetoSharing< EOT, worthT >::dMatrix +

    - r -

    +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • range() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • Range() +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • removeDominated() +: moeoEntropyMetric< EOT > +

    - s -

    +: moeoBinaryQualityIndicator< EOFitness > +, moeoIBEAStochSorting< EOT, FitnessEval > +, moeoIBEAAvgSorting< EOT, FitnessEval > +, moeoIBEASorting< EOT, Fitness > +
  • setup() +: moeoSelectOneFromPopAndArch< EOT > +
  • sh() +: moeoParetoSharing< EOT, worthT > +

    - u -

    +: moeoArchive< EOT > +

    - z -

    -
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +: moeoIBEAStochSorting< EOT, FitnessEval > + +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/functions_type.html b/trunk/paradiseo-moeo/docs/html/functions_type.html index 111cd219f..41615f79c 100644 --- a/trunk/paradiseo-moeo/docs/html/functions_type.html +++ b/trunk/paradiseo-moeo/docs/html/functions_type.html @@ -4,7 +4,7 @@ - +
    +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1     diff --git a/trunk/paradiseo-moeo/docs/html/functions_vars.html b/trunk/paradiseo-moeo/docs/html/functions_vars.html index 36fa02d79..9a572af67 100644 --- a/trunk/paradiseo-moeo/docs/html/functions_vars.html +++ b/trunk/paradiseo-moeo/docs/html/functions_vars.html @@ -4,7 +4,7 @@ - +

    - b -

    +: moeoBinaryQualityIndicator< EOFitness > +
  • breed +: moeoNSGA_II< EOT > +

    - c -

    +: moeoCombinedMOLS< EOT > +
  • continuator +: moeoNSGA_II< EOT > +
  • counter +: moeoBinaryMetricSavingUpdater< EOT > +, moeoArchiveFitnessSavingUpdater< EOT > +

    - d -

    +: moeoParetoSharing< EOT, worthT > +
  • Dmax +: moeoParetoSharing< EOT, worthT > +

    - e -

    +: moeoParetoSharing< EOT, worthT > +
  • eval +: moeoCombinedMOLS< EOT > +, moeoNSGA_II< EOT > +

    - f -

    +: moeoBinaryMetricSavingUpdater< EOT > +, moeoArchiveFitnessSavingUpdater< EOT > +
  • firstGen +: moeoBinaryMetricSavingUpdater< EOT > +

    - g -

    +: moeoNSGA_II< EOT > +

    - i -

    +: moeoIBEA< EOT, Fitness > +
  • id +: moeoArchiveFitnessSavingUpdater< EOT > +

    - k -

    +: moeoIBEASorting< EOT, Fitness > +, moeoIBEAAvgSorting< EOT, FitnessEval > +

    - l -

    +: moeoNSGA_II< EOT > +

    - m -

    +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • metric +: moeoBinaryMetricSavingUpdater< EOT > +
  • min +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • mols +: moeoHybridMOLS< EOT > +

    - n -

    +: moeoParetoSharing< EOT, worthT > +

    - o -

    +: moeoBinaryMetricSavingUpdater< EOT > +

    - p -

    +: moeoElitistReplacement< EOT, WorthT > +, moeoDisctinctElitistReplacement< EOT, WorthT > +
  • pop +: moeoBinaryMetricSavingUpdater< EOT > +, moeoArchiveUpdater< EOT > +
  • popEval +: moeoNSGA_II< EOT > +
  • popSelectOne +: moeoSelectOneFromPopAndArch< EOT > +

    - r -

    +: moeoBinaryQualityIndicator< EOFitness >::Range +
  • randomSelect +: moeoSelectOneFromPopAndArch< EOT > +
  • ratioFromPop +: moeoSelectOneFromPopAndArch< EOT > +
  • replace +: moeoNSGA_II< EOT > +
  • rho +: moeoBinaryHypervolumeIndicator< EOFitness > +
  • rSize +: moeoParetoSharing< EOT, worthT >::dMatrix +

    - s -

    +: moeoHybridMOLS< EOT > +
  • selectOne +: moeoNSGA_II< EOT > +
  • sorting +: moeoNSGA_II< EOT > +

    - t -

    +: moeoHybridMOLS< EOT > +

    - v -

    -
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +: moeoEntropyMetric< EOT > +
  • vect_min_val +: moeoEntropyMetric< EOT > + +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1     diff --git a/trunk/paradiseo-moeo/docs/html/hierarchy.html b/trunk/paradiseo-moeo/docs/html/hierarchy.html index 3aeb96911..c44b723a7 100644 --- a/trunk/paradiseo-moeo/docs/html/hierarchy.html +++ b/trunk/paradiseo-moeo/docs/html/hierarchy.html @@ -4,7 +4,7 @@ - +

    ParadisEO-MOEO Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically:
    • Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1 diff --git a/trunk/paradiseo-moeo/docs/html/installdox b/trunk/paradiseo-moeo/docs/html/installdox index 294677f26..1628445b3 100755 --- a/trunk/paradiseo-moeo/docs/html/installdox +++ b/trunk/paradiseo-moeo/docs/html/installdox @@ -1,6 +1,6 @@ #!/usr/bin/perl -%subst = ( "eo.doxytag", "", "mo.doxytag", ""); +%subst = ( "eo.doxytag", ""); $quiet = 0; if (open(F,"search.cfg")) diff --git a/trunk/paradiseo-moeo/docs/html/main.html b/trunk/paradiseo-moeo/docs/html/main.html index f767f19dd..658dbe127 100644 --- a/trunk/paradiseo-moeo/docs/html/main.html +++ b/trunk/paradiseo-moeo/docs/html/main.html @@ -4,7 +4,7 @@ - +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1 diff --git a/trunk/paradiseo-moeo/docs/html/moeoArchiveUpdater_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoArchiveUpdater_8h-source.html index 4c9c19807..51b540ec2 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoArchiveUpdater_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoArchiveUpdater_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoArchive_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoArchive_8h-source.html index 664965893..b6a04f19a 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoArchive_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoArchive_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoBinaryMetricSavingUpdater_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoBinaryMetricSavingUpdater_8h-source.html index ec45d57e1..ed1f7a34b 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoBinaryMetricSavingUpdater_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoBinaryMetricSavingUpdater_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoCombinedMOLS_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoCombinedMOLS_8h-source.html index 132424b1c..40dd31945 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoCombinedMOLS_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoCombinedMOLS_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoContributionMetric_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoContributionMetric_8h-source.html index f45f707a7..dffee073f 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoContributionMetric_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoContributionMetric_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoEntropyMetric_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoEntropyMetric_8h-source.html index db0276ea8..1e9095ebb 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoEntropyMetric_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoEntropyMetric_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoHybridMOLS_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoHybridMOLS_8h-source.html index 191bbec2d..f6df69e4e 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoHybridMOLS_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoHybridMOLS_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoMOLS_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoMOLS_8h-source.html index 9b0f49dba..9edb7898b 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoMOLS_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoMOLS_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoMetric_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoMetric_8h-source.html index 78522143c..e9610c120 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoMetric_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoMetric_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoReplacement_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoReplacement_8h-source.html index cecd0b292..b8ffd1a81 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoReplacement_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoReplacement_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeoSelectOneFromPopAndArch_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeoSelectOneFromPopAndArch_8h-source.html index 148fe3ca7..670a13066 100644 --- a/trunk/paradiseo-moeo/docs/html/moeoSelectOneFromPopAndArch_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeoSelectOneFromPopAndArch_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/moeo_8h-source.html b/trunk/paradiseo-moeo/docs/html/moeo_8h-source.html index 93f55090a..e822e349a 100644 --- a/trunk/paradiseo-moeo/docs/html/moeo_8h-source.html +++ b/trunk/paradiseo-moeo/docs/html/moeo_8h-source.html @@ -4,7 +4,7 @@ - +
    Generated on Fri Dec 22 09:37:11 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:19:18 2007 for ParadisEO-MOEO by  -doxygen 1.4.6
    +doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/pages.html b/trunk/paradiseo-moeo/docs/html/pages.html index 7b9f41ff6..2d51f632a 100644 --- a/trunk/paradiseo-moeo/docs/html/pages.html +++ b/trunk/paradiseo-moeo/docs/html/pages.html @@ -26,7 +26,7 @@
  • Related webpages -
    Generated on Tue Dec 12 11:16:35 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:18:07 2007 for ParadisEO-MOEO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/html/search.idx b/trunk/paradiseo-moeo/docs/html/search.idx index a3b832f73..2fb41de67 100644 Binary files a/trunk/paradiseo-moeo/docs/html/search.idx and b/trunk/paradiseo-moeo/docs/html/search.idx differ diff --git a/trunk/paradiseo-moeo/docs/html/search.php b/trunk/paradiseo-moeo/docs/html/search.php index d234b105d..8b879c9f2 100644 --- a/trunk/paradiseo-moeo/docs/html/search.php +++ b/trunk/paradiseo-moeo/docs/html/search.php @@ -4,7 +4,7 @@ - +

    Related webpages

    -
    Generated on Tue Dec 12 11:16:35 2006 for ParadisEO-MOEO by  +
    Generated on Mon Jan 15 14:18:07 2007 for ParadisEO-MOEO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-moeo/docs/latex/annotated.tex b/trunk/paradiseo-moeo/docs/latex/annotated.tex index cfda7cf81..bffe79872 100644 --- a/trunk/paradiseo-moeo/docs/latex/annotated.tex +++ b/trunk/paradiseo-moeo/docs/latex/annotated.tex @@ -1,33 +1,33 @@ \section{Paradis\-EO-MOEO Class List} Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList} -\item\contentsline{section}{{\bf eo\-Additive\-Binary\-Epsilon\-Indicator$<$ EOFitness $>$} (Functor Additive binary epsilon indicator for {\bf eo\-Pareto\-Fitness} )}{\pageref{classeoAdditiveBinaryEpsilonIndicator}}{} -\item\contentsline{section}{{\bf eo\-Binary\-Hypervolume\-Indicator$<$ EOFitness $>$} (Functor Binary hypervolume indicator for {\bf eo\-Pareto\-Fitness} )}{\pageref{classeoBinaryHypervolumeIndicator}}{} -\item\contentsline{section}{{\bf eo\-Binary\-Quality\-Indicator$<$ EOFitness $>$} (Functor Binary quality indicator Binary performance measure to use in the replacement selection process of IBEA (Indicator-Based Evolutionary Algorithm) Of course, EOFitness needs to be an {\bf eo\-Pareto\-Fitness} object )}{\pageref{classeoBinaryQualityIndicator}}{} -\item\contentsline{section}{{\bf eo\-Binary\-Quality\-Indicator$<$ EOFitness $>$::Range} (Private class to represent the bounds )}{\pageref{classeoBinaryQualityIndicator_1_1Range}}{} -\item\contentsline{section}{{\bf eo\-IBEA$<$ EOT, Fitness $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) )}{\pageref{classeoIBEA}}{} -\item\contentsline{section}{{\bf eo\-IBEAAvg\-Sorting$<$ EOT, Fitness\-Eval $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty using averaged values for each objective Follow the idea presented in the Deb \& Gupta paper \char`\"{}Searching for Robust Pareto-Optimal Solutions in Multi-Objective Optimization\char`\"{}, 2005 Of course, the fitness of an individual needs to be an eo\-Stochastic\-Pareto\-Fitness object )}{\pageref{classeoIBEAAvgSorting}}{} -\item\contentsline{section}{{\bf eo\-IBEASorting$<$ EOT, Fitness $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) without uncertainty Adapted from the Zitzler and K\~{A}¼nzli paper \char`\"{}Indicator-Based Selection in Multiobjective Search\char`\"{} (2004) Of course, Fitness needs to be an {\bf eo\-Pareto\-Fitness} object )}{\pageref{classeoIBEASorting}}{} -\item\contentsline{section}{{\bf eo\-IBEAStoch\-Sorting$<$ EOT, Fitness\-Eval $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty Adapted from the Basseur and Zitzler paper \char`\"{}Handling Uncertainty in Indicator-Based Multiobjective Optimization\char`\"{} (2006) Of course, the fitness of an individual needs to be an eo\-Stochastic\-Pareto\-Fitness object )}{\pageref{classeoIBEAStochSorting}}{} -\item\contentsline{section}{{\bf eo\-Pareto\-Euclid\-Dist$<$ EOT, Dist\-Type $>$} }{\pageref{classeoParetoEuclidDist}}{} -\item\contentsline{section}{{\bf eo\-Pareto\-Phen\-Dist$<$ EOT, Dist\-Type $>$} }{\pageref{classeoParetoPhenDist}}{} -\item\contentsline{section}{{\bf eo\-Pareto\-Sharing$<$ EOT, worth\-T $>$} }{\pageref{classeoParetoSharing}}{} -\item\contentsline{section}{{\bf eo\-Pareto\-Sharing$<$ EOT, worth\-T $>$::d\-Matrix} }{\pageref{classeoParetoSharing_1_1dMatrix}}{} +\item\contentsline{section}{{\bf moeo\-Additive\-Binary\-Epsilon\-Indicator$<$ EOFitness $>$} (Functor Additive binary epsilon indicator for {\bf eo\-Pareto\-Fitness} )}{\pageref{classmoeoAdditiveBinaryEpsilonIndicator}}{} \item\contentsline{section}{{\bf moeo\-Archive$<$ EOT $>$} (An archive is a secondary population that stores non-dominated solutions )}{\pageref{classmoeoArchive}}{} \item\contentsline{section}{{\bf moeo\-Archive\-Fitness\-Saving\-Updater$<$ EOT $>$} (This class allows to save the fitnesses of solutions contained in an archive into a file at each generation )}{\pageref{classmoeoArchiveFitnessSavingUpdater}}{} \item\contentsline{section}{{\bf moeo\-Archive\-Updater$<$ EOT $>$} (This class allows to update the archive at each generation with newly found non-dominated solutions )}{\pageref{classmoeoArchiveUpdater}}{} +\item\contentsline{section}{{\bf moeo\-Binary\-Hypervolume\-Indicator$<$ EOFitness $>$} (Functor Binary hypervolume indicator for {\bf eo\-Pareto\-Fitness} )}{\pageref{classmoeoBinaryHypervolumeIndicator}}{} \item\contentsline{section}{{\bf moeo\-Binary\-Metric\-Saving\-Updater$<$ EOT $>$} (This class allows to save the progression of a binary metric comparing the fitness values of the current population (or archive) with the fitness values of the population (or archive) of the generation (n-1) into a file )}{\pageref{classmoeoBinaryMetricSavingUpdater}}{} +\item\contentsline{section}{{\bf moeo\-Binary\-Quality\-Indicator$<$ EOFitness $>$} (Functor Binary quality indicator Binary performance measure to use in the replacement selection process of IBEA (Indicator-Based Evolutionary Algorithm) Of course, EOFitness needs to be an {\bf eo\-Pareto\-Fitness} object )}{\pageref{classmoeoBinaryQualityIndicator}}{} +\item\contentsline{section}{{\bf moeo\-Binary\-Quality\-Indicator$<$ EOFitness $>$::Range} (Private class to represent the bounds )}{\pageref{classmoeoBinaryQualityIndicator_1_1Range}}{} \item\contentsline{section}{{\bf moeo\-BM$<$ A1, A2, R $>$} (Base class for binary metrics )}{\pageref{classmoeoBM}}{} \item\contentsline{section}{{\bf moeo\-Combined\-MOLS$<$ EOT $>$} (This class allows to embed a set of local searches that are sequentially applied, and so working and updating the same archive of non-dominated solutions )}{\pageref{classmoeoCombinedMOLS}}{} \item\contentsline{section}{{\bf moeo\-Contribution\-Metric$<$ EOT $>$} (The contribution metric evaluates the proportion of non-dominated solutions given by a Pareto set relatively to another Pareto set )}{\pageref{classmoeoContributionMetric}}{} -\item\contentsline{section}{{\bf moeo\-Disctinct\-Elitist\-Replacement$<$ EOT, Worth\-T $>$} (Same than {\bf moeo\-Elitist\-Replacement}{\rm (p.\,\pageref{classmoeoElitistReplacement})} except that distinct individuals are privilegied )}{\pageref{classmoeoDisctinctElitistReplacement}}{} +\item\contentsline{section}{{\bf moeo\-Disctinct\-Elitist\-Replacement$<$ EOT, Worth\-T $>$} (Same than \doxyref{moeo\-Elitist\-Replacement}{p.}{classmoeoElitistReplacement} except that distinct individuals are privilegied )}{\pageref{classmoeoDisctinctElitistReplacement}}{} \item\contentsline{section}{{\bf moeo\-Elitist\-Replacement$<$ EOT, Worth\-T $>$} (Keep all the best individuals (almost cut-and-pasted from {\bf eo\-NDPlus\-Replacement}, (c) Maarten Keijzer, Marc Schoenauer and Ge\-Neura Team, 2002) )}{\pageref{classmoeoElitistReplacement}}{} \item\contentsline{section}{{\bf moeo\-Entropy\-Metric$<$ EOT $>$} (The entropy gives an idea of the diversity of a Pareto set relatively to another Pareto set )}{\pageref{classmoeoEntropyMetric}}{} \item\contentsline{section}{{\bf moeo\-Hybrid\-MOLS$<$ EOT $>$} (This class allows to apply a multi-objective local search to a number of selected individuals contained in the archive at every generation until a stopping criteria is verified )}{\pageref{classmoeoHybridMOLS}}{} +\item\contentsline{section}{{\bf moeo\-IBEA$<$ EOT, Fitness $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) )}{\pageref{classmoeoIBEA}}{} +\item\contentsline{section}{{\bf moeo\-IBEAAvg\-Sorting$<$ EOT, Fitness\-Eval $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty using averaged values for each objective Follow the idea presented in the Deb \& Gupta paper \char`\"{}Searching for Robust Pareto-Optimal Solutions in Multi-Objective Optimization\char`\"{}, 2005 Of course, the fitness of an individual needs to be an eo\-Stochastic\-Pareto\-Fitness object )}{\pageref{classmoeoIBEAAvgSorting}}{} +\item\contentsline{section}{{\bf moeo\-IBEASorting$<$ EOT, Fitness $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) without uncertainty Adapted from the Zitzler and K\~{A}¼nzli paper \char`\"{}Indicator-Based Selection in Multiobjective Search\char`\"{} (2004) Of course, Fitness needs to be an {\bf eo\-Pareto\-Fitness} object )}{\pageref{classmoeoIBEASorting}}{} +\item\contentsline{section}{{\bf moeo\-IBEAStoch\-Sorting$<$ EOT, Fitness\-Eval $>$} (Functor The sorting phase of IBEA (Indicator-Based Evolutionary Algorithm) under uncertainty Adapted from the Basseur and Zitzler paper \char`\"{}Handling Uncertainty in Indicator-Based Multiobjective Optimization\char`\"{} (2006) Of course, the fitness of an individual needs to be an eo\-Stochastic\-Pareto\-Fitness object )}{\pageref{classmoeoIBEAStochSorting}}{} \item\contentsline{section}{{\bf moeo\-Metric} (Base class for performance metrics (also called quality indicators) )}{\pageref{classmoeoMetric}}{} \item\contentsline{section}{{\bf moeo\-MOLS$<$ EOT $>$} (Abstract class for local searches applied to multi-objective optimization )}{\pageref{classmoeoMOLS}}{} -\item\contentsline{section}{{\bf moeo\-NDSorting\_\-II$<$ EOT $>$} (Fast Elitist Non-Dominant Sorting Genetic Algorithm )}{\pageref{classmoeoNDSorting__II}}{} -\item\contentsline{section}{{\bf moeo\-NDSorting\_\-II$<$ EOT $>$::compare\_\-nodes} }{\pageref{classmoeoNDSorting__II_1_1compare__nodes}}{} +\item\contentsline{section}{{\bf moeo\-NDSorting\_\-II$<$ EOT $>$} (Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie Note : This is a corrected version of the original {\bf eo\-NDSorting\_\-II} class )}{\pageref{classmoeoNDSorting__II}}{} +\item\contentsline{section}{{\bf moeo\-NDSorting\_\-II$<$ EOT $>$::compare\_\-nodes} (A class to compare the nodes )}{\pageref{classmoeoNDSorting__II_1_1compare__nodes}}{} \item\contentsline{section}{{\bf moeo\-NSGA\_\-II$<$ EOT $>$} }{\pageref{classmoeoNSGA__II}}{} +\item\contentsline{section}{{\bf moeo\-Pareto\-Euclid\-Dist$<$ EOT, Dist\-Type $>$} }{\pageref{classmoeoParetoEuclidDist}}{} +\item\contentsline{section}{{\bf moeo\-Pareto\-Phen\-Dist$<$ EOT, Dist\-Type $>$} }{\pageref{classmoeoParetoPhenDist}}{} +\item\contentsline{section}{{\bf moeo\-Pareto\-Sharing$<$ EOT, worth\-T $>$} }{\pageref{classmoeoParetoSharing}}{} +\item\contentsline{section}{{\bf moeo\-Pareto\-Sharing$<$ EOT, worth\-T $>$::d\-Matrix} }{\pageref{classmoeoParetoSharing_1_1dMatrix}}{} \item\contentsline{section}{{\bf moeo\-Replacement$<$ EOT, Worth\-T $>$} (Replacement strategy for multi-objective optimization )}{\pageref{classmoeoReplacement}}{} \item\contentsline{section}{{\bf moeo\-Select\-One\-From\-Pop\-And\-Arch$<$ EOT $>$} (Elitist selection process that consists in choosing individuals in the archive as well as in the current population )}{\pageref{classmoeoSelectOneFromPopAndArch}}{} \item\contentsline{section}{{\bf moeo\-Solution\-UM$<$ EOT, R, EOFitness $>$} (Base class for unary metrics dedicated to the performance evaluation of a single solution's Pareto fitness )}{\pageref{classmoeoSolutionUM}}{} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoArchive.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoArchive.tex index 59e752ada..852b31278 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoArchive.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoArchive.tex @@ -20,9 +20,9 @@ typedef EOT::Fitness {\bf EOFitness}\label{classmoeoArchive_798bc97d8321b1e2c469 \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf dominates} (const {\bf EOFitness} \&\_\-fit) const +bool {\bf dominates} (const {\bf EOFitness} \&\_\-fit) const \begin{CompactList}\small\item\em Returns true if the current archive dominates \_\-fit. \item\end{CompactList}\item -bool {\bf contains} (const {\bf EOFitness} \&\_\-fit) const +bool {\bf contains} (const {\bf EOFitness} \&\_\-fit) const \begin{CompactList}\small\item\em Returns true if the current archive contains \_\-fit. \item\end{CompactList}\item void {\bf update} (const EOT \&\_\-eo) \begin{CompactList}\small\item\em Updates the archive with a given individual \_\-eo. \item\end{CompactList}\item @@ -42,7 +42,7 @@ Definition at line 21 of file moeo\-Archive.h. \subsection{Member Function Documentation} \index{moeoArchive@{moeo\-Archive}!dominates@{dominates}} \index{dominates@{dominates}!moeoArchive@{moeo\-Archive}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moeo\-Archive}$<$ EOT $>$::dominates (const {\bf EOFitness} \& {\em \_\-fit}) const\hspace{0.3cm}{\tt [inline]}}\label{classmoeoArchive_22b298bb0e4f4b02f9d8c5d3385134a2} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moeo\-Archive}$<$ EOT $>$::dominates (const {\bf EOFitness} \& {\em \_\-fit}) const\hspace{0.3cm}{\tt [inline]}}\label{classmoeoArchive_7786c8bfe67fefa19ac31a4ac700df06} Returns true if the current archive dominates \_\-fit. @@ -54,9 +54,11 @@ Returns true if the current archive dominates \_\-fit. \end{Desc} -Definition at line 39 of file moeo\-Archive.h.\index{moeoArchive@{moeo\-Archive}!contains@{contains}} +Definition at line 39 of file moeo\-Archive.h. + +Referenced by moeo\-Archive$<$ EOT $>$::update().\index{moeoArchive@{moeo\-Archive}!contains@{contains}} \index{contains@{contains}!moeoArchive@{moeo\-Archive}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moeo\-Archive}$<$ EOT $>$::contains (const {\bf EOFitness} \& {\em \_\-fit}) const\hspace{0.3cm}{\tt [inline]}}\label{classmoeoArchive_b62d5274da2b12802113858be49a21a4} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moeo\-Archive}$<$ EOT $>$::contains (const {\bf EOFitness} \& {\em \_\-fit}) const\hspace{0.3cm}{\tt [inline]}}\label{classmoeoArchive_71feaf270daa7185e829caef40bbf956} Returns true if the current archive contains \_\-fit. @@ -82,7 +84,11 @@ Updates the archive with a given individual \_\-eo. \end{Desc} -Definition at line 63 of file moeo\-Archive.h.\index{moeoArchive@{moeo\-Archive}!update@{update}} +Definition at line 63 of file moeo\-Archive.h. + +References moeo\-Archive$<$ EOT $>$::dominates(). + +Referenced by moeo\-Archive$<$ EOT $>$::update().\index{moeoArchive@{moeo\-Archive}!update@{update}} \index{update@{update}!moeoArchive@{moeo\-Archive}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moeo\-Archive}$<$ EOT $>$::update (const {\bf eo\-Pop}$<$ EOT $>$ \& {\em \_\-pop})\hspace{0.3cm}{\tt [inline]}}\label{classmoeoArchive_58e891ab400ba352e8b0a341d0bdc107} @@ -98,6 +104,8 @@ Updates the archive with a given population \_\-pop. Definition at line 98 of file moeo\-Archive.h. +References moeo\-Archive$<$ EOT $>$::update(). + The documentation for this class was generated from the following file:\begin{CompactItemize} \item moeo\-Archive.h\end{CompactItemize} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoBM.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoBM.eps index 956ec10a7..d20d0f74a 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoBM.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoBM.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 198.675 +%%BoundingBox: 0 0 500 65.1466 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.51667 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 7.675 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 3 def -/cols 2 def +/rows 5 def +/cols 5 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -178,6 +178,12 @@ boxfont setfont (moeoMetric) cw (eoFunctorBase) cw (eoFunctorBase) cw +(moeoSolutionVsSolutionBM< EOT, R, EOFitness >) cw +(moeoVectorVsSolutionBM< EOT, R, EOFitness >) cw +(moeoVectorVsVectorBM< EOT, R, EOFitness >) cw +(moeoVectorVsVectorBM< EOT, double >) cw +(moeoContributionMetric< EOT >) cw +(moeoEntropyMetric< EOT >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -189,27 +195,53 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moeoBM< A1, A2, R >) 0.5 0 box - (eoBF< A1, A2, R >) 0 1 box - (moeoMetric) 1 1 box - (eoFunctorBase) 0 2 box - (eoFunctorBase) 1 2 box + (moeoBM< A1, A2, R >) 1.5 2 box + (eoBF< A1, A2, R >) 1 3 box + (moeoMetric) 2 3 box + (eoFunctorBase) 1 4 box + (eoFunctorBase) 2 4 box + (moeoSolutionVsSolutionBM< EOT, R, EOFitness >) 0 1 box + (moeoVectorVsSolutionBM< EOT, R, EOFitness >) 1 1 box + (moeoVectorVsVectorBM< EOT, R, EOFitness >) 2 1 box + (moeoVectorVsVectorBM< EOT, double >) 3 1 box + (moeoContributionMetric< EOT >) 2.5 0 box + (moeoEntropyMetric< EOT >) 3.5 0 box % ----- relations ----- solid -0 0.5 0 out +0 1.5 2 out solid -0 1 1 conn +1 2 3 conn solid -1 0 1 in +1 1 3 in solid -0 0 1 out +0 1 3 out solid -1 1 1 in +1 2 3 in solid -0 1 1 out +0 2 3 out solid -1 0 2 in +1 1 4 in solid -1 1 2 in +1 2 4 in +solid +1 1.5 1.25 out +solid +0 3 2 conn +solid +0 0 1.75 in +solid +0 1 1.75 in +solid +0 2 1.75 in +solid +0 3 1.75 in +solid +1 3 0.25 out +solid +2.5 3.5 1 conn +solid +0 2.5 0.75 in +solid +0 3.5 0.75 in diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoBM.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoBM.tex index 78b27745d..ab5408f52 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoBM.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoBM.tex @@ -8,7 +8,7 @@ Base class for binary metrics. Inheritance diagram for moeo\-BM$<$ A1, A2, R $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3cm]{classmoeoBM} +\includegraphics[height=1.8241cm]{classmoeoBM} \end{center} \end{figure} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.eps index 1e393b585..3335421e4 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 74.5156 +%%BoundingBox: 0 0 500 195.312 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 6.71 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.56 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,8 +175,8 @@ boxfont setfont 1 boundaspect scale (moeoContributionMetric< EOT >) cw (moeoVectorVsVectorBM< EOT, double >) cw -(moeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) cw -(eoBF< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) cw +(moeoBM< A1, A2, R >) cw +(eoBF< A1, A2, R >) cw (moeoMetric) cw (eoFunctorBase) cw (eoFunctorBase) cw @@ -193,8 +193,8 @@ boundx scalefactor div boundy scalefactor div scale (moeoContributionMetric< EOT >) 0.5 0 box (moeoVectorVsVectorBM< EOT, double >) 0.5 1 box - (moeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) 0.5 2 box - (eoBF< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) 0 3 box + (moeoBM< A1, A2, R >) 0.5 2 box + (eoBF< A1, A2, R >) 0 3 box (moeoMetric) 1 3 box (eoFunctorBase) 0 4 box (eoFunctorBase) 1 4 box diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.tex index b4dc475fd..06b7da3d8 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoContributionMetric.tex @@ -8,7 +8,7 @@ The contribution metric evaluates the proportion of non-dominated solutions give Inheritance diagram for moeo\-Contribution\-Metric$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2.08644cm]{classmoeoContributionMetric} +\includegraphics[height=5cm]{classmoeoContributionMetric} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoDisctinctElitistReplacement.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoDisctinctElitistReplacement.tex index 228d6461c..68117695d 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoDisctinctElitistReplacement.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoDisctinctElitistReplacement.tex @@ -1,6 +1,6 @@ \section{moeo\-Disctinct\-Elitist\-Replacement$<$ EOT, Worth\-T $>$ Class Template Reference} \label{classmoeoDisctinctElitistReplacement}\index{moeoDisctinctElitistReplacement@{moeoDisctinctElitistReplacement}} -Same than {\bf moeo\-Elitist\-Replacement}{\rm (p.\,\pageref{classmoeoElitistReplacement})} except that distinct individuals are privilegied. +Same than \doxyref{moeo\-Elitist\-Replacement}{p.}{classmoeoElitistReplacement} except that distinct individuals are privilegied. {\tt \#include $<$moeo\-Replacement.h$>$} @@ -34,7 +34,7 @@ void {\bf create\-New\-Pop} ({\bf eo\-Pop}$<$ EOT $>$ \&\_\-pop, unsigned \_\-si \subsection{Detailed Description} \subsubsection*{template$<$class EOT, class Worth\-T = double$>$ class moeo\-Disctinct\-Elitist\-Replacement$<$ EOT, Worth\-T $>$} -Same than {\bf moeo\-Elitist\-Replacement}{\rm (p.\,\pageref{classmoeoElitistReplacement})} except that distinct individuals are privilegied. +Same than \doxyref{moeo\-Elitist\-Replacement}{p.}{classmoeoElitistReplacement} except that distinct individuals are privilegied. @@ -92,6 +92,8 @@ creation of the new population of size \_\-size Definition at line 123 of file moeo\-Replacement.h. +References moeo\-Disctinct\-Elitist\-Replacement$<$ EOT, Worth\-T $>$::perf2worth, and eo\-Pop$<$ EOT $>$::swap(). + Referenced by moeo\-Disctinct\-Elitist\-Replacement$<$ EOT, Worth\-T $>$::operator()(). The documentation for this class was generated from the following file:\begin{CompactItemize} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.eps index 04e578986..62b905032 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 74.5156 +%%BoundingBox: 0 0 500 195.312 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 6.71 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.56 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,8 +175,8 @@ boxfont setfont 1 boundaspect scale (moeoEntropyMetric< EOT >) cw (moeoVectorVsVectorBM< EOT, double >) cw -(moeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) cw -(eoBF< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) cw +(moeoBM< A1, A2, R >) cw +(eoBF< A1, A2, R >) cw (moeoMetric) cw (eoFunctorBase) cw (eoFunctorBase) cw @@ -193,8 +193,8 @@ boundx scalefactor div boundy scalefactor div scale (moeoEntropyMetric< EOT >) 0.5 0 box (moeoVectorVsVectorBM< EOT, double >) 0.5 1 box - (moeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) 0.5 2 box - (eoBF< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) 0 3 box + (moeoBM< A1, A2, R >) 0.5 2 box + (eoBF< A1, A2, R >) 0 3 box (moeoMetric) 1 3 box (eoFunctorBase) 0 4 box (eoFunctorBase) 1 4 box diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.tex index 57f3435ff..33d9fc7b7 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoEntropyMetric.tex @@ -8,7 +8,7 @@ The entropy gives an idea of the diversity of a Pareto set relatively to another Inheritance diagram for moeo\-Entropy\-Metric$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2.08644cm]{classmoeoEntropyMetric} +\includegraphics[height=5cm]{classmoeoEntropyMetric} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoMetric.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoMetric.eps index 17339b3c4..23737595a 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoMetric.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoMetric.eps @@ -176,10 +176,10 @@ boxfont setfont (moeoMetric) cw (eoFunctorBase) cw (moeoBM< A1, A2, R >) cw -(moeoBM< const EOFitness &, const EOFitness &, R >) cw -(moeoBM< const std::vector< EOFitness > &, const EOFitness &, R >) cw -(moeoBM< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >) cw -(moeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) cw +(moeoBM< const const EOFitness &, EOFitness &, R >) cw +(moeoBM< const const std::vector< EOFitness > &, EOFitness &, R >) cw +(moeoBM< const const std::vector< EOFitness > &, std::vector< EOFitness > &, R >) cw +(moeoBM< const const std::vector< typename EOT::Fitness > &, std::vector< typename EOT::Fitness > &, double >) cw (moeoUM< A, R >) cw (moeoUM< const EOFitness &, R >) cw (moeoUM< const std::vector< EOFitness > &, R >) cw @@ -197,14 +197,11 @@ boundx scalefactor div boundy scalefactor div scale (moeoMetric) 0 8 box (eoFunctorBase) 0 9 box (moeoBM< A1, A2, R >) 1 7 box - (moeoBM< const EOFitness &, const EOFitness &, R >) 1 6 box -1 6 mark - (moeoBM< const std::vector< EOFitness > &, const EOFitness &, R >) 1 5 box -1 5 mark - (moeoBM< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >) 1 4 box -1 4 mark - (moeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >) 1 3 box -1 3 mark +1 7 mark + (moeoBM< const const EOFitness &, EOFitness &, R >) 1 6 box + (moeoBM< const const std::vector< EOFitness > &, EOFitness &, R >) 1 5 box + (moeoBM< const const std::vector< EOFitness > &, std::vector< EOFitness > &, R >) 1 4 box + (moeoBM< const const std::vector< typename EOT::Fitness > &, std::vector< typename EOT::Fitness > &, double >) 1 3 box (moeoUM< A, R >) 1 2 box (moeoUM< const EOFitness &, R >) 1 1 box 1 1 mark diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II.tex index adb9857dd..f74f31db1 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II.tex @@ -1,6 +1,6 @@ \section{moeo\-NDSorting\_\-II$<$ EOT $>$ Class Template Reference} \label{classmoeoNDSorting__II}\index{moeoNDSorting_II@{moeoNDSorting\_\-II}} -Fast Elitist Non-Dominant Sorting Genetic Algorithm. +Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie Note : This is a corrected version of the original {\bf eo\-NDSorting\_\-II} class. {\tt \#include $<$moeo\-NDSorting.h$>$} @@ -14,31 +14,31 @@ Inheritance diagram for moeo\-NDSorting\_\-II$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef std::pair$<$ double, unsigned $>$ {\bf double\_\-index\_\-pair}\label{classmoeoNDSorting__II_6703325377eec015f475e944dc75097d} +typedef std::pair$<$ double, unsigned $>$ {\bf double\_\-index\_\-pair}\label{classmoeoNDSorting__II_0987beaa2f600f5bce61c77215679e43} -\end{CompactItemize} +\begin{CompactList}\small\item\em index pair \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item {\bf moeo\-NDSorting\_\-II} (bool nasty\_\-flag\_\-=false)\label{classmoeoNDSorting__II_820e9987853858ddc59e36c7f267955e} -\item -std::vector$<$ double $>$ {\bf niche\_\-penalty} (const std::vector$<$ unsigned $>$ \&\_\-cf, const {\bf eo\-Pop}$<$ EOT $>$ \&\_\-pop)\label{classmoeoNDSorting__II_d24d8008d6928aeaeeb59791cb4059fc} +\begin{CompactList}\small\item\em constructor \item\end{CompactList}\item +std::vector$<$ double $>$ {\bf niche\_\-penalty} (const std::vector$<$ unsigned $>$ \&\_\-cf, const {\bf eo\-Pop}$<$ EOT $>$ \&\_\-pop)\label{classmoeoNDSorting__II_265c74b9f64731db86e2c363593f67f9} \begin{CompactList}\small\item\em \_\-cf points into the elements that consist of the current front \item\end{CompactList}\end{CompactItemize} \subsection*{Classes} \begin{CompactItemize} \item class {\bf compare\_\-nodes} -\end{CompactItemize} +\begin{CompactList}\small\item\em A class to compare the nodes. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} \subsubsection*{template$<$class EOT$>$ class moeo\-NDSorting\_\-II$<$ EOT $>$} -Fast Elitist Non-Dominant Sorting Genetic Algorithm. +Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie Note : This is a corrected version of the original {\bf eo\-NDSorting\_\-II} class. -Note : This is a corrected version of the original {\bf eo\-NDSorting\_\-II} class\begin{Desc} +\begin{Desc} \item[See also:]{\bf eo\-NDSorting\_\-II} \end{Desc} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II_1_1compare__nodes.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II_1_1compare__nodes.tex index 3361c1944..cec86004e 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II_1_1compare__nodes.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoNDSorting__II_1_1compare__nodes.tex @@ -1,9 +1,14 @@ \section{moeo\-NDSorting\_\-II$<$ EOT $>$::compare\_\-nodes Class Reference} \label{classmoeoNDSorting__II_1_1compare__nodes}\index{moeoNDSorting_II::compare_nodes@{moeoNDSorting\_\-II::compare\_\-nodes}} +A class to compare the nodes. + + +{\tt \#include $<$moeo\-NDSorting.h$>$} + \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (const {\bf double\_\-index\_\-pair} \&a, const {\bf double\_\-index\_\-pair} \&b) const \label{classmoeoNDSorting__II_1_1compare__nodes_e1052afbabd0e4f14b7913cd1afcd824} +bool {\bf operator()} (const {\bf double\_\-index\_\-pair} \&a, const {\bf double\_\-index\_\-pair} \&b) const\label{classmoeoNDSorting__II_1_1compare__nodes_471ebe9e88bfc778c4c281399eb0c196} \end{CompactItemize} @@ -11,11 +16,11 @@ bool {\bf operator()} (const {\bf double\_\-index\_\-pair} \&a, const {\bf doubl \subsection{Detailed Description} \subsubsection*{template$<$class EOT$>$ class moeo\-NDSorting\_\-II$<$ EOT $>$::compare\_\-nodes} +A class to compare the nodes. - -Definition at line 34 of file moeo\-NDSorting.h. +Definition at line 46 of file moeo\-NDSorting.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoNSGA__II.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoNSGA__II.tex index d67dfe60c..70fcda63a 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoNSGA__II.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoNSGA__II.tex @@ -23,31 +23,31 @@ virtual void {\bf operator()} ({\bf eo\-Pop}$<$ EOT $>$ \&\_\-pop)\label{classmo \subsection*{Protected Attributes} \begin{CompactItemize} \item -{\bf eo\-Continue}$<$ EOT $>$ \& {\bf continuator}\label{classmoeoNSGA__II_5723ef1daf0c523d4bf66a691fd6e909} +{\bf eo\-Continue}$<$ EOT $>$ \& {\bf continuator}\label{classmoeoNSGA__II_22ba11ba501fb7cf3423d9b777294998} \item -{\bf eo\-Eval\-Func}$<$ EOT $>$ \& {\bf eval}\label{classmoeoNSGA__II_31560a9c8d9499ce8dd361a004083ce9} +{\bf eo\-Eval\-Func}$<$ EOT $>$ \& {\bf eval}\label{classmoeoNSGA__II_6b90df8b9890035788a4d4a3f0c26742} \item -{\bf eo\-Pop\-Loop\-Eval}$<$ EOT $>$ {\bf loop\-Eval}\label{classmoeoNSGA__II_0308927592ac71d747ba345c74eb6595} +{\bf eo\-Pop\-Loop\-Eval}$<$ EOT $>$ {\bf loop\-Eval}\label{classmoeoNSGA__II_72fd9c6e70e9ee19db82a6894cafc60b} \item -{\bf eo\-Pop\-Eval\-Func}$<$ EOT $>$ \& {\bf pop\-Eval}\label{classmoeoNSGA__II_abca45cb9b0099f294ff5172a287ce33} +{\bf eo\-Pop\-Eval\-Func}$<$ EOT $>$ \& {\bf pop\-Eval}\label{classmoeoNSGA__II_c1975957e19a164fde96ed7b5ce90ba4} \item -{\bf moeo\-NDSorting\_\-II}$<$ EOT $>$ {\bf sorting}\label{classmoeoNSGA__II_0c64d278d6675671fb45a241d2b4802f} +{\bf moeo\-NDSorting\_\-II}$<$ EOT $>$ {\bf sorting}\label{classmoeoNSGA__II_1aa7de4992f6c0f1c3a093aca735874c} \begin{CompactList}\small\item\em NSGAII sorting. \item\end{CompactList}\item -{\bf eo\-Det\-Tournament\-Worth\-Select}$<$ EOT $>$ {\bf select\-One}\label{classmoeoNSGA__II_7f122201fa2d60855384389bf080e093} +{\bf eo\-Det\-Tournament\-Worth\-Select}$<$ EOT $>$ {\bf select\-One}\label{classmoeoNSGA__II_add129e06168846b7e405ddd25d70c4d} \begin{CompactList}\small\item\em Binary tournament selection. \item\end{CompactList}\item -{\bf moeo\-Elitist\-Replacement}$<$ EOT $>$ {\bf replace}\label{classmoeoNSGA__II_225df0fde7341dc20db61e822cee7aeb} +{\bf moeo\-Elitist\-Replacement}$<$ EOT $>$ {\bf replace}\label{classmoeoNSGA__II_c75535b7a47c26d8a66c1f227d33a3af} \begin{CompactList}\small\item\em Elitist replacement. \item\end{CompactList}\item -{\bf eo\-General\-Breeder}$<$ EOT $>$ {\bf gen\-Breed}\label{classmoeoNSGA__II_33b60728fb89a6be957f3a312171941f} +{\bf eo\-General\-Breeder}$<$ EOT $>$ {\bf gen\-Breed}\label{classmoeoNSGA__II_febee845341b96dba1cdfc18640d4960} \item -{\bf eo\-Breed}$<$ EOT $>$ \& {\bf breed}\label{classmoeoNSGA__II_8908faf0b9a4334eaab0f34a2774fa16} +{\bf eo\-Breed}$<$ EOT $>$ \& {\bf breed}\label{classmoeoNSGA__II_f0dc0665ea743729e6284d812192acfc} \end{CompactItemize} @@ -76,7 +76,7 @@ Deb, K., S. Agrawal, A. Pratap, and T. Meyarivan, A fast elitist non-dominated s \end{Desc} -Definition at line 45 of file moeo\-NSGA\_\-II.h. +Definition at line 46 of file moeo\-NSGA\_\-II.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoSelectOneFromPopAndArch.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoSelectOneFromPopAndArch.eps index eac75bdbf..f9c38857e 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoSelectOneFromPopAndArch.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoSelectOneFromPopAndArch.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 274.914 +%%BoundingBox: 0 0 500 307.692 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.81875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moeoSelectOneFromPopAndArch< EOT >) cw (eoSelectOne< EOT >) cw -(eoUF< const eoPop< EOT > &, const EOT & >) cw +(eoUF< A1, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moeoSelectOneFromPopAndArch< EOT >) 0 0 box (eoSelectOne< EOT >) 0 1 box - (eoUF< const eoPop< EOT > &, const EOT & >) 0 2 box + (eoUF< A1, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.eps index 9a9dbb2c2..f3491d31f 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 120.12 +%%BoundingBox: 0 0 500 130.293 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.1625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 3.8375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,8 +174,8 @@ boxfont setfont 1 boundaspect scale (moeoSolutionVsSolutionBM< EOT, R, EOFitness >) cw -(moeoBM< const EOFitness &, const EOFitness &, R >) cw -(eoBF< const EOFitness &, const EOFitness &, R >) cw +(moeoBM< A1, A2, R >) cw +(eoBF< A1, A2, R >) cw (moeoMetric) cw (eoFunctorBase) cw (eoFunctorBase) cw @@ -191,8 +191,8 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moeoSolutionVsSolutionBM< EOT, R, EOFitness >) 0.5 0 box - (moeoBM< const EOFitness &, const EOFitness &, R >) 0.5 1 box - (eoBF< const EOFitness &, const EOFitness &, R >) 0 2 box + (moeoBM< A1, A2, R >) 0.5 1 box + (eoBF< A1, A2, R >) 0 2 box (moeoMetric) 1 2 box (eoFunctorBase) 0 3 box (eoFunctorBase) 1 3 box diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.tex index f6d1d635c..2c3797c15 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoSolutionVsSolutionBM.tex @@ -8,7 +8,7 @@ Base class for binary metrics dedicated to the performance comparison between tw Inheritance diagram for moeo\-Solution\-Vs\-Solution\-BM$<$ EOT, R, EOFitness $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.36336cm]{classmoeoSolutionVsSolutionBM} +\includegraphics[height=3.64821cm]{classmoeoSolutionVsSolutionBM} \end{center} \end{figure} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.eps index 400ed858d..cb9caa6f9 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 96.3855 +%%BoundingBox: 0 0 500 133.333 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 5.1875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 3.75 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,8 +174,8 @@ boxfont setfont 1 boundaspect scale (moeoVectorVsSolutionBM< EOT, R, EOFitness >) cw -(moeoBM< const std::vector< EOFitness > &, const EOFitness &, R >) cw -(eoBF< const std::vector< EOFitness > &, const EOFitness &, R >) cw +(moeoBM< A1, A2, R >) cw +(eoBF< A1, A2, R >) cw (moeoMetric) cw (eoFunctorBase) cw (eoFunctorBase) cw @@ -191,8 +191,8 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moeoVectorVsSolutionBM< EOT, R, EOFitness >) 0.5 0 box - (moeoBM< const std::vector< EOFitness > &, const EOFitness &, R >) 0.5 1 box - (eoBF< const std::vector< EOFitness > &, const EOFitness &, R >) 0 2 box + (moeoBM< A1, A2, R >) 0.5 1 box + (eoBF< A1, A2, R >) 0 2 box (moeoMetric) 1 2 box (eoFunctorBase) 0 3 box (eoFunctorBase) 1 3 box diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.tex index f6d56d34c..3d8168722 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsSolutionBM.tex @@ -8,7 +8,7 @@ Base class for binary metrics dedicated to the performance comparison between a Inheritance diagram for moeo\-Vector\-Vs\-Solution\-BM$<$ EOT, R, EOFitness $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2.6988cm]{classmoeoVectorVsSolutionBM} +\includegraphics[height=3.73333cm]{classmoeoVectorVsSolutionBM} \end{center} \end{figure} diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.eps b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.eps index ce5c61a89..9602d3d8d 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.eps +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 80.4829 +%%BoundingBox: 0 0 500 136.519 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 6.2125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 3.6625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,8 +174,8 @@ boxfont setfont 1 boundaspect scale (moeoVectorVsVectorBM< EOT, R, EOFitness >) cw -(moeoBM< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >) cw -(eoBF< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >) cw +(moeoBM< A1, A2, R >) cw +(eoBF< A1, A2, R >) cw (moeoMetric) cw (eoFunctorBase) cw (eoFunctorBase) cw @@ -191,8 +191,8 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moeoVectorVsVectorBM< EOT, R, EOFitness >) 0.5 0 box - (moeoBM< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >) 0.5 1 box - (eoBF< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >) 0 2 box + (moeoBM< A1, A2, R >) 0.5 1 box + (eoBF< A1, A2, R >) 0 2 box (moeoMetric) 1 2 box (eoFunctorBase) 0 3 box (eoFunctorBase) 1 3 box diff --git a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.tex b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.tex index 898bf0303..0ede3e6ee 100644 --- a/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.tex +++ b/trunk/paradiseo-moeo/docs/latex/classmoeoVectorVsVectorBM.tex @@ -8,7 +8,7 @@ Base class for binary metrics dedicated to the performance comparison between tw Inheritance diagram for moeo\-Vector\-Vs\-Vector\-BM$<$ EOT, R, EOFitness $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2.25352cm]{classmoeoVectorVsVectorBM} +\includegraphics[height=3.82253cm]{classmoeoVectorVsVectorBM} \end{center} \end{figure} diff --git a/trunk/paradiseo-moeo/docs/latex/doxygen.sty b/trunk/paradiseo-moeo/docs/latex/doxygen.sty index 113cbe4a8..d627a4e02 100644 --- a/trunk/paradiseo-moeo/docs/latex/doxygen.sty +++ b/trunk/paradiseo-moeo/docs/latex/doxygen.sty @@ -10,16 +10,30 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Dec 22 09:37:11 2006 for Paradis\-EO-MOEO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Dec 22 09:37:11 2006 for Paradis\-EO-MOEO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Mon Jan 15 14:19:18 2007 for Paradis\-EO-MOEO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Mon Jan 15 14:19:18 2007 for Paradis\-EO-MOEO by Doxygen }} \cfoot{} +\newenvironment{Code} +{\footnotesize} +{\normalsize} +\newcommand{\doxyref}[3]{\textbf{#1} (\textnormal{#2}\,\pageref{#3})} +\newenvironment{DocInclude} +{\footnotesize} +{\normalsize} +\newenvironment{VerbInclude} +{\footnotesize} +{\normalsize} +\newenvironment{Image} +{\begin{figure}[H]} +{\end{figure}} +\newenvironment{ImageNoCaption}{}{} \newenvironment{CompactList} {\begin{list}{}{ \setlength{\leftmargin}{0.5cm} \setlength{\itemsep}{0pt} \setlength{\parsep}{0pt} \setlength{\topsep}{0pt} - \renewcommand{\makelabel}{}}} + \renewcommand{\makelabel}{\hfill}}} {\end{list}} \newenvironment{CompactItemize} { @@ -41,7 +55,7 @@ } {\end{tabular*}\par} \newcommand{\entrylabel}[1]{ - {\parbox[b]{\labelwidth-4pt}{\makebox[0pt][l]{\textbf{#1}}\\}}} + {\parbox[b]{\labelwidth-4pt}{\makebox[0pt][l]{\textbf{#1}}\vspace{1.5\baselineskip}}}} \newenvironment{Desc} {\begin{list}{} { diff --git a/trunk/paradiseo-moeo/docs/latex/hierarchy.tex b/trunk/paradiseo-moeo/docs/latex/hierarchy.tex index 15b140b99..86788b042 100644 --- a/trunk/paradiseo-moeo/docs/latex/hierarchy.tex +++ b/trunk/paradiseo-moeo/docs/latex/hierarchy.tex @@ -1,47 +1,18 @@ \section{Paradis\-EO-MOEO Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} -\item \contentsline{section}{eo\-Binary\-Quality\-Indicator$<$ EOFitness $>$::Range}{\pageref{classeoBinaryQualityIndicator_1_1Range}}{} \item eo\-Functor\-Base{\tt [external]}\begin{CompactList} \item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-BM$<$ A1, A2, R $>$}{\pageref{classmoeoBM}}{} -\end{CompactList} -\item eo\-BF$<$ const EOFitness \&, const EOFitness \&, double $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{eo\-Binary\-Quality\-Indicator$<$ EOFitness $>$}{\pageref{classeoBinaryQualityIndicator}}{} +\item \contentsline{section}{moeo\-Binary\-Quality\-Indicator$<$ EOFitness $>$}{\pageref{classmoeoBinaryQualityIndicator}}{} \begin{CompactList} -\item \contentsline{section}{eo\-Additive\-Binary\-Epsilon\-Indicator$<$ EOFitness $>$}{\pageref{classeoAdditiveBinaryEpsilonIndicator}}{} -\item \contentsline{section}{eo\-Binary\-Hypervolume\-Indicator$<$ EOFitness $>$}{\pageref{classeoBinaryHypervolumeIndicator}}{} +\item \contentsline{section}{moeo\-Additive\-Binary\-Epsilon\-Indicator$<$ EOFitness $>$}{\pageref{classmoeoAdditiveBinaryEpsilonIndicator}}{} +\item \contentsline{section}{moeo\-Binary\-Hypervolume\-Indicator$<$ EOFitness $>$}{\pageref{classmoeoBinaryHypervolumeIndicator}}{} \end{CompactList} -\end{CompactList} -\item eo\-BF$<$ const EOFitness \&, const EOFitness \&, R $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-BM$<$ const EOFitness \&, const EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} +\item \contentsline{section}{moeo\-Binary\-Quality\-Indicator$<$ Fitness\-Eval $>$}{\pageref{classmoeoBinaryQualityIndicator}}{} +\item \contentsline{section}{moeo\-BM$<$ A1, A2, R $>$}{\pageref{classmoeoBM}}{} \begin{CompactList} \item \contentsline{section}{moeo\-Solution\-Vs\-Solution\-BM$<$ EOT, R, EOFitness $>$}{\pageref{classmoeoSolutionVsSolutionBM}}{} -\end{CompactList} -\end{CompactList} -\item eo\-BF$<$ const EOT \&, moeo\-Archive$<$ EOT $>$ \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-MOLS$<$ EOT $>$}{\pageref{classmoeoMOLS}}{} -\begin{CompactList} -\item \contentsline{section}{moeo\-Combined\-MOLS$<$ EOT $>$}{\pageref{classmoeoCombinedMOLS}}{} -\end{CompactList} -\end{CompactList} -\item eo\-BF$<$ const Fitness\-Eval \&, const Fitness\-Eval \&, double $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{eo\-Binary\-Quality\-Indicator$<$ Fitness\-Eval $>$}{\pageref{classeoBinaryQualityIndicator}}{} -\end{CompactList} -\item eo\-BF$<$ const std::vector$<$ EOFitness $>$ \&, const EOFitness \&, R $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-BM$<$ const std::vector$<$ EOFitness $>$ \&, const EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} -\begin{CompactList} \item \contentsline{section}{moeo\-Vector\-Vs\-Solution\-BM$<$ EOT, R, EOFitness $>$}{\pageref{classmoeoVectorVsSolutionBM}}{} -\end{CompactList} -\end{CompactList} -\item eo\-BF$<$ const std::vector$<$ EOFitness $>$ \&, const std::vector$<$ EOFitness $>$ \&, R $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-BM$<$ const std::vector$<$ EOFitness $>$ \&, const std::vector$<$ EOFitness $>$ \&, R $>$}{\pageref{classmoeoBM}}{} -\begin{CompactList} \item \contentsline{section}{moeo\-Vector\-Vs\-Vector\-BM$<$ EOT, R, EOFitness $>$}{\pageref{classmoeoVectorVsVectorBM}}{} -\end{CompactList} -\end{CompactList} -\item eo\-BF$<$ const std::vector$<$ typename EOT::Fitness $>$ \&, const std::vector$<$ typename EOT::Fitness $>$ \&, double $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-BM$<$ const std::vector$<$ typename EOT::Fitness $>$ \&, const std::vector$<$ typename EOT::Fitness $>$ \&, double $>$}{\pageref{classmoeoBM}}{} -\begin{CompactList} \item \contentsline{section}{moeo\-Vector\-Vs\-Vector\-BM$<$ EOT, double $>$}{\pageref{classmoeoVectorVsVectorBM}}{} \begin{CompactList} \item \contentsline{section}{moeo\-Contribution\-Metric$<$ EOT $>$}{\pageref{classmoeoContributionMetric}}{} @@ -49,6 +20,24 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \end{CompactList} \end{CompactList} \end{CompactList} +\item eo\-BF$<$ const const EOFitness \&, EOFitness \&, R $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moeo\-BM$<$ const const EOFitness \&, EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} +\end{CompactList} +\item eo\-BF$<$ const const std::vector$<$ EOFitness $>$ \&, EOFitness \&, R $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moeo\-BM$<$ const const std::vector$<$ EOFitness $>$ \&, EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} +\end{CompactList} +\item eo\-BF$<$ const const std::vector$<$ EOFitness $>$ \&, std::vector$<$ EOFitness $>$ \&, R $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moeo\-BM$<$ const const std::vector$<$ EOFitness $>$ \&, std::vector$<$ EOFitness $>$ \&, R $>$}{\pageref{classmoeoBM}}{} +\end{CompactList} +\item eo\-BF$<$ const const std::vector$<$ typename EOT::Fitness $>$ \&, std::vector$<$ typename EOT::Fitness $>$ \&, double $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moeo\-BM$<$ const const std::vector$<$ typename EOT::Fitness $>$ \&, std::vector$<$ typename EOT::Fitness $>$ \&, double $>$}{\pageref{classmoeoBM}}{} +\end{CompactList} +\item eo\-BF$<$ const EOT \&, moeo\-Archive$<$ EOT $>$ \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moeo\-MOLS$<$ EOT $>$}{\pageref{classmoeoMOLS}}{} +\begin{CompactList} +\item \contentsline{section}{moeo\-Combined\-MOLS$<$ EOT $>$}{\pageref{classmoeoCombinedMOLS}}{} +\end{CompactList} +\end{CompactList} \item eo\-BF$<$ eo\-Pop$<$ EOT $>$ \&, eo\-Pop$<$ EOT $>$ \&, void $>${\tt [external]}\begin{CompactList} \item eo\-Replacement$<$ EOT $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moeo\-Replacement$<$ EOT, Worth\-T $>$}{\pageref{classmoeoReplacement}}{} @@ -66,6 +55,11 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item \contentsline{section}{moeo\-Hybrid\-MOLS$<$ EOT $>$}{\pageref{classmoeoHybridMOLS}}{} \end{CompactList} \end{CompactList} +\item eo\-UF$<$ A1, R $>${\tt [external]}\begin{CompactList} +\item eo\-Select\-One$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moeo\-Select\-One\-From\-Pop\-And\-Arch$<$ EOT $>$}{\pageref{classmoeoSelectOneFromPopAndArch}}{} +\end{CompactList} +\end{CompactList} \item eo\-UF$<$ A, R $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moeo\-UM$<$ A, R $>$}{\pageref{classmoeoUM}}{} \end{CompactList} @@ -75,30 +69,25 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item \contentsline{section}{moeo\-Solution\-UM$<$ EOT, R, EOFitness $>$}{\pageref{classmoeoSolutionUM}}{} \end{CompactList} \end{CompactList} -\item eo\-UF$<$ const eo\-Pop$<$ EOT $>$ \&, const EOT \& $>${\tt [external]}\begin{CompactList} -\item eo\-Select\-One$<$ EOT $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moeo\-Select\-One\-From\-Pop\-And\-Arch$<$ EOT $>$}{\pageref{classmoeoSelectOneFromPopAndArch}}{} -\end{CompactList} -\end{CompactList} \item eo\-UF$<$ const eo\-Pop$<$ EOT $>$ \&, void $>${\tt [external]}\begin{CompactList} \item eo\-Perf2Worth$<$ EOT, Worth\-T $>${\tt [external]}\begin{CompactList} \item eo\-Perf2Worth\-Cached$<$ EOT, double $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{eo\-IBEA$<$ EOT, Fitness $>$}{\pageref{classeoIBEA}}{} -\begin{CompactList} -\item \contentsline{section}{eo\-IBEASorting$<$ EOT, Fitness $>$}{\pageref{classeoIBEASorting}}{} -\end{CompactList} -\item \contentsline{section}{eo\-IBEA$<$ EOT, Fitness\-Eval $>$}{\pageref{classeoIBEA}}{} -\begin{CompactList} -\item \contentsline{section}{eo\-IBEAAvg\-Sorting$<$ EOT, Fitness\-Eval $>$}{\pageref{classeoIBEAAvgSorting}}{} -\item \contentsline{section}{eo\-IBEAStoch\-Sorting$<$ EOT, Fitness\-Eval $>$}{\pageref{classeoIBEAStochSorting}}{} -\end{CompactList} \item eo\-NDSorting$<$ EOT $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moeo\-NDSorting\_\-II$<$ EOT $>$}{\pageref{classmoeoNDSorting__II}}{} \end{CompactList} +\item \contentsline{section}{moeo\-IBEA$<$ EOT, Fitness $>$}{\pageref{classmoeoIBEA}}{} +\begin{CompactList} +\item \contentsline{section}{moeo\-IBEASorting$<$ EOT, Fitness $>$}{\pageref{classmoeoIBEASorting}}{} +\end{CompactList} +\item \contentsline{section}{moeo\-IBEA$<$ EOT, Fitness\-Eval $>$}{\pageref{classmoeoIBEA}}{} +\begin{CompactList} +\item \contentsline{section}{moeo\-IBEAAvg\-Sorting$<$ EOT, Fitness\-Eval $>$}{\pageref{classmoeoIBEAAvgSorting}}{} +\item \contentsline{section}{moeo\-IBEAStoch\-Sorting$<$ EOT, Fitness\-Eval $>$}{\pageref{classmoeoIBEAStochSorting}}{} +\end{CompactList} \end{CompactList} \end{CompactList} \item eo\-Perf2Worth$<$ EOT, worth\-T $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{eo\-Pareto\-Sharing$<$ EOT, worth\-T $>$}{\pageref{classeoParetoSharing}}{} +\item \contentsline{section}{moeo\-Pareto\-Sharing$<$ EOT, worth\-T $>$}{\pageref{classmoeoParetoSharing}}{} \end{CompactList} \end{CompactList} \item eo\-UF$<$ const std::vector$<$ EOFitness $>$ \&, R $>${\tt [external]}\begin{CompactList} @@ -115,10 +104,10 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item \contentsline{section}{moeo\-Metric}{\pageref{classmoeoMetric}}{} \begin{CompactList} \item \contentsline{section}{moeo\-BM$<$ A1, A2, R $>$}{\pageref{classmoeoBM}}{} -\item \contentsline{section}{moeo\-BM$<$ const EOFitness \&, const EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} -\item \contentsline{section}{moeo\-BM$<$ const std::vector$<$ EOFitness $>$ \&, const EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} -\item \contentsline{section}{moeo\-BM$<$ const std::vector$<$ EOFitness $>$ \&, const std::vector$<$ EOFitness $>$ \&, R $>$}{\pageref{classmoeoBM}}{} -\item \contentsline{section}{moeo\-BM$<$ const std::vector$<$ typename EOT::Fitness $>$ \&, const std::vector$<$ typename EOT::Fitness $>$ \&, double $>$}{\pageref{classmoeoBM}}{} +\item \contentsline{section}{moeo\-BM$<$ const const EOFitness \&, EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} +\item \contentsline{section}{moeo\-BM$<$ const const std::vector$<$ EOFitness $>$ \&, EOFitness \&, R $>$}{\pageref{classmoeoBM}}{} +\item \contentsline{section}{moeo\-BM$<$ const const std::vector$<$ EOFitness $>$ \&, std::vector$<$ EOFitness $>$ \&, R $>$}{\pageref{classmoeoBM}}{} +\item \contentsline{section}{moeo\-BM$<$ const const std::vector$<$ typename EOT::Fitness $>$ \&, std::vector$<$ typename EOT::Fitness $>$ \&, double $>$}{\pageref{classmoeoBM}}{} \item \contentsline{section}{moeo\-UM$<$ A, R $>$}{\pageref{classmoeoUM}}{} \item \contentsline{section}{moeo\-UM$<$ const EOFitness \&, R $>$}{\pageref{classmoeoUM}}{} \item \contentsline{section}{moeo\-UM$<$ const std::vector$<$ EOFitness $>$ \&, R $>$}{\pageref{classmoeoUM}}{} @@ -135,14 +124,15 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item eo\-Value\-Param$<$ std::vector$<$ worth\-T $>$ $>${\tt [external]}\begin{CompactList} \item eo\-Perf2Worth$<$ EOT, worth\-T $>${\tt [external]}\end{CompactList} \end{CompactList} -\item \contentsline{section}{eo\-Pareto\-Phen\-Dist$<$ EOT, Dist\-Type $>$}{\pageref{classeoParetoPhenDist}}{} -\begin{CompactList} -\item \contentsline{section}{eo\-Pareto\-Euclid\-Dist$<$ EOT, Dist\-Type $>$}{\pageref{classeoParetoEuclidDist}}{} -\end{CompactList} -\item \contentsline{section}{eo\-Pareto\-Sharing$<$ EOT, worth\-T $>$::d\-Matrix}{\pageref{classeoParetoSharing_1_1dMatrix}}{} \item eo\-Printable{\tt [external]}\begin{CompactList} \item eo\-Persistent{\tt [external]}\begin{CompactList} \item eo\-Pop$<$ EOT $>${\tt [external]}\end{CompactList} \end{CompactList} +\item \contentsline{section}{moeo\-Binary\-Quality\-Indicator$<$ EOFitness $>$::Range}{\pageref{classmoeoBinaryQualityIndicator_1_1Range}}{} \item \contentsline{section}{moeo\-NDSorting\_\-II$<$ EOT $>$::compare\_\-nodes}{\pageref{classmoeoNDSorting__II_1_1compare__nodes}}{} +\item \contentsline{section}{moeo\-Pareto\-Phen\-Dist$<$ EOT, Dist\-Type $>$}{\pageref{classmoeoParetoPhenDist}}{} +\begin{CompactList} +\item \contentsline{section}{moeo\-Pareto\-Euclid\-Dist$<$ EOT, Dist\-Type $>$}{\pageref{classmoeoParetoEuclidDist}}{} +\end{CompactList} +\item \contentsline{section}{moeo\-Pareto\-Sharing$<$ EOT, worth\-T $>$::d\-Matrix}{\pageref{classmoeoParetoSharing_1_1dMatrix}}{} \end{CompactList} diff --git a/trunk/paradiseo-moeo/docs/latex/main.tex b/trunk/paradiseo-moeo/docs/latex/main.tex index a16d9208c..7297a0ecb 100644 --- a/trunk/paradiseo-moeo/docs/latex/main.tex +++ b/trunk/paradiseo-moeo/docs/latex/main.tex @@ -1,5 +1,5 @@ \section{intro}\label{main_intro} Paradis\-EO-MOEO is a white-box object-oriented generic framework dedicated to the flexible design of evolutionary multi-objective algorithms. This paradigm-free software embeds some features and techniques for Pareto-based resolution and aims to provide a set of classes allowing to ease and speed up the development of computationally efficient programs. It is based on a clear conceptual distinction between the solution methods and the multi-objective problems they are intended to solve. This separation confers a maximum design and code reuse. Paradis\-EO-MOEO provides a broad range of archive-related features (such as elitism or performance metrics) and the most common Pareto-based fitness assignment strategies (MOGA, NSGA, SPEA, IBEA and more). Furthermore, parallel and distributed models as well as hybridization mechanisms can be applied to an algorithm designed within Paradis\-EO-MOEO using the whole version of Paradis\-EO.\section{tutorial}\label{main_tutorial} A tutorial about a bi-objective flow-shop scheduling problem will be available soon.\section{install}\label{main_install} -The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.\section{design}\label{main_design} +The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design} For an introduction to the design of Paradis\-EO-MOEO, you can look at the {\tt Paradis\-EO website}. \ No newline at end of file diff --git a/trunk/paradiseo-moeo/docs/latex/refman.tex b/trunk/paradiseo-moeo/docs/latex/refman.tex index 39c874911..15cb018d4 100644 --- a/trunk/paradiseo-moeo/docs/latex/refman.tex +++ b/trunk/paradiseo-moeo/docs/latex/refman.tex @@ -17,9 +17,9 @@ \begin{center} {\Large Paradis\-EO-MOEO Reference Manual\\[1ex]\large 0.1 }\\ \vspace*{1cm} -{\large Generated by Doxygen 1.4.6}\\ +{\large Generated by Doxygen 1.5.1}\\ \vspace*{0.5cm} -{\small Fri Dec 22 09:37:11 2006}\\ +{\small Mon Jan 15 14:19:18 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -34,22 +34,14 @@ \chapter{Paradis\-EO-MOEO Class Index} \input{annotated} \chapter{Paradis\-EO-MOEO Class Documentation} -\input{classeoAdditiveBinaryEpsilonIndicator} -\include{classeoBinaryHypervolumeIndicator} -\include{classeoBinaryQualityIndicator} -\include{classeoBinaryQualityIndicator_1_1Range} -\include{classeoIBEA} -\include{classeoIBEAAvgSorting} -\include{classeoIBEASorting} -\include{classeoIBEAStochSorting} -\include{classeoParetoEuclidDist} -\include{classeoParetoPhenDist} -\include{classeoParetoSharing} -\include{classeoParetoSharing_1_1dMatrix} +\input{classmoeoAdditiveBinaryEpsilonIndicator} \include{classmoeoArchive} \include{classmoeoArchiveFitnessSavingUpdater} \include{classmoeoArchiveUpdater} +\include{classmoeoBinaryHypervolumeIndicator} \include{classmoeoBinaryMetricSavingUpdater} +\include{classmoeoBinaryQualityIndicator} +\include{classmoeoBinaryQualityIndicator_1_1Range} \include{classmoeoBM} \include{classmoeoCombinedMOLS} \include{classmoeoContributionMetric} @@ -57,11 +49,19 @@ \include{classmoeoElitistReplacement} \include{classmoeoEntropyMetric} \include{classmoeoHybridMOLS} +\include{classmoeoIBEA} +\include{classmoeoIBEAAvgSorting} +\include{classmoeoIBEASorting} +\include{classmoeoIBEAStochSorting} \include{classmoeoMetric} \include{classmoeoMOLS} \include{classmoeoNDSorting__II} \include{classmoeoNDSorting__II_1_1compare__nodes} \include{classmoeoNSGA__II} +\include{classmoeoParetoEuclidDist} +\include{classmoeoParetoPhenDist} +\include{classmoeoParetoSharing} +\include{classmoeoParetoSharing_1_1dMatrix} \include{classmoeoReplacement} \include{classmoeoSelectOneFromPopAndArch} \include{classmoeoSolutionUM} diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoArchive.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoArchive.3 index 06a4883d4..e1bf41ffa 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoArchive.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoArchive.3 @@ -1,4 +1,4 @@ -.TH "moeoArchive" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoArchive" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -24,11 +24,11 @@ Inherits \fBeoPop< EOT >< EOT >\fP. .in +1c .ti -1c -.RI "bool \fBdominates\fP (const \fBEOFitness\fP &_fit) const " +.RI "bool \fBdominates\fP (const \fBEOFitness\fP &_fit) const" .br .RI "\fIReturns true if the current archive dominates _fit. \fP" .ti -1c -.RI "bool \fBcontains\fP (const \fBEOFitness\fP &_fit) const " +.RI "bool \fBcontains\fP (const \fBEOFitness\fP &_fit) const" .br .RI "\fIReturns true if the current archive contains _fit. \fP" .ti -1c @@ -61,6 +61,8 @@ Returns true if the current archive dominates _fit. .PP Definition at line 39 of file moeoArchive.h. +.PP +Referenced by moeoArchive< EOT >::update(). .SS "template bool \fBmoeoArchive\fP< EOT >::contains (const \fBEOFitness\fP & _fit) const\fC [inline]\fP" .PP Returns true if the current archive contains _fit. @@ -85,6 +87,10 @@ Updates the archive with a given individual _eo. .PP Definition at line 63 of file moeoArchive.h. +.PP +References moeoArchive< EOT >::dominates(). +.PP +Referenced by moeoArchive< EOT >::update(). .SS "template void \fBmoeoArchive\fP< EOT >::update (const \fBeoPop\fP< EOT > & _pop)\fC [inline]\fP" .PP Updates the archive with a given population _pop. @@ -97,6 +103,8 @@ Updates the archive with a given population _pop. .PP Definition at line 98 of file moeoArchive.h. +.PP +References moeoArchive< EOT >::update(). .SH "Author" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveFitnessSavingUpdater.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveFitnessSavingUpdater.3 index dae00f3aa..2110dd8f7 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveFitnessSavingUpdater.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveFitnessSavingUpdater.3 @@ -1,4 +1,4 @@ -.TH "moeoArchiveFitnessSavingUpdater" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoArchiveFitnessSavingUpdater" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveUpdater.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveUpdater.3 index 262d87ced..a0e7c74e9 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveUpdater.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoArchiveUpdater.3 @@ -1,4 +1,4 @@ -.TH "moeoArchiveUpdater" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoArchiveUpdater" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoBM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoBM.3 index c21bc9aaf..dfa636828 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoBM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoBM.3 @@ -1,4 +1,4 @@ -.TH "moeoBM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoBM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -12,6 +12,8 @@ moeoBM \- Base class for binary metrics. .PP Inherits \fBeoBF< A1, A2, R >< A1, A2, R >\fP, and \fBmoeoMetric\fP. .PP +Inherited by \fBmoeoSolutionVsSolutionBM< EOT, R, EOFitness >\fP, \fBmoeoVectorVsSolutionBM< EOT, R, EOFitness >\fP, \fBmoeoVectorVsVectorBM< EOT, R, EOFitness >\fP, and \fBmoeoVectorVsVectorBM< EOT, double >\fP. +.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoBinaryMetricSavingUpdater.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoBinaryMetricSavingUpdater.3 index 901f8f0c9..a296fd8d2 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoBinaryMetricSavingUpdater.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoBinaryMetricSavingUpdater.3 @@ -1,4 +1,4 @@ -.TH "moeoBinaryMetricSavingUpdater" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoBinaryMetricSavingUpdater" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoCombinedMOLS.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoCombinedMOLS.3 index eda165f13..c9f97bdc9 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoCombinedMOLS.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoCombinedMOLS.3 @@ -1,4 +1,4 @@ -.TH "moeoCombinedMOLS" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoCombinedMOLS" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoContributionMetric.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoContributionMetric.3 index cbbab0abd..c4c472986 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoContributionMetric.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoContributionMetric.3 @@ -1,4 +1,4 @@ -.TH "moeoContributionMetric" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoContributionMetric" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoDisctinctElitistReplacement.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoDisctinctElitistReplacement.3 index b58df9e51..2388951f9 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoDisctinctElitistReplacement.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoDisctinctElitistReplacement.3 @@ -1,4 +1,4 @@ -.TH "moeoDisctinctElitistReplacement" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoDisctinctElitistReplacement" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -96,6 +96,8 @@ creation of the new population of size _size .PP Definition at line 123 of file moeoReplacement.h. .PP +References moeoDisctinctElitistReplacement< EOT, WorthT >::perf2worth, and eoPop< EOT >::swap(). +.PP Referenced by moeoDisctinctElitistReplacement< EOT, WorthT >::operator()(). .SH "Author" diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoElitistReplacement.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoElitistReplacement.3 index e5b0a1910..5e1c4777d 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoElitistReplacement.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoElitistReplacement.3 @@ -1,4 +1,4 @@ -.TH "moeoElitistReplacement" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoElitistReplacement" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoEntropyMetric.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoEntropyMetric.3 index e2d44babb..2cf1583d5 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoEntropyMetric.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoEntropyMetric.3 @@ -1,4 +1,4 @@ -.TH "moeoEntropyMetric" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoEntropyMetric" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoHybridMOLS.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoHybridMOLS.3 index 47f81460a..a417ee37f 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoHybridMOLS.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoHybridMOLS.3 @@ -1,4 +1,4 @@ -.TH "moeoHybridMOLS" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoHybridMOLS" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoMOLS.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoMOLS.3 index dfa2f3f69..95a92aa15 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoMOLS.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoMOLS.3 @@ -1,4 +1,4 @@ -.TH "moeoMOLS" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoMOLS" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoMetric.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoMetric.3 index a289fd2cf..9a698fee7 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoMetric.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoMetric.3 @@ -1,4 +1,4 @@ -.TH "moeoMetric" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoMetric" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -12,7 +12,7 @@ moeoMetric \- Base class for performance metrics (also called quality indicators .PP Inherits \fBeoFunctorBase\fP. .PP -Inherited by \fBmoeoBM< A1, A2, R >\fP, \fBmoeoBM< const EOFitness &, const EOFitness &, R >\fP, \fBmoeoBM< const std::vector< EOFitness > &, const EOFitness &, R >\fP, \fBmoeoBM< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >\fP, \fBmoeoBM< const std::vector< typename EOT::Fitness > &, const std::vector< typename EOT::Fitness > &, double >\fP, \fBmoeoUM< A, R >\fP, \fBmoeoUM< const EOFitness &, R >\fP, and \fBmoeoUM< const std::vector< EOFitness > &, R >\fP. +Inherited by \fBmoeoBM< A1, A2, R >\fP, \fBmoeoBM< const const EOFitness &, EOFitness &, R >\fP, \fBmoeoBM< const const std::vector< EOFitness > &, EOFitness &, R >\fP, \fBmoeoBM< const const std::vector< EOFitness > &, std::vector< EOFitness > &, R >\fP, \fBmoeoBM< const const std::vector< typename EOT::Fitness > &, std::vector< typename EOT::Fitness > &, double >\fP, \fBmoeoUM< A, R >\fP, \fBmoeoUM< const EOFitness &, R >\fP, and \fBmoeoUM< const std::vector< EOFitness > &, R >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II.3 index ec0ae9e42..ef0618944 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II.3 @@ -1,8 +1,8 @@ -.TH "moeoNDSorting_II" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoNDSorting_II" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME -moeoNDSorting_II \- Fast Elitist Non-Dominant Sorting Genetic Algorithm. +moeoNDSorting_II \- Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie Note : This is a corrected version of the original \fBeoNDSorting_II\fP class. .PP .SH SYNOPSIS @@ -18,6 +18,7 @@ Inherits \fBeoNDSorting< EOT >< EOT >\fP. .ti -1c .RI "typedef std::pair< double, unsigned > \fBdouble_index_pair\fP" .br +.RI "\fIindex pair \fP" .in -1c .SS "Public Member Functions" @@ -25,6 +26,7 @@ Inherits \fBeoNDSorting< EOT >< EOT >\fP. .ti -1c .RI "\fBmoeoNDSorting_II\fP (bool nasty_flag_=false)" .br +.RI "\fIconstructor \fP" .ti -1c .RI "std::vector< double > \fBniche_penalty\fP (const std::vector< unsigned > &_cf, const \fBeoPop\fP< EOT > &_pop)" .br @@ -36,15 +38,14 @@ Inherits \fBeoNDSorting< EOT >< EOT >\fP. .ti -1c .RI "class \fBcompare_nodes\fP" .br +.RI "\fIA class to compare the nodes. \fP" .in -1c .SH "Detailed Description" .PP .SS "template class moeoNDSorting_II< EOT >" -Fast Elitist Non-Dominant Sorting Genetic Algorithm. +Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie Note : This is a corrected version of the original \fBeoNDSorting_II\fP class. -Note : This is a corrected version of the original \fBeoNDSorting_II\fP class -.PP \fBSee also:\fP .RS 4 \fBeoNDSorting_II\fP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II_compare_nodes.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II_compare_nodes.3 index beb952c10..735dd97b3 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II_compare_nodes.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoNDSorting_II_compare_nodes.3 @@ -1,25 +1,29 @@ -.TH "moeoNDSorting_II::compare_nodes" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoNDSorting_II::compare_nodes" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME -moeoNDSorting_II::compare_nodes \- +moeoNDSorting_II::compare_nodes \- A class to compare the nodes. + +.PP .SH SYNOPSIS .br .PP +\fC#include \fP +.PP .SS "Public Member Functions" .in +1c .ti -1c -.RI "bool \fBoperator()\fP (const \fBdouble_index_pair\fP &a, const \fBdouble_index_pair\fP &b) const " +.RI "bool \fBoperator()\fP (const \fBdouble_index_pair\fP &a, const \fBdouble_index_pair\fP &b) const" .br .in -1c .SH "Detailed Description" .PP .SS "template class moeoNDSorting_II< EOT >::compare_nodes" - +A class to compare the nodes. .PP -Definition at line 34 of file moeoNDSorting.h. +Definition at line 46 of file moeoNDSorting.h. .SH "Author" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoNSGA_II.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoNSGA_II.3 index 7a3d3c8ca..34da46cda 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoNSGA_II.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoNSGA_II.3 @@ -1,4 +1,4 @@ -.TH "moeoNSGA_II" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoNSGA_II" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -88,7 +88,7 @@ Deb, K., S. Agrawal, A. Pratap, and T. Meyarivan, A fast elitist non-dominated s .PP .PP -Definition at line 45 of file moeoNSGA_II.h. +Definition at line 46 of file moeoNSGA_II.h. .SH "Author" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoReplacement.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoReplacement.3 index b2fcc1b99..4c7f876c6 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoReplacement.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoReplacement.3 @@ -1,4 +1,4 @@ -.TH "moeoReplacement" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoReplacement" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoSelectOneFromPopAndArch.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoSelectOneFromPopAndArch.3 index b259334a4..6bd2ec495 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoSelectOneFromPopAndArch.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoSelectOneFromPopAndArch.3 @@ -1,4 +1,4 @@ -.TH "moeoSelectOneFromPopAndArch" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoSelectOneFromPopAndArch" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionUM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionUM.3 index dac1de48e..bbbdd40a7 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionUM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionUM.3 @@ -1,4 +1,4 @@ -.TH "moeoSolutionUM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoSolutionUM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionVsSolutionBM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionVsSolutionBM.3 index b02007d4d..1ba173f99 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionVsSolutionBM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoSolutionVsSolutionBM.3 @@ -1,4 +1,4 @@ -.TH "moeoSolutionVsSolutionBM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoSolutionVsSolutionBM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moeoSolutionVsSolutionBM \- Base class for binary metrics dedicated to the perfo .PP \fC#include \fP .PP -Inherits \fBmoeoBM< const EOFitness &, const EOFitness &, R >\fP. +Inherits \fBmoeoBM< A1, A2, R >< const const EOFitness &, EOFitness &, R >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoUM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoUM.3 index a7a8055c7..42fbb8089 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoUM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoUM.3 @@ -1,4 +1,4 @@ -.TH "moeoUM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoUM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoVectorUM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoVectorUM.3 index 678e0e28a..441effd9a 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoVectorUM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoVectorUM.3 @@ -1,4 +1,4 @@ -.TH "moeoVectorUM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoVectorUM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsSolutionBM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsSolutionBM.3 index c662bc944..0159f5e27 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsSolutionBM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsSolutionBM.3 @@ -1,4 +1,4 @@ -.TH "moeoVectorVsSolutionBM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoVectorVsSolutionBM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moeoVectorVsSolutionBM \- Base class for binary metrics dedicated to the perform .PP \fC#include \fP .PP -Inherits \fBmoeoBM< const std::vector< EOFitness > &, const EOFitness &, R >\fP. +Inherits \fBmoeoBM< A1, A2, R >< const const std::vector< EOFitness > &, EOFitness &, R >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsVectorBM.3 b/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsVectorBM.3 index 2504f5beb..5a782680d 100644 --- a/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsVectorBM.3 +++ b/trunk/paradiseo-moeo/docs/man/man3/moeoVectorVsVectorBM.3 @@ -1,4 +1,4 @@ -.TH "moeoVectorVsVectorBM" 3 "22 Dec 2006" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- +.TH "moeoVectorVsVectorBM" 3 "15 Jan 2007" "Version 0.1" "ParadisEO-MOEO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moeoVectorVsVectorBM \- Base class for binary metrics dedicated to the performan .PP \fC#include \fP .PP -Inherits \fBmoeoBM< const std::vector< EOFitness > &, const std::vector< EOFitness > &, R >\fP. +Inherits \fBmoeoBM< A1, A2, R >< const const std::vector< EOFitness > &, std::vector< EOFitness > &, R >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-moeo/docs/moeo.doxyfile b/trunk/paradiseo-moeo/docs/moeo.doxyfile index 779bac049..5b8de0c70 100644 --- a/trunk/paradiseo-moeo/docs/moeo.doxyfile +++ b/trunk/paradiseo-moeo/docs/moeo.doxyfile @@ -199,7 +199,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = "../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html" "../../paradiseo-mo/docs/mo.doxytag=../../../paradiseo-mo/docs/html" +TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../paradiseo-eo/doc/doc/html GENERATE_TAGFILE = moeo.doxytag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES diff --git a/trunk/paradiseo-moeo/src/moeoNDSorting.h b/trunk/paradiseo-moeo/src/moeoNDSorting.h index 926c763f0..8cd7c4aa6 100644 --- a/trunk/paradiseo-moeo/src/moeoNDSorting.h +++ b/trunk/paradiseo-moeo/src/moeoNDSorting.h @@ -1,12 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -/* ----------------------------------------------------------------------------- - moeoNDSorting.h - (c) Deneche Abdelhakim, 2006 +//----------------------------------------------------------------------------- +// moeoNDSorting.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... - Contact: paradiseo-help@lists.gforge.inria.fr -*/ -//------------------------------------------------------------------------------ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef moeoNDSorting_h #define moeoNDSorting_h @@ -14,78 +16,93 @@ #include #include -# define INF 1.0e14 // DBL_MAX +# define INF 1.0e14 // DBL_MAX -/** @brief Fast Elitist Non-Dominant Sorting Genetic Algorithm - - Note : This is a corrected version of the original eoNDSorting_II class - . - @see eoNDSorting_II -*/ -template -class moeoNDSorting_II : public eoNDSorting +/** + * Fast Elitist Non-Dominant Sorting Genetic Algorithm assignment strategie + * Note : This is a corrected version of the original eoNDSorting_II class + * @see eoNDSorting_II + */ +template < class EOT > class moeoNDSorting_II:public eoNDSorting < EOT > { - public: +public: - moeoNDSorting_II(bool nasty_flag_ = false) : eoNDSorting(nasty_flag_) {} + /** + * constructor + */ +moeoNDSorting_II (bool nasty_flag_ = false):eoNDSorting < EOT > + (nasty_flag_) + { + } - typedef std::pair double_index_pair; + /** + * index pair + */ + typedef std::pair < double, unsigned >double_index_pair; + /** + * A class to compare the nodes + */ class compare_nodes { - public : - bool operator()(const double_index_pair& a, const double_index_pair& b) const + public:bool operator () (const double_index_pair & a, + const double_index_pair & b) const { return a.first < b.first; } }; /// _cf points into the elements that consist of the current front - std::vector niche_penalty(const std::vector& _cf, const eoPop& _pop) + std::vector < double >niche_penalty (const std::vector < unsigned >&_cf, + const eoPop < EOT > &_pop) { typedef typename EOT::Fitness::fitness_traits traits; unsigned i; - std::vector niche_count(_cf.size(), 0.); + std::vector < double >niche_count (_cf.size (), 0.); - unsigned nObjectives = traits::nObjectives(); //_pop[_cf[0]].fitness().size(); + unsigned nObjectives = traits::nObjectives (); //_pop[_cf[0]].fitness().size(); for (unsigned o = 0; o < nObjectives; ++o) - { - std::vector > performance(_cf.size()); - for (i =0; i < _cf.size(); ++i) { - performance[i].first = _pop[_cf[i]].fitness()[o]; - performance[i].second = i; + std::vector < std::pair < double, + unsigned > >performance (_cf.size ()); + for (i = 0; i < _cf.size (); ++i) + { + performance[i].first = _pop[_cf[i]].fitness ()[o]; + performance[i].second = i; + } + + std::sort (performance.begin (), performance.end (), compare_nodes ()); // a lambda operator would've been nice here + + // set boundary at INF (so it will get chosen over all the others + niche_count[performance[0].second] = INF; + niche_count[performance.back ().second] = INF; + + if (performance[0].first != performance.back ().first) + { + for (i = 1; i < _cf.size () - 1; ++i) + { + if (niche_count[performance[i].second] != INF) + { + niche_count[performance[i].second] += + (performance[i + 1].first - + performance[i - + 1].first) / (performance.back ().first - + performance[0].first); + } + } + } } - std::sort(performance.begin(), performance.end(), compare_nodes()); // a lambda operator would've been nice here + // transform niche_count into penality + for (i = 0; i < niche_count.size (); ++i) + { + niche_count[i] = INF - niche_count[i]; + } - // set boundary at INF (so it will get chosen over all the others - niche_count[performance[0].second] = INF; - niche_count[performance.back().second] = INF; - - if (performance[0].first != performance.back().first) - { - for (i = 1; i < _cf.size()-1; ++i) - { - if (niche_count[performance[i].second] != INF) - { - niche_count[performance[i].second] += (performance[i+1].first - performance[i-1].first)/ - (performance.back().first-performance[0].first); - } - } - } - } - - // transform niche_count into penality - for (i = 0; i < niche_count.size(); ++i) - { - niche_count[i] = INF - niche_count[i]; - } - - return niche_count; + return niche_count; } -}; +}; #endif diff --git a/trunk/paradiseo-moeo/src/moeoNSGA_II.h b/trunk/paradiseo-moeo/src/moeoNSGA_II.h index 5fb3c3c7d..07f19f0a8 100644 --- a/trunk/paradiseo-moeo/src/moeoNSGA_II.h +++ b/trunk/paradiseo-moeo/src/moeoNSGA_II.h @@ -28,7 +28,8 @@ /** */ -template class moeoNSGA_II: public eoAlgo { +template < class EOT > class moeoNSGA_II:public eoAlgo < EOT > +{ public: /** @@ -42,89 +43,64 @@ public: @param _op variation operator */ - moeoNSGA_II( - unsigned _max_gen, - eoEvalFunc& _eval, - eoGenOp& _op - ): continuator(*(new eoGenContinue(_max_gen))), - eval(_eval), - loopEval(_eval), - popEval(loopEval), - selectOne(sorting, 2), // binary tournament selection - replace(sorting), - genBreed(selectOne, _op), - breed(genBreed) - {} + moeoNSGA_II (unsigned _max_gen, eoEvalFunc < EOT > &_eval, eoGenOp < EOT > &_op):continuator (*(new eoGenContinue < EOT > (_max_gen))), eval (_eval), loopEval (_eval), popEval (loopEval), selectOne (sorting, 2), // binary tournament selection + replace (sorting), genBreed (selectOne, _op), breed (genBreed) + { + } - /// Ctor taking _max_gen, crossover and mutation - moeoNSGA_II( - unsigned _max_gen, - eoEvalFunc& _eval, - eoQuadOp& crossover, - double pCross, - eoMonOp& mutation, - double pMut - ): continuator(*(new eoGenContinue(_max_gen))), - eval(_eval), - loopEval(_eval), - popEval(loopEval), - selectOne(sorting, 2), // binary tournament selection - replace(sorting), - genBreed(selectOne, *new eoSGAGenOp(crossover, pCross, mutation, pMut)), - breed(genBreed) - {} + /// Ctor taking _max_gen, crossover and mutation + moeoNSGA_II (unsigned _max_gen, eoEvalFunc < EOT > &_eval, eoQuadOp < EOT > &crossover, double pCross, eoMonOp < EOT > &mutation, double pMut):continuator (*(new eoGenContinue < EOT > (_max_gen))), eval (_eval), loopEval (_eval), popEval (loopEval), selectOne (sorting, 2), // binary tournament selection + + replace (sorting), + genBreed (selectOne, + *new eoSGAGenOp < EOT > (crossover, pCross, mutation, pMut)), + breed (genBreed) + { + } - /// Ctor taking a continuator instead of _gen_max - moeoNSGA_II( - eoContinue& _continuator, - eoEvalFunc& _eval, - eoGenOp& _op - ): - continuator(_continuator), - eval (_eval), - loopEval(_eval), - popEval(loopEval), - selectOne(sorting, 2), // binary tournament selection - replace(sorting), - genBreed(selectOne, _op), - breed(genBreed) - {} + /// Ctor taking a continuator instead of _gen_max +moeoNSGA_II (eoContinue < EOT > &_continuator, eoEvalFunc < EOT > &_eval, eoGenOp < EOT > &_op): + continuator (_continuator), eval (_eval), loopEval (_eval), popEval (loopEval), selectOne (sorting, 2), // binary tournament selection + replace (sorting), genBreed (selectOne, _op), breed (genBreed) + { + } - ///Apply a few generation of evolution to the population. - virtual void operator()(eoPop& _pop) - { - eoPop offspring, empty_pop; - popEval(empty_pop, _pop); // a first eval of _pop - do - { - // generate offspring, worths are recalculated if necessary - breed(_pop, offspring); - - // eval of offspring - popEval(_pop, offspring); + ///Apply a few generation of evolution to the population. + virtual void operator () (eoPop < EOT > &_pop) + { + eoPop < EOT > offspring, empty_pop; + popEval (empty_pop, _pop); // a first eval of _pop + do + { + // generate offspring, worths are recalculated if necessary + breed (_pop, offspring); - // after replace, the new pop is in _pop. Worths are recalculated if necessary - replace(_pop, offspring); - - } while (continuator(_pop)); - } + // 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)); + } protected: - eoContinue& continuator; - - eoEvalFunc& eval; - eoPopLoopEval loopEval; + eoContinue < EOT > &continuator; - eoPopEvalFunc& popEval; - - /// NSGAII sorting - moeoNDSorting_II sorting; - /// Binary tournament selection - eoDetTournamentWorthSelect selectOne; - /// Elitist replacement - moeoElitistReplacement replace; - eoGeneralBreeder genBreed; - eoBreed& breed; + eoEvalFunc < EOT > &eval; + eoPopLoopEval < EOT > loopEval; + + eoPopEvalFunc < EOT > &popEval; + + /// NSGAII sorting + moeoNDSorting_II < EOT > sorting; + /// Binary tournament selection + eoDetTournamentWorthSelect < EOT > selectOne; + /// Elitist replacement + moeoElitistReplacement < EOT > replace; + eoGeneralBreeder < EOT > genBreed; + eoBreed < EOT > &breed; }; #endif diff --git a/trunk/paradiseo-moeo/src/old/make_algo_MOEO.h b/trunk/paradiseo-moeo/src/old/make_algo_MOEO.h index 46af0756c..fc7ab9322 100644 --- a/trunk/paradiseo-moeo/src/old/make_algo_MOEO.h +++ b/trunk/paradiseo-moeo/src/old/make_algo_MOEO.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "make_algo_MOEO.h" +//----------------------------------------------------------------------------- +// make_algo_MOEO.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, June 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _make_algo_MOEO_h #define _make_algo_MOEO_h @@ -29,10 +18,10 @@ #include "utils/eoState.h" // selections #include "eoNDSorting.h" -#include "eoIBEA.h" -#include "eoBinaryQualityIndicator.h" +#include "old/moeoIBEA.h" +#include "old/moeoBinaryQualityIndicator.h" #include "eoParetoRanking.h" -#include "eoParetoSharing.h" +#include "moeoParetoSharing.h" #include "eoSelectFromWorth.h" #include "moeoSelectOneFromPopAndArch.h" // replacements @@ -88,21 +77,22 @@ template < class EOT > p2w = new eoNDSorting_I < EOT > (nicheSize); else if (selStr == string ("NSGA-II")) // NSGA-II p2w = new eoNDSorting_II < EOT > (); - /* - else if (selStr == string("IBEA")) { // IBEA - // the binary quality indicator - eoBinaryQualityIndicator* I; - if (indStr == string("Epsilon")) - I = new eoAdditiveBinaryEpsilonIndicator; - else if (indStr == string("Hypervolume")) - I = new eoBinaryHypervolumeIndicator(rho); - else { - string stmp = string("Invalid binary quality indicator (for IBEA): ") + indStr; - throw std::runtime_error(stmp.c_str()); - } - p2w = new eoIBEASorting(I, kappa); - } - */ + else if (selStr == string ("IBEA")) + { // IBEA + // the binary quality indicator + moeoBinaryQualityIndicator < EOFitness > *I; + if (indStr == string ("Epsilon")) + I = new moeoAdditiveBinaryEpsilonIndicator < EOFitness >; + else if (indStr == string ("Hypervolume")) + I = new moeoBinaryHypervolumeIndicator < EOFitness > (rho); + else + { + string stmp = + string ("Invalid binary quality indicator (for IBEA): ") + indStr; + throw std::runtime_error (stmp.c_str ()); + } + p2w = new moeoIBEASorting < EOT > (I, kappa); + } else if (selStr == string ("ParetoRanking")) { // Pareto Ranking eoDominanceMap < EOT > &dominance = @@ -111,7 +101,7 @@ template < class EOT > } else if (selStr == string ("ParetoSharing")) { // Pareto Sharing - p2w = new eoParetoSharing < EOT > (nicheSize); + p2w = new moeoParetoSharing < EOT > (nicheSize); } else { @@ -221,11 +211,17 @@ template < class EOT > 'R', "Evolution Engine").value (); eoReplacement < EOT > *replace; if (repStr == string ("Plus")) // Plus - replace = new moeoElitistReplacement < EOT, double >(*p2w); + { + replace = new moeoElitistReplacement < EOT, double >(*p2w); + } else if (repStr == string ("DistinctPlus")) // DistinctPlus - replace = new moeoDisctinctElitistReplacement < EOT, double >(*p2w); + { + replace = new moeoDisctinctElitistReplacement < EOT, double >(*p2w); + } else if (repStr == string ("Generational")) // Generational - replace = new eoGenerationalReplacement < EOT >; + { + replace = new eoGenerationalReplacement < EOT >; + } else { string stmp = string ("Invalid replacement: ") + repStr; @@ -242,7 +238,7 @@ template < class EOT > eoGeneralBreeder < EOT > *breed = new eoGeneralBreeder < EOT > (*select, _op, offspringRateParam.value ()); _state.storeFunctor (breed); - + // the eoEasyEA eoAlgo < EOT > *algo = new eoEasyEA < EOT > (_continue, _eval, *breed, *replace); diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShop.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShop.h index 284804b0a..df533b4df 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShop.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShop.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShop.h" +//----------------------------------------------------------------------------- +// FlowShop.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, April 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShop_h #define _FlowShop_h diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopBenchmarkParser.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopBenchmarkParser.h index 3b13d9872..f0e36d8fd 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopBenchmarkParser.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopBenchmarkParser.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopBenchmarkParser.h" +//----------------------------------------------------------------------------- +// FlowShopBenchmarkParser.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopBenchmarkParser_h #define _FlowShopBenchmarkParser_h @@ -38,7 +27,8 @@ const static * Class to handle parameters of a flow-shop instance from a benchmark file * benchmark files are available at www.lifl.fr/~basseur/BenchsUncertain/ */ -class FlowShopBenchmarkParser +class + FlowShopBenchmarkParser { public: @@ -74,7 +64,8 @@ public: * the processing times */ const - std::vector < std::vector < unsigned > > + std::vector < + std::vector < unsigned > > getP () { return p; @@ -144,9 +135,11 @@ private: void init (const string _benchmarkFileName) { - string buffer; + string + buffer; string::size_type start, end; - ifstream inputFile (_benchmarkFileName.data (), ios::in); + ifstream + inputFile (_benchmarkFileName.data (), ios::in); // opening of the benchmark file if (!inputFile) cerr << "*** ERROR : Unable to open the benchmark file '" << @@ -161,7 +154,7 @@ private: getline (inputFile, buffer, '\n'); // processing times and due-dates p = std::vector < std::vector < unsigned > > (M, N); - d = std::vector < unsigned > (N); + d = std::vector < unsigned >(N); // for each job... for (unsigned j = 0; j < N; j++) { diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEA.cpp b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEA.cpp index b22742025..3f9dbf3ee 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEA.cpp +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEA.cpp @@ -1,26 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopEA.cpp" - -// (c) OPAC Team, LIFL, October 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ +//----------------------------------------------------------------------------- +// FlowShopEA.cpp +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- // Miscilaneous include and declaration using namespace std; diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEval.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEval.h index a974d8fc4..10754ccaf 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEval.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopEval.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopEval.h" +//----------------------------------------------------------------------------- +// FlowShopEval.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopEval_h #define _FlowShopEval_h @@ -63,7 +52,7 @@ public: * computation of the multi-objective evaluation of an eoFlowShop object * @param FlowShop & _eo the FlowShop object to evaluate */ - void operator () (FlowShop & _eo) + void operator () (FlowShop & _eo) { FlowShopFitness fitness; fitness[0] = tardiness (_eo); @@ -82,9 +71,9 @@ private: /** number of jobs */ unsigned N; /** p[i][j] = processing time of job j on machine i */ - std::vector < std::vector < unsigned > > p; + std::vector < std::vector < unsigned > >p; /** d[j] = due-date of the job j */ - std::vector < unsigned > d; + std::vector < unsigned >d; @@ -98,7 +87,7 @@ private: vector < unsigned >scheduling = _eo.getScheduling (); // completion times computation for each job on each machine // C[i][j] = completion of the jth job of the scheduling on the ith machine - std::vector < std::vector < unsigned > > C = completionTime (_eo); + std::vector < std::vector < unsigned > >C = completionTime (_eo); // fitness == C[M-1][scheduling[N-1]]; return C[M - 1][scheduling[N - 1]]; } @@ -115,7 +104,7 @@ private: vector < unsigned >scheduling = _eo.getScheduling (); // completion times computation for each job on each machine // C[i][j] = completion of the jth job of the scheduling on the ith machine - std::vector < std::vector < unsigned > > C = completionTime (_eo); + std::vector < std::vector < unsigned > >C = completionTime (_eo); // tardiness computation unsigned long sum = 0; for (unsigned j = 0; j < N; j++) @@ -134,10 +123,10 @@ private: * C[i][j] = completion of the jth job of the scheduling on the ith machine * @param const FlowShop _eo the genotype to evaluate */ - std::vector < std::vector < unsigned > > completionTime (FlowShop _eo) + std::vector < std::vector < unsigned > >completionTime (FlowShop _eo) { - vector < unsigned > scheduling = _eo.getScheduling (); - std::vector < std::vector < unsigned > > C (M, N); + vector < unsigned >scheduling = _eo.getScheduling (); + std::vector < std::vector < unsigned > >C (M, N); C[0][scheduling[0]] = p[0][scheduling[0]]; for (unsigned j = 1; j < N; j++) C[0][scheduling[j]] = C[0][scheduling[j - 1]] + p[0][scheduling[j]]; diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopFitness.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopFitness.h index 10ae5cc01..e9094bd86 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopFitness.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopFitness.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopFitness.h" +//----------------------------------------------------------------------------- +// FlowShopFitness.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopFitness_h #define _FlowShopFitness_h diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopInit.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopInit.h index a72329195..616b52c39 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopInit.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopInit.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopInit.h" +//----------------------------------------------------------------------------- +// FlowShopInit.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopInit_h #define _FlowShopInit_h @@ -49,7 +38,7 @@ public: * randomize a genotype * @param FlowShop & _genotype a genotype that has been default-constructed */ - void operator () (FlowShop & _genotype) + void operator () (FlowShop & _genotype) { // scheduling vector vector < unsigned >scheduling (N); diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpCrossoverQuad.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpCrossoverQuad.h index 40d1e247d..c755664c4 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpCrossoverQuad.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpCrossoverQuad.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopOpCrossoverQuad.h" +//----------------------------------------------------------------------------- +// FlowShopOpCrossoverQuad.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, April 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopOpCrossoverQuad_h #define _FlowShopOpCrossoverQuad_h @@ -55,7 +44,7 @@ public: * @param FlowShop & _genotype1 the first parent * @param FlowShop & _genotype2 the second parent */ - bool operator () (FlowShop & _genotype1, FlowShop & _genotype2) + bool operator () (FlowShop & _genotype1, FlowShop & _genotype2) { bool oneAtLeastIsModified; diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationExchange.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationExchange.h index 13626313f..af9ded0d8 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationExchange.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationExchange.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopOpMutationExchange.h" +//----------------------------------------------------------------------------- +// FlowShopOpMutationExchange.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopOpMutationExchange_h #define _FlowShopOpMutationExchange_h @@ -55,7 +44,7 @@ public: * modifies the parent with an exchange mutation * @param FlowShop & _genotype the parent genotype (will be modified) */ - bool operator () (FlowShop & _genotype) + bool operator () (FlowShop & _genotype) { bool isModified; diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationShift.h b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationShift.h index a392c21f2..77ce5ec84 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationShift.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/FlowShopOpMutationShift.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "FlowShopOpMutationShift.h" +//----------------------------------------------------------------------------- +// FlowShopOpMutationShift.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _FlowShopOpMutationShift_h #define _FlowShopOpMutationShift_h @@ -55,7 +44,7 @@ public: * modifies the parent with a shift mutation * @param FlowShop & _genotype the parent genotype (will be modified) */ - bool operator () (FlowShop & _genotype) + bool operator () (FlowShop & _genotype) { bool isModified; int direction; diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/make_eval_FlowShop.h b/trunk/paradiseo-moeo/tutorials/lesson1/make_eval_FlowShop.h index 339ffec88..3ab17dc1d 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/make_eval_FlowShop.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/make_eval_FlowShop.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "make_eval_FlowShop.h" +//----------------------------------------------------------------------------- +// make_eval_FlowShop.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _make_eval_FlowShop_h #define _make_eval_FlowShop_h @@ -59,7 +48,7 @@ eoEvalFuncCounter < FlowShop > &do_make_eval (eoParser & _parser, FlowShopBenchmarkParser fParser (benchmarkFileName); unsigned M = fParser.getM (); unsigned N = fParser.getN (); - std::vector < std::vector < unsigned > > p = fParser.getP (); + std::vector < std::vector < unsigned > >p = fParser.getP (); std::vector < unsigned >d = fParser.getD (); // build of the initializer (a pointer, stored in the eoState) diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/make_genotype_FlowShop.h b/trunk/paradiseo-moeo/tutorials/lesson1/make_genotype_FlowShop.h index 33355f10e..771377183 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/make_genotype_FlowShop.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/make_genotype_FlowShop.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "make_genotype_FlowShop.h" +//----------------------------------------------------------------------------- +// make_genotype_FlowShop.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _make_genotype_FlowShop_h #define _make_genotype_FlowShop_h diff --git a/trunk/paradiseo-moeo/tutorials/lesson1/make_op_FlowShop.h b/trunk/paradiseo-moeo/tutorials/lesson1/make_op_FlowShop.h index be35884f3..6581838f1 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson1/make_op_FlowShop.h +++ b/trunk/paradiseo-moeo/tutorials/lesson1/make_op_FlowShop.h @@ -1,25 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "make_op_FlowShop.h" +//----------------------------------------------------------------------------- +// make_op_FlowShop.h +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... -// (c) OPAC Team, LIFL, March 2006 - -/* This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: Arnaud.Liefooghe@lifl.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- #ifndef _make_op_FlowShop_h #define _make_op_FlowShop_h diff --git a/trunk/paradiseo-moeo/tutorials/lesson2/Makefile.am b/trunk/paradiseo-moeo/tutorials/lesson2/Makefile.am index ee9b121d9..086363914 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson2/Makefile.am +++ b/trunk/paradiseo-moeo/tutorials/lesson2/Makefile.am @@ -1,7 +1,7 @@ noinst_PROGRAMS = Sch1 -Sch1_SOURCES = Sch1.cpp +Sch1_SOURCES = Sch1.cpp LDADD = -L$(top_builddir)/src ${EO_DIR}/src/libeo.a ${EO_DIR}/src/utils/libeoutils.a diff --git a/trunk/paradiseo-moeo/tutorials/lesson2/Sch1.cpp b/trunk/paradiseo-moeo/tutorials/lesson2/Sch1.cpp index 54255e60e..612a55128 100644 --- a/trunk/paradiseo-moeo/tutorials/lesson2/Sch1.cpp +++ b/trunk/paradiseo-moeo/tutorials/lesson2/Sch1.cpp @@ -1,9 +1,14 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -/* (c) OPAC Team, LIFL, October 2006 +//----------------------------------------------------------------------------- +// Sch1.cpp +// (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2006 +/* + This library... - Contact: paradiseo-help@lists.gforge.inria.fr -*/ + Contact: paradiseo-help@lists.gforge.inria.fr, http://paradiseo.gforge.inria.fr + */ +//----------------------------------------------------------------------------- using namespace std; @@ -13,81 +18,92 @@ using namespace std; #include #include -/* ParadisEO-MOEO */ +/* ParadisEO-MOEO */ #include #include // Extend eoParetoFitnessTraits -class SCH1Traits : public eoParetoFitnessTraits +class SCH1Traits:public eoParetoFitnessTraits { -public : -static bool maximizing(int i) { return false; } // is the i-th objective -static unsigned nObjectives() { return 2;} // number of objectives + public:static bool maximizing (int i) + { + return false; + } // is the i-th objective + static unsigned nObjectives () + { + return 2; + } // number of objectives }; // Code decision variables -typedef eoParetoFitness SCH1Fit; +typedef eoParetoFitness < SCH1Traits > SCH1Fit; -class SCH1EO : public eoReal +class SCH1EO:public eoReal < SCH1Fit > { public: - SCH1EO(): eoReal(1) - {} -}; - -// evaluation of the individuals -class SCH1Eval : public eoEvalFunc -{ -public: - SCH1Eval(): eoEvalFunc() - {} - - void operator()(SCH1EO & _eo) { - SCH1Fit fitness; - double x = _eo[0]; - - fitness[0] = x*x; - fitness[1] = (x-2.0)*(x-2.0); - - _eo.fitness(fitness); + SCH1EO ():eoReal < SCH1Fit > (1) + { } }; -int main(int argc, char* argv[]) { +// evaluation of the individuals +class SCH1Eval:public eoEvalFunc < SCH1EO > +{ +public: + SCH1Eval ():eoEvalFunc < SCH1EO > () + { + } - unsigned POP_SIZE = 20; - unsigned MAX_GEN = 100; - double M_EPSILON = 0.01; - double P_CROSS = 0.25; - double P_MUT = 0.35; + void operator () (SCH1EO & _eo) + { + SCH1Fit fitness; + double x = _eo[0]; - // The fitness evaluation - SCH1Eval eval; + fitness[0] = x * x; + fitness[1] = (x - 2.0) * (x - 2.0); - // choose crossover and mutation - eoQuadCloneOp xover; - eoUniformMutation mutation(M_EPSILON); - - // generate initial population - eoRealVectorBounds bounds(1, 0.0, 2.0); // [0, 2] - eoRealInitBounded init(bounds); - eoPop pop(POP_SIZE, init); + _eo.fitness (fitness); + } +}; - // pass parameters to NSGA2 - moeoNSGA_II nsga2(MAX_GEN, eval, xover, P_CROSS, mutation, P_MUT); +int +main (int argc, char *argv[]) +{ - // run the algo - nsga2(pop); + unsigned POP_SIZE = 20; + unsigned MAX_GEN = 100; + double M_EPSILON = 0.01; + double P_CROSS = 0.25; + double P_MUT = 0.35; - // extract first front of the final population (this is the solution of nsga2) - moeoArchive arch; - arch.update(pop); + // The fitness evaluation + SCH1Eval eval; + + // choose crossover and mutation + eoQuadCloneOp < SCH1EO > xover; + eoUniformMutation < SCH1EO > mutation (M_EPSILON); + + // generate initial population + eoRealVectorBounds bounds (1, 0.0, 2.0); // [0, 2] + eoRealInitBounded < SCH1EO > init (bounds); + eoPop < SCH1EO > pop (POP_SIZE, init); + + // pass parameters to NSGA2 + moeoNSGA_II < SCH1EO > nsga2 (MAX_GEN, eval, xover, P_CROSS, mutation, + P_MUT); + + // run the algo + nsga2 (pop); + + // extract first front of the final population (this is the solution of nsga2) + moeoArchive < SCH1EO > arch; + arch.update (pop); + + // printing of the final archive + cout << "Final Archive\n"; + arch.sortedPrintOn (cout); + cout << endl; - // printing of the final archive - cout << "Final Archive\n"; - arch.sortedPrintOn(cout); - cout << endl; - return EXIT_SUCCESS; }