Adding files in es for ES Crossovers

eo/src/es.h

@@ -47,6 +47,9 @@
 // general operators
 #include <es/eoRealOp.h>
 #include <es/eoNormalMutation.h>
+#include <es/eoRealAtomXover.h>	// for generic operators
+#include <es/eoEsGlobalXover.h> // Global ES Xover
+#include <es/eoEsLocalXover.h> // Local ES Xover
 
 // the ES-mutations
 #include <es/eoEsMutationInit.h>

eo/src/es/Makefile.am

@@ -16,4 +16,4 @@ libes_a_SOURCES = make_algo_scalar_real.cpp make_checkpoint_real.cpp \
 CPPFLAGS = -Wall
 CXXFLAGS = -g
 libeoincdir = $(includedir)/eo/es
-libeoinc_HEADERS = eoEsChromInit.h eoEsFull.h eoEsMutate.h eoEsMutationInit.h eoEsSimple.h eoEsStdev.h  eoEsStdevXOver.h eoGenericRealOp.h eoNormalMutation.h eoReal.h eoRealOp.h eoEsGlobalXover.h eoEsLocalXover.h
+libeoinc_HEADERS = eoEsChromInit.h eoEsFull.h eoEsMutate.h eoEsMutationInit.h eoEsSimple.h eoEsStdev.h  eoEsStdevXOver.h eoGenericRealOp.h eoNormalMutation.h eoReal.h eoRealOp.h eoEsGlobalXover.h eoEsLocalXover.h eoRealAtomXover.h

eo/src/es/eoRealAtomXover.h

@@ -0,0 +1,94 @@
+/** -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- 
+
+//-----------------------------------------------------------------------------
+// eoRealAtomXover.h : helper classes for vector<real> crossover
+// (c) Marc Schoenauer 2001
+
+    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: marc.schoenauer@polytechnique.fr http://eeaax.cmap.polytchnique.fr/
+ */
+//-----------------------------------------------------------------------------
+
+/** Some basic atomic crossovers for doubles
+ *
+ * Are used in all ES specifici crossovers
+ * and will be in more general stuff, using the generic crossovers
+ */
+
+#ifndef _eoRealAtomXover_H
+#define _eoRealAtomXover_H
+
+#include <utils/eoRNG.h>
+
+#include <eoOp.h>
+
+/** 
+  Discrete crossover == exchange of values
+*/
+class eoRealAtomExchange: public eoBinOp<double>
+{
+public:
+  /**
+   * (Default) Constructor.
+   */
+  eoRealAtomExchange() {}
+
+  /// The class name. Used to display statistics
+  virtual string className() const { return "eoRealAtomExchange"; }
+
+  /**
+     Exchanges or not the values
+   */
+  bool operator()(double& r1, const double& r2) 
+  {
+    if (eo::rng.flip())
+      if (r1 != r2)	   // if r1 == r2 you must return false
+	{
+	  r1 = r2;
+	  return true;
+	}
+    return false;
+  }
+  
+};
+
+/** 
+  Intermediate crossover == linear combination
+*/
+class eoRealIntermediate: public eoBinOp<double>
+{
+public:
+  /**
+   * (Default) Constructor.
+   */
+  eoRealIntermediate() {}
+
+  /// The class name. Used to display statistics
+  virtual string className() const { return "eoRealIntermediate"; }
+
+  /**
+     Linear combination of both parents
+   */
+  bool operator()(double& r1, const double& r2) 
+  {
+    double alpha = eo::rng.uniform();
+    r1 = alpha * r2 + (1-alpha) * r1;
+    return true;
+  }
+  
+};
+
+#endif