From 9492ebd58eb74d93eae80e57efd058b703e74f1f Mon Sep 17 00:00:00 2001 From: evomarc Date: Tue, 9 Apr 2002 08:48:44 +0000 Subject: [PATCH] Modified the comments so they appear in doxygen doc (and updated them also) --- eo/src/eoReplacement.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/eo/src/eoReplacement.h b/eo/src/eoReplacement.h index d0b6452c..c9003331 100644 --- a/eo/src/eoReplacement.h +++ b/eo/src/eoReplacement.h @@ -37,12 +37,22 @@ //----------------------------------------------------------------------------- /** -eoReplacement: High level strategy for creating a new generation -from parents and offspring. +eoReplacement: the base class for all replacement functors. +NOTE: 2 eoPop as arguments +the resulting population should be in the first argument (replace +parents by offspring)! The second argument can contain any rubbish + +--- The eoMergeReduce, combination of eoMerge and eoReduce, can be found in file eoMergeReduce.h +The eoReduceMergeReduce that reduces the parents and the offspring, +merges the 2 reduced populations, and eventually reduces that final +population, can be found in eoReduceMergeReduce.h + +LOG +--- Removed the const before first argument: though it makes too many classes with the same interface, it allows to minimize the number of actual copies by choosing the right destination @@ -51,18 +61,12 @@ replacement gets a class of its own that only does the swap (instead of the eoNoReplacement that did nothing, relying on the algo to swap popualtions). MS 12/12/2000 -NOTE: the resulting population should always be in the first argument -(replace parents by offspring)! The second argument can contain any rubbish - @see eoMerge, eoReduce, eoMergeReduce, eoReduceMerge @classes eoReplacement, base (pure abstract) class eoGenerationalReplacement, as it says ... eoWeakElitistReplacement a wrapper to add elitism -*/ -/** -eoReplacement: the base class for all replacementp functors */ template class eoReplacement : public eoBF&, eoPop&, void>