From 152d42d41ec56013d7e07cc5c18d5f7eff0f96bd Mon Sep 17 00:00:00 2001
From: mac <mac>
Date: Tue, 13 Jun 2000 09:43:34 +0000
Subject: [PATCH] Removed eoEsBase and created an eoFixedLength

---
 eo/src/{es/eoEsBase.h => eoFixedLength.h} | 20 ++++++++++----------
 eo/src/es/eoEsFull.h                      |  6 +++---
 eo/src/es/eoEsMutate.h                    |  2 +-
 eo/src/es/eoEsSimple.h                    |  6 +++---
 eo/src/es/eoEsStdev.h                     |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)
 rename eo/src/{es/eoEsBase.h => eoFixedLength.h} (74%)

diff --git a/eo/src/es/eoEsBase.h b/eo/src/eoFixedLength.h
similarity index 74%
rename from eo/src/es/eoEsBase.h
rename to eo/src/eoFixedLength.h
index 5bca18a2..d2affe70 100644
--- a/eo/src/es/eoEsBase.h
+++ b/eo/src/eoFixedLength.h
@@ -24,25 +24,25 @@
  */
 //-----------------------------------------------------------------------------
 
-#ifndef _eoEsBase_h
-#define _eoEsBase_h
+#ifndef _eoFixedLength_h
+#define _eoFixedLength_h
 
 /**
 \ingroup EvolutionStrategies
 
-  Base class for evolution strategies, just derives from EO and vector and
-  redirects the operator< to EO (fitness based comparison)
+  Base class for fixed length chromosomes, just derives from EO and vector and
+  redirects the smaller than operator to EO (fitness based comparison)
 */
 
-template <class FitT>
-class eoEsBase : public EO<FitT>, public std::vector<double>
+template <class FitT, class GeneType>
+class eoFixedLength : public EO<FitT>, public std::vector<GeneType>
 {
     public :
     
     typedef double Type;
 
     /// to avoid conflicts between EO::operator< and vector<double>::operator<
-    bool operator<(const eoEsBase<FitT>& _eo) const
+    bool operator<(const eoFixedLength<FitT, GeneType>& _eo) const
     {
         return EO<FitT>::operator<(_eo);
     }
@@ -50,10 +50,10 @@ class eoEsBase : public EO<FitT>, public std::vector<double>
 };
 
 /// to avoid conflicts between EO::operator< and vector<double>::operator<
-template <class FitT>
-bool operator<(const eoEsBase<FitT>& _eo1, const eoEsBase<FitT>& _eo2)
+template <class FitT, class GeneType>
+bool operator<(const eoFixedLength<FitT, GeneType>& _eo1, const eoFixedLength<FitT, GeneType>& _eo2)
 {
     return _eo1.operator<(_eo2);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/eo/src/es/eoEsFull.h b/eo/src/es/eoEsFull.h
index 7f154ad2..67ba3290 100644
--- a/eo/src/es/eoEsFull.h
+++ b/eo/src/es/eoEsFull.h
@@ -27,7 +27,7 @@
 #ifndef _eoEsFull_h
 #define _eoEsFull_h
 
-#include <es/eoEsBase.h>
+#include <eoFixedLength.h>
 
 /**
 \ingroup EvolutionStrategies
@@ -37,11 +37,11 @@ rates and correlated mutations.
 */
 
 template <class Fit>
-class eoEsFull : public eoEsBase<Fit>
+class eoEsFull : public eoFixedLength<Fit, double>
 {
     public :
     
-    eoEsFull(void) : eoEsBase<Fit>() {}
+    eoEsFull(void) : eoFixedLength<Fit, double>() {}
     
     std::string className(void) const { return "eoEsFull"; }
 
diff --git a/eo/src/es/eoEsMutate.h b/eo/src/es/eoEsMutate.h
index ce76bfe1..8f46d140 100644
--- a/eo/src/es/eoEsMutate.h
+++ b/eo/src/es/eoEsMutate.h
@@ -218,7 +218,7 @@ public:
     keepInBounds(_eo);
   }
 
-  void keepInBounds(eoEsBase<FitT>& _eo) const
+  void keepInBounds(eoFixedLength<FitT, double>& _eo) const
   {
       for (unsigned i = 0; i < _eo.size(); ++i)
       {
diff --git a/eo/src/es/eoEsSimple.h b/eo/src/es/eoEsSimple.h
index b93d0e58..8516dcf0 100644
--- a/eo/src/es/eoEsSimple.h
+++ b/eo/src/es/eoEsSimple.h
@@ -30,7 +30,7 @@
 #include <EO.h>
 #include <vector>
 
-#include <es/eoEsBase.h>
+#include <eoFixedLength.h>
 
 /**
 \ingroup EvolutionStrategies
@@ -44,11 +44,11 @@ see also eoEsStdev eoEsFull
 */
 
 template <class Fit>
-class eoEsSimple : public eoEsBase<Fit>
+class eoEsSimple : public eoFixedLength<Fit, double>
 {
 public :
 
-    eoEsSimple(void) : eoEsBase<Fit>() {}
+    eoEsSimple(void) : eoFixedLength<Fit, double>() {}
 
     std::string className(void) const { return "eoEsSimple"; }
 
diff --git a/eo/src/es/eoEsStdev.h b/eo/src/es/eoEsStdev.h
index 1699e02c..9c998ffd 100644
--- a/eo/src/es/eoEsStdev.h
+++ b/eo/src/es/eoEsStdev.h
@@ -27,7 +27,7 @@
 #ifndef _eoEsStdev_h
 #define _eoEsStdev_h
 
-#include <es/eoEsBase.h>
+#include <eoFixedLength.h>
 
 /**
 \ingroup EvolutionStrategies
@@ -37,11 +37,11 @@ deviations.
 */
 
 template <class Fit>
-class eoEsStdev : public eoEsBase<Fit>
+class eoEsStdev : public eoFixedLength<Fit, double>
 {
     public :
     
-    eoEsStdev(void) : eoEsBase<Fit>() {}
+    eoEsStdev(void) : eoFixedLength<Fit, double>() {}
 
     std::string className(void) const { return "eoEsStdev"; }