THe big eoReplacement update:

The interface for eoReplacement is now eoPop<EOT>&, eoPop<EOT>&
(i.e. no const) and the result must be in the first argument in the end.

Hence it is possible to do SSGA and all intermediate replacmeent procedures

The classes derived from eoMergeReduce.h are now in a separate file
The SSGA-like replcaement procedures are in eoReduceMerge.h
A more general replacement can be found in eoSurviveAndDie.h
(it could be made a littel more general - still open for upgrades).

Also some accessors have been added to the eoPop (best and worse individuals)

And include file eo has been updated

eo/src/eoMergeReduce.h

@@ -0,0 +1,98 @@
+/** -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+
+   -----------------------------------------------------------------------------
+   eoMergeReduce.h 
+   (c) Maarten Keijzer, GeNeura Team, 2000
+ 
+   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: todos@geneura.ugr.es, http://geneura.ugr.es
+ */
+//-----------------------------------------------------------------------------
+
+#ifndef _eoMergeReduce_h
+#define _eoMergeReduce_h
+
+
+//-----------------------------------------------------------------------------
+#include <eoPop.h>
+#include <eoFunctor.h>
+#include <eoMerge.h>
+#include <eoReduce.h>
+#include <eoReplacement.h>
+#include <utils/eoHowMany.h>
+//-----------------------------------------------------------------------------
+/** 
+Replacement strategies that combine en eoMerge and an eoReduce.
+
+@classes: eoMergeReduce, the base (pure abstract) class
+          eoPlusReplacement the ES plus strategy
+	  eoCommaReplacement the ES comma strategy
+*/
+
+/**
+eoMergeReduce: abstract replacement strategy that is just an application of 
+an embedded merge, followed by an embedded reduce
+*/
+template <class EOT>
+class eoMergeReduce : public eoReplacement<EOT>
+{
+    public:
+        eoMergeReduce(eoMerge<EOT>& _merge, eoReduce<EOT>& _reduce) :
+        merge(_merge), reduce(_reduce)
+        {}
+
+        void operator()(eoPop<EOT>& _parents, eoPop<EOT>& _offspring)
+        {
+            merge(_parents, _offspring); // parents untouched, result in offspring
+            reduce(_offspring, _parents.size());
+	    _parents.swap(_offspring);
+        }
+
+    private :
+        eoMerge<EOT>& merge;
+        eoReduce<EOT>& reduce;
+};
+
+/**
+ES type of replacement strategy: first add parents to population, then truncate
+*/
+template <class EOT>
+class eoPlusReplacement : public eoMergeReduce<EOT>
+{
+    public :
+        eoPlusReplacement() : eoMergeReduce<EOT>(plus, truncate) {}
+
+    private :
+        eoPlus<EOT> plus;
+        eoTruncate<EOT> truncate;
+};
+
+/**
+ES type of replacement strategy: ignore parents, truncate offspring
+*/
+template <class EOT>
+class eoCommaReplacement : public eoMergeReduce<EOT>
+{
+    public :
+        eoCommaReplacement() : eoMergeReduce<EOT>(no_elite, truncate) {}
+
+    private :
+        eoNoElitism<EOT> no_elite;
+        eoTruncate<EOT> truncate;
+};
+
+
+#endif