All files in es directory was modified to use relative #includes

eo/src/es/CMAParams.cpp

@@ -43,8 +43,8 @@
  *   Version 2.23.
  *                               */
 
-#include <es/CMAParams.h>
+#include "CMAParams.h"
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
 
 #include <string>
 

eo/src/es/CMAState.cpp

@@ -56,12 +56,11 @@
 #include <iostream>
 #include <cassert>
 
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
-
+#include "CMAState.h"
-#include <es/CMAState.h>
+#include "CMAParams.h"
-#include <es/CMAParams.h>
+#include "matrices.h"
-#include <es/matrices.h>
+#include "eig.h"
-#include <es/eig.h>
 
 using namespace std;
 

eo/src/es/eoCMABreed.h

@@ -25,9 +25,9 @@
 #ifndef _EOCMABREED_H
 #define _EOCMABREED_H
 
-#include <eoBreed.h>
+#include "../eoBreed.h"
-#include <eoVector.h>
+#include "../eoVector.h"
-#include <es/CMAState.h>
+#include "CMAState.h"
 
 #include <algorithm>
 

eo/src/es/eoCMAInit.h

@@ -28,9 +28,9 @@
 #ifndef _EOCMAINIT_H
 #define _EOCMAINIT_H
 
-#include <eoInit.h>
+#include "../eoInit.h"
-#include <eoVector.h>
+#include "../eoVector.h"
-#include <es/CMAState.h>
+#include "CMAState.h"
 
 /// @todo handle bounds
 template <class FitT>

eo/src/es/eoEsChromInit.h

@@ -29,10 +29,10 @@ Contact: http://eodev.sourceforge.net
 #include <cmath>
 #include <vector>
 
-#include <es/eoRealInitBounded.h>
+#include "eoRealInitBounded.h"
-#include <es/eoEsSimple.h>
+#include "eoEsSimple.h"
-#include <es/eoEsStdev.h>
+#include "eoEsStdev.h"
-#include <es/eoEsFull.h>
+#include "eoEsFull.h"
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795

eo/src/es/eoEsFull.h

@@ -27,7 +27,7 @@
 #ifndef _eoEsFull_h
 #define _eoEsFull_h
 
-#include <eoVector.h>
+#include "../eoVector.h"
 
 /**
 \ingroup Real

eo/src/es/eoEsGlobalXover.h

@@ -26,15 +26,15 @@
 #ifndef _eoEsGlobalXover_H
 #define _eoEsGlobalXover_H
 
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
 
-#include <es/eoEsSimple.h>
+#include "eoEsSimple.h"
-#include <es/eoEsStdev.h>
+#include "eoEsStdev.h"
-#include <es/eoEsFull.h>
+#include "eoEsFull.h"
 
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
 // needs a selector - here random
-#include <eoRandomSelect.h>
+#include "../eoRandomSelect.h"
 
 /** Global crossover operator for ES genotypes.
   *  Uses some Atom crossovers to handle both the object variables

eo/src/es/eoEsMutate.h

@@ -30,14 +30,14 @@
 #define _EOESMUTATE_H
 
 #include <cmath>
-#include <eoInit.h>
+#include "../eoInit.h"
-#include <eoOp.h>
+#include "../eoOp.h"
-#include <es/eoEsMutationInit.h>
+#include "eoEsMutationInit.h"
-#include <es/eoEsSimple.h>
+#include "eoEsSimple.h"
-#include <es/eoEsStdev.h>
+#include "eoEsStdev.h"
-#include <es/eoEsFull.h>
+#include "eoEsFull.h"
-#include <utils/eoRealBounds.h>
+#include "../utils/eoRealBounds.h"
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795
@@ -158,7 +158,7 @@ public:
       Diploma Thesis, University of Dortmund, 1990.
     */
     virtual bool operator()( eoEsFull<FitT> & _eo )
-    // Code originally from Thomas Bäck
+    // Code originally from Thomas B<EFBFBD>ck
         {
             // First: mutate standard deviations (as for eoEsStdev<FitT>).
             double global = TauGlb * rng.normal();
@@ -268,7 +268,7 @@ public:
     lower bound. The actual value used is somewhat arbitrary and the is no
     theoretical reasoning known for it (Sep 2005).
 
-    The code that we have in EO is a port from a C code that Thomas Bäck kindly
+    The code that we have in EO is a port from a C code that Thomas B<EFBFBD>ck kindly
     donated to the community some years ago. It has been modified by Marc
     Schoenauer for inclusion in EvolC, than by Maarten Keijzer into EO. The
     exact value was adjusted based on practice.

eo/src/es/eoEsMutationInit.h

@@ -27,7 +27,7 @@
 #ifndef _eoEsMutationInit_h
 #define _eoEsMutationInit_h
 
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
 
 /** Initialize Mutation operator
 

eo/src/es/eoEsSimple.h

@@ -23,10 +23,10 @@ Contact: http://eodev.sourceforge.net
 #ifndef _eoEsSimple_h
 #define _eoEsSimple_h
 
-#include <EO.h>
+#include "../EO.h"
 #include <vector>
 
-#include <eoVector.h>
+#include "../eoVector.h"
 
 /** Simple Evolution Strategy
 

eo/src/es/eoEsStandardXover.h

@@ -26,15 +26,15 @@
 #ifndef _eoEsLocalXover_H
 #define _eoEsLocalXover_H
 
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
 
-#include <es/eoEsSimple.h>
+#include "eoEsSimple.h"
-#include <es/eoEsStdev.h>
+#include "eoEsStdev.h"
-#include <es/eoEsFull.h>
+#include "eoEsFull.h"
 
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
 // needs a selector - here random
-#include <eoRandomSelect.h>
+#include "../eoRandomSelect.h"
 
 /** Standard (i.e. eoBinOp) crossover operator for ES genotypes.
  *  Uses some Atom crossovers to handle both the object variables

eo/src/es/eoEsStdev.h

@@ -23,7 +23,7 @@ Contact: http://eodev.sourceforge.net
 #ifndef _eoEsStdev_h
 #define _eoEsStdev_h
 
-#include <eoVector.h>
+#include "../eoVector.h"
 
 
 /** Evolutionary Strategy with a standard deviation per parameter

eo/src/es/eoNormalMutation.h

@@ -29,11 +29,11 @@
 //-----------------------------------------------------------------------------
 
 #include <algorithm>    // swap_ranges
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
-#include <utils/eoUpdatable.h>
+#include "../utils/eoUpdatable.h"
-#include <eoEvalFunc.h>
+#include "../eoEvalFunc.h"
-#include <es/eoReal.h>
+#include "eoReal.h"
-#include <utils/eoRealBounds.h>
+#include "../utils/eoRealBounds.h"
 //-----------------------------------------------------------------------------
 
 /** Simple normal mutation of a std::vector of real values.

eo/src/es/eoReal.h

@@ -29,7 +29,7 @@
 #include <iostream>    // std::ostream, std::istream
 #include <string>      // std::string
 
-#include <eoVector.h>
+#include "../eoVector.h"
 
 /** eoReal: implementation of simple real-valued chromosome.
   * based on eoVector class

eo/src/es/eoRealAtomXover.h

@@ -31,9 +31,9 @@
 #ifndef _eoRealAtomXover_H
 #define _eoRealAtomXover_H
 
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
 
-#include <eoOp.h>
+#include "../eoOp.h"
 
 /**
   Discrete crossover == exchange of values

eo/src/es/eoRealInitBounded.h

@@ -28,10 +28,10 @@
 
 //-----------------------------------------------------------------------------
 
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
-#include <eoInit.h>
+#include "../eoInit.h"
-#include <es/eoReal.h>
+#include "eoReal.h"
-#include <utils/eoRealVectorBounds.h>
+#include "../utils/eoRealVectorBounds.h"
 
 /** Simple initialization for any EOT that derives from std::vector<double>
  *    uniformly in some bounds

eo/src/es/eoRealOp.h

@@ -29,9 +29,9 @@
 //-----------------------------------------------------------------------------
 
 #include <algorithm>    // swap_ranges
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
-#include <es/eoReal.h>
+#include "eoReal.h"
-#include <utils/eoRealVectorBounds.h>
+#include "../utils/eoRealVectorBounds.h"
 
 //-----------------------------------------------------------------------------
 

eo/src/es/eoSBXcross.h

@@ -24,11 +24,11 @@
 //-----------------------------------------------------------------------------
 
 #include <algorithm>    // swap_ranges
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
-#include <es/eoReal.h>
+#include "eoReal.h"
-#include <utils/eoRealBounds.h>
+#include "../utils/eoRealBounds.h"
-#include <utils/eoRealVectorBounds.h>
+#include "../utils/eoRealVectorBounds.h"
 
 
 

eo/src/es/make_algo_scalar_es.cpp

@@ -41,11 +41,11 @@
  */
 
 // The templatized code
-#include <do/make_algo_scalar.h>
+#include "../do/make_algo_scalar.h"
 // the instanciating EOType(s)
-#include <es/eoEsSimple.h>         // one Sigma per individual
+#include "eoEsSimple.h"         // one Sigma per individual
-#include <es/eoEsStdev.h>          // one sigmal per object variable
+#include "eoEsStdev.h"          // one sigmal per object variable
-#include <es/eoEsFull.h>           // full correlation matrix per indi
+#include "eoEsFull.h"           // full correlation matrix per indi
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_algo_scalar_real.cpp

@@ -41,9 +41,9 @@
  */
 
 // The templatized code
-#include <do/make_algo_scalar.h>
+#include "../do/make_algo_scalar.h"
 // the instanciating EOType
-#include <es/eoReal.h>
+#include "eoReal.h"
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_checkpoint_es.cpp

@@ -41,11 +41,11 @@
  */
 
 // The templatized code
-#include <do/make_checkpoint.h>
+#include "../do/make_checkpoint.h"
 // the instanciating EOType(s)
-#include <es/eoEsSimple.h>         // one Sigma per individual
+#include "eoEsSimple.h"         // one Sigma per individual
-#include <es/eoEsStdev.h>          // one sigmal per object variable
+#include "eoEsStdev.h"          // one sigmal per object variable
-#include <es/eoEsFull.h>           // full correlation matrix per indi
+#include "eoEsFull.h"           // full correlation matrix per indi
 
 /// The following function merely call the templatized do_* functions
 

eo/src/es/make_checkpoint_real.cpp

@@ -41,9 +41,9 @@
  */
 
 // The templatized code
-#include <do/make_checkpoint.h>
+#include "../do/make_checkpoint.h"
 // the instanciating EOType
-#include <es/eoReal.h>
+#include "eoReal.h"
 
 /// The following function merely call the templatized do_* functions
 

eo/src/es/make_continue_es.cpp

@@ -41,11 +41,11 @@
  */
 
 // The templatized code
-#include <do/make_continue.h>
+#include "../do/make_continue.h"
 // the instanciating EOType(s)
-#include <es/eoEsSimple.h>         // one Sigma per individual
+#include "eoEsSimple.h"         // one Sigma per individual
-#include <es/eoEsStdev.h>          // one sigmal per object variable
+#include "eoEsStdev.h"          // one sigmal per object variable
-#include <es/eoEsFull.h>           // full correlation matrix per indi
+#include "eoEsFull.h"           // full correlation matrix per indi
 
 /// The following function merely call the templatized do_* functions
 

eo/src/es/make_continue_real.cpp

@@ -41,9 +41,9 @@
  */
 
 // The templatized code
-#include <do/make_continue.h>
+#include "../do/make_continue.h"
 // the instanciating EOType
-#include <es/eoReal.h>
+#include "eoReal.h"
 
 /// The following function merely call the templatized do_* functions
 

eo/src/es/make_es.h

@@ -44,23 +44,23 @@
 #ifndef es_h
 #define es_h
 
-#include <eoAlgo.h>
+#include "../eoAlgo.h"
-#include <eoScalarFitness.h>
+#include "../eoScalarFitness.h"
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
-#include <eoEvalFuncPtr.h>
+#include "../eoEvalFuncPtr.h"
-#include <eoEvalFuncCounter.h>
+#include "../eoEvalFuncCounter.h"
-#include <utils/eoCheckPoint.h>
+#include "../utils/eoCheckPoint.h"
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
-#include <eoPop.h>
+#include "../eoPop.h"
-#include <utils/eoDistance.h>
+#include "../utils/eoDistance.h"
 
-#include <es/eoEsSimple.h>         // one Sigma per individual
+#include "eoEsSimple.h"         // one Sigma per individual
-#include <es/eoEsStdev.h>          // one sigmal per object variable
+#include "eoEsStdev.h"          // one sigmal per object variable
-#include <es/eoEsFull.h>           // full correlation matrix per indi
+#include "eoEsFull.h"           // full correlation matrix per indi
 
 // include all similar declaration for eoReal - i.e. real-valued genotyes
 // without self-adaptation
-#include <es/make_real.h>
+#include "make_real.h"
 
 /** @addtogroup Builders
  * @{

eo/src/es/make_genotype_es.cpp

@@ -54,7 +54,7 @@ the default ctor of EOT, resulting in most cases in an EOT that is
 */
 
 // the templatized code (same for real and es here)
-#include <es/make_genotype_real.h>
+#include "make_genotype_real.h"
 
 
 /// The following function merely call the templatized do_* functions

eo/src/es/make_genotype_real.cpp

@@ -53,7 +53,7 @@
 */
 
 // the templatized code
-#include <es/make_genotype_real.h>
+#include "make_genotype_real.h"
 
 /// The following functions merely call the templatized do_* functions
 eoRealInitBounded<eoReal<double> > & make_genotype(eoParser& _parser,

eo/src/es/make_genotype_real.h

@@ -28,11 +28,11 @@ Contact: http://eodev.sourceforge.net
 #include <sstream>
 #include <vector>
 
-#include "es/eoReal.h"
+#include "eoReal.h"
-#include "es/eoEsChromInit.h"
+#include "eoEsChromInit.h"
-#include "utils/eoParser.h"
+#include "../utils/eoParser.h"
-#include "utils/eoRealVectorBounds.h"
+#include "../utils/eoRealVectorBounds.h"
-#include "utils/eoState.h"
+#include "../utils/eoState.h"
 
 
 /** @addtogroup Builders

eo/src/es/make_op.h

@@ -28,21 +28,21 @@
 #define _make_op_h
 
 // the operators
-#include <eoOp.h>
+#include "../eoOp.h"
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
-#include <eoCloneOps.h>
+#include "../eoCloneOps.h"
-#include <eoOpContainer.h>
+#include "../eoOpContainer.h"
 // combinations of simple eoOps (eoMonOp and eoQuadOp)
-#include <eoProportionalCombinedOp.h>
+#include "../eoProportionalCombinedOp.h"
 
 // the specialized Real stuff
-#include <es/eoReal.h>
+#include "eoReal.h"
-#include <es/eoRealInitBounded.h>
+#include "eoRealInitBounded.h"
-#include <es/eoRealOp.h>
+#include "eoRealOp.h"
-#include <es/eoNormalMutation.h>
+#include "eoNormalMutation.h"
   // also need the parser and param includes
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
-#include <utils/eoState.h>
+#include "../utils/eoState.h"
 
 
 /** @addtogroup Builders

eo/src/es/make_op_es.cpp

@@ -42,7 +42,7 @@
  */
 
 // Templatized code
-#include <es/make_op_es.h>
+#include "make_op_es.h"
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_op_es.h

@@ -24,24 +24,24 @@ Contact: http://eodev.sourceforge.net
 #define EO_make_op_h
 
 // the operators
-#include <eoOp.h>
+#include "../eoOp.h"
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
-#include <eoCloneOps.h>
+#include "../eoCloneOps.h"
-#include <eoOpContainer.h>
+#include "../eoOpContainer.h"
 // combinations of simple eoOps (eoMonOp and eoQuadOp)
-#include <eoProportionalCombinedOp.h>
+#include "../eoProportionalCombinedOp.h"
 
 // the specialized Real stuff
-#include <es/eoReal.h>
+#include "eoReal.h"
-#include <es/eoRealAtomXover.h>
+#include "eoRealAtomXover.h"
-#include <es/eoEsChromInit.h>
+#include "eoEsChromInit.h"
-#include <es/eoEsMutationInit.h>
+#include "eoEsMutationInit.h"
-#include <es/eoEsMutate.h>
+#include "eoEsMutate.h"
-#include <es/eoEsGlobalXover.h>
+#include "eoEsGlobalXover.h"
-#include <es/eoEsStandardXover.h>
+#include "eoEsStandardXover.h"
   // also need the parser and param includes
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
-#include <utils/eoState.h>
+#include "../utils/eoState.h"
 
 
 /** @addtogroup Builders

eo/src/es/make_op_real.cpp

@@ -42,7 +42,7 @@
  */
 
 // Templatized code
-#include <es/make_op_real.h>
+#include "make_op_real.h"
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_op_real.h

@@ -28,21 +28,21 @@
 #define _make_op_h
 
 // the operators
-#include <eoOp.h>
+#include "../eoOp.h"
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
-#include <eoCloneOps.h>
+#include "../eoCloneOps.h"
-#include <eoOpContainer.h>
+#include "../eoOpContainer.h"
 // combinations of simple eoOps (eoMonOp and eoQuadOp)
-#include <eoProportionalCombinedOp.h>
+#include "../eoProportionalCombinedOp.h"
 
 // the specialized Real stuff
-#include <es/eoReal.h>
+#include "../es/eoReal.h"
-#include <es/eoEsChromInit.h>
+#include "../es/eoEsChromInit.h"
-#include <es/eoRealOp.h>
+#include "../es/eoRealOp.h"
-#include <es/eoNormalMutation.h>
+#include "../es/eoNormalMutation.h"
   // also need the parser and param includes
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
-#include <utils/eoState.h>
+#include "../utils/eoState.h"
 
 
 /** @addtogroup Builders

eo/src/es/make_pop_es.cpp

@@ -41,11 +41,11 @@
  */
 
 // The templatized code
-#include <do/make_pop.h>
+#include "../do/make_pop.h"
 // the instanciating EOType(s)
-#include <es/eoEsSimple.h>         // one Sigma per individual
+#include "eoEsSimple.h"         // one Sigma per individual
-#include <es/eoEsStdev.h>          // one sigmal per object variable
+#include "eoEsStdev.h"          // one sigmal per object variable
-#include <es/eoEsFull.h>           // full correlation matrix per indi
+#include "eoEsFull.h"           // full correlation matrix per indi
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_pop_real.cpp

@@ -41,9 +41,9 @@
  */
 
 // The templatized code
-#include <do/make_pop.h>
+#include "../do/make_pop.h"
 // the instanciating EOType
-#include <es/eoReal.h>
+#include "eoReal.h"
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_real.h

@@ -44,18 +44,18 @@
 #ifndef real_h
 #define real_h
 
-#include <eoAlgo.h>
+#include "../eoAlgo.h"
-#include <eoScalarFitness.h>
+#include "../eoScalarFitness.h"
-#include <utils/eoParser.h>
+#include "../utils/eoParser.h"
-#include <eoEvalFuncPtr.h>
+#include "../eoEvalFuncPtr.h"
-#include <eoEvalFuncCounter.h>
+#include "../eoEvalFuncCounter.h"
-#include <utils/eoCheckPoint.h>
+#include "../utils/eoCheckPoint.h"
-#include <eoGenOp.h>
+#include "../eoGenOp.h"
-#include <eoPop.h>
+#include "../eoPop.h"
-#include <utils/eoDistance.h>
+#include "../utils/eoDistance.h"
 
-#include <es/eoRealInitBounded.h>
+#include "eoRealInitBounded.h"
-#include <es/eoReal.h>
+#include "eoReal.h"
 
 //Representation dependent - rewrite everything anew for each representation
 //////////////////////////

eo/src/es/make_run_es.cpp

@@ -41,13 +41,13 @@
  */
 
 // The templatized code
-#include <do/make_run.h>
+#include"../do/make_run.h"
 // the instanciating EOType(s)
-#include <es/eoEsSimple.h>         // one Sigma per individual
+#include "eoEsSimple.h"         // one Sigma per individual
-#include <es/eoEsStdev.h>          // one sigmal per object variable
+#include "eoEsStdev.h"          // one sigmal per object variable
-#include <es/eoEsFull.h>           // full correlation matrix per indi
+#include "eoEsFull.h"           // full correlation matrix per indi
 // the instanciating fitnesses
-#include <eoScalarFitness.h>
+#include "eoScalarFitness.h"
 
 /// The following function merely call the templatized do_* functions above
 

eo/src/es/make_run_real.cpp

@@ -41,11 +41,11 @@
  */
 
 // The templatized code
-#include <do/make_run.h>
+#include "../do/make_run.h"
 // the instanciating EOType
-#include <es/eoReal.h>
+#include "eoReal.h"
 // the instanciating fitnesses
-#include <eoScalarFitness.h>
+#include "../eoScalarFitness.h"
 
 /// The following function merely call the templatized do_* functions above