All header files in utils/ directory refactored to use relative includes

eo/src/utils/eoAssembledFitnessStat.h

@@ -33,8 +33,8 @@
 #ifndef _eoAssembledFitnessStat_h
 #define _eoAssembledFitnessStat_h
 
-#include <utils/eoStat.h>
-#include <eoScalarFitnessAssembled.h>
+#include "eoStat.h"
+#include "../eoScalarFitnessAssembled.h"
 
 /** @addtogroup Stats
  * @{

eo/src/utils/eoCheckPoint.h

@@ -27,10 +27,10 @@
 #ifndef _eoCheckPoint_h
 #define _eoCheckPoint_h
 
-#include <eoContinue.h>
-#include <utils/eoUpdater.h>
-#include <utils/eoMonitor.h>
-#include <utils/eoStat.h>
+#include "..eoContinue.h"
+#include "eoUpdater.h"
+#include "eoMonitor.h"
+#include "eoStat.h"
 
 /** @defgroup Checkpoints Checkpointing
  *

eo/src/utils/eoDistance.h

@@ -26,7 +26,7 @@
 #ifndef _eoDistance_H
 #define _eoDistance_H
 
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 
 /** @addtogroup Stats
  * @{

eo/src/utils/eoFDCStat.h

@@ -27,9 +27,9 @@
 #ifndef _eoFDCStat_h
 #define _eoFDCStat_h
 
-#include <utils/eoStat.h>
-#include <utils/eoDistance.h>
-#include <utils/eoFileSnapshot.h>
+#include "eoStat.h"
+#include "eoDistance.h"
+#include "eoFileSnapshot.h"
 
 /**
     The Fitness Distance Correlation computation.

eo/src/utils/eoFileMonitor.cpp

@@ -7,9 +7,9 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <utils/eoFileMonitor.h>
-#include <utils/compatibility.h>
-#include <utils/eoParam.h>
+#include "eoFileMonitor.h"
+#include "compatibility.h"
+#include "eoParam.h"
 
 using namespace std;
 

eo/src/utils/eoFileMonitor.h

@@ -31,8 +31,8 @@
 #include <fstream>
 #include <stdexcept>
 
-#include "utils/eoMonitor.h"
-#include "eoObject.h"
+#include "eoMonitor.h"
+#include "../eoObject.h"
 
 
 /** Prints statistics to file

eo/src/utils/eoFileSnapshot.h

@@ -29,9 +29,9 @@
 #include <fstream>
 #include <string>
 
-#include <utils/eoParam.h>
-#include <utils/eoMonitor.h>
-#include <eoObject.h>
+#include "eoParam.h"
+#include "eoMonitor.h"
+#include "../eoObject.h"
 
 
 /**

eo/src/utils/eoFuncPtrStat.h

@@ -1,8 +1,8 @@
 #ifndef eoFuncPtrStat_h
 #define eoFuncPtrStat_h
 
-#include <eoFunctorStore.h>
-#include <utils/eoStat.h>
+#include "../eoFunctorStore.h"
+#include "eoStat.h"
 
 
 

eo/src/utils/eoGenCounter.h

@@ -22,7 +22,7 @@
 #define _eoGenCounter_h
 
 #include <string>
-#include <utils/eoStat.h>
+#include "eoStat.h"
 
 /**
     An eoStat that simply gives the current generation index

eo/src/utils/eoGnuplot1DMonitor.cpp

@@ -29,8 +29,8 @@
 
 #include <sstream>
 
-#include "utils/eoGnuplot1DMonitor.h"
-#include "utils/eoParam.h"
+#include "eoGnuplot1DMonitor.h"
+#include "eoParam.h"
 
 
 eoMonitor& eoGnuplot1DMonitor::operator() (void)

eo/src/utils/eoGnuplot1DMonitor.h

@@ -27,10 +27,10 @@
 #include <fstream>
 #include <string>
 
-#include "eoObject.h"
-#include "utils/eoFileMonitor.h"
-#include "utils/eoGnuplot.h"
-#include "utils/pipecom.h"
+#include "../eoObject.h"
+#include "eoFileMonitor.h"
+#include "eoGnuplot.h"
+#include "pipecom.h"
 
 /** Plot eoStat
 

eo/src/utils/eoGnuplot1DSnapshot.h

@@ -32,11 +32,11 @@
 #include <sstream>
 #include <string>
 
-#include <eoObject.h>
+#include "../eoObject.h"
 #include "eoRealVectorBounds.h"
-#include <utils/pipecom.h>
-#include <utils/eoFileSnapshot.h>
-#include <utils/eoGnuplot.h>
+#include "pipecom.h"
+#include "eoFileSnapshot.h"
+#include "eoGnuplot.h"
 
 /** Plot stats through gnuplot
 

eo/src/utils/eoHowMany.h

@@ -31,7 +31,7 @@ Contact: http://eodev.sourceforge.net
 
 #include <sstream>
 
-#include <utils/eoLogger.h>
+#include "eoLogger.h"
 
 
 /** A helper class, to determine a number of individuals from another one

eo/src/utils/eoIntBounds.h

@@ -28,7 +28,7 @@
 #define _eoIntBounds_h
 
 #include <stdexcept>               // std::exceptions!
-#include <utils/eoRNG.h>
+#include "eoRNG.h"
 
 /**
 \class eoIntBounds eoIntBounds.h es/eoIntBounds.h

eo/src/utils/eoLogger.h

@@ -92,7 +92,7 @@ Caner Candan <caner.candan@thalesgroup.com>
 #include <string>
 #include <iosfwd>
 
-#include "eoObject.h"
+#include "../eoObject.h"
 #include "eoParser.h"
 
 namespace eo

eo/src/utils/eoMOFitnessStat.h

@@ -27,7 +27,7 @@
 #ifndef _eoFitnessStat_h
 #define _eoFitnessStat_h
 
-#include <utils/eoStat.h>
+#include "eoStat.h"
 
 /**
     The fitnesses of a whole population, as a vector

eo/src/utils/eoMonitor.h

@@ -27,7 +27,7 @@
 
 #include <vector>
 #include <iostream>
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 
 /** @defgroup Monitors Monitoring
  *

eo/src/utils/eoOStreamMonitor.cpp

@@ -9,10 +9,10 @@
 #include <iomanip>
 #include <ios>
 
-#include <utils/eoOStreamMonitor.h>
-#include <utils/compatibility.h>
-#include <utils/eoParam.h>
-#include <eoLogger.h>
+#include "eoOStreamMonitor.h"
+#include "compatibility.h"
+#include "eoParam.h"
+#include "eoLogger.h"
 
 //using namespace std;
 

eo/src/utils/eoOStreamMonitor.h

@@ -30,9 +30,9 @@ Authors:
 #include <string>
 #include <iostream>
 
-#include <utils/eoMonitor.h>
-#include <utils/eoLogger.h>
-#include <eoObject.h>
+#include "eoMonitor.h"
+#include "eoLogger.h"
+#include "../eoObject.h"
 
 /**
     Prints statistics to a given ostream.

eo/src/utils/eoParallel.h

@@ -31,7 +31,7 @@ Authors:
 #ifndef eoParallel_h
 #define eoParallel_h
 
-#include "eoObject.h"
+#include "../eoObject.h"
 #include "eoParser.h"
 
 /**

eo/src/utils/eoParam.h

@@ -33,7 +33,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include <eoScalarFitness.h>
+#include "../eoScalarFitness.h"
 
 /** @defgroup Parameters Parameters management
  *

eo/src/utils/eoParser.cpp

@@ -37,9 +37,9 @@ Authors:
 #include <iomanip>
 #include <cctype>
 
-#include <utils/compatibility.h>
-#include <utils/eoParser.h>
-#include <utils/eoLogger.h>
+#include "compatibility.h"
+#include "eoParser.h"
+#include "eoLogger.h"
 
 
 using namespace std;

eo/src/utils/eoParser.h

@@ -30,9 +30,9 @@ Authors:
 #include <string>
 
 #include "eoParam.h"
-#include "eoObject.h"
-#include "eoPersistent.h"
-#include "eoExceptions.h"
+#include "../eoObject.h"
+#include "../eoPersistent.h"
+#include "../eoExceptions.h"
 
 /** Parameter saving and loading
 

eo/src/utils/eoPopStat.h

@@ -35,7 +35,7 @@ that can be used to dump to the screen
 #ifndef _eoPopStat_h
 #define _eoPopStat_h
 
-#include <utils/eoStat.h>
+#include "eoStat.h"
 
 
 /** Thanks to MS/VC++, eoParam mechanism is unable to handle std::vectors of stats.

eo/src/utils/eoRNG.h

@@ -50,8 +50,9 @@ typedef unsigned long uint32_t;
 
 #include <cmath>
 #include <vector>
-#include "eoPersistent.h"
-#include "eoObject.h"
+// Relative includes
+#include "../eoPersistent.h"
+#include "../eoObject.h"
 
 
 /** Random Number Generator

eo/src/utils/eoRealBounds.h

@@ -31,7 +31,7 @@
 #include <sstream>
 #include <stdexcept>               // std::exceptions!
 
-#include <utils/eoRNG.h>
+#include "eoRNG.h"
 #include "eoLogger.h"
 
 /**

eo/src/utils/eoRealVectorBounds.h

@@ -28,8 +28,8 @@
 #define _eoRealVectorBounds_h
 
 #include <stdexcept>               // std::exceptions!
-#include <utils/eoRNG.h>
-#include <utils/eoRealBounds.h>
+#include "eoRNG.h"
+#include "eoRealBounds.h"
 
 /**
 Vector type for bounds (see eoRealBounds.h for scalar types)

eo/src/utils/eoRndGenerators.h

@@ -30,7 +30,7 @@
 #define eoRndGenerators_h
 
 #include "eoRNG.h"
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 #include <stdexcept>
 
 /** @defgroup Random Random number generation

eo/src/utils/eoScalarFitnessStat.h

@@ -27,8 +27,8 @@
 #ifndef _eoScalarFitnessStat_h
 #define _eoScalarFitnessStat_h
 
-#include <utils/eoRealVectorBounds.h>
-#include <utils/eoStat.h>
+#include "eoRealVectorBounds.h"
+#include "eoStat.h"
 
 /**
     The fitnesses of a whole population, as a std::vector

eo/src/utils/eoSignal.cpp

@@ -23,7 +23,7 @@
 	   Caner.Candan@univ-angers.fr
 */
 
-#include <utils/eoSignal.h>
+#include "eoSignal.h"
 
 /**
  * @addtogroup Continuators

eo/src/utils/eoSignal.h

@@ -27,8 +27,8 @@
 #define _eoSignal_h
 
 #include <csignal>
-#include <utils/eoCheckPoint.h>
-#include <utils/eoLogger.h>
+#include "eoCheckPoint.h"
+#include "eoLogger.h"
 
 #include <map>
 #include <vector>

eo/src/utils/eoStat.h

@@ -35,12 +35,12 @@ Contact: http://eodev.sourceforge.net
 #include <iostream>
 #include <numeric> // accumulate
 
-#include <eoFunctor.h>
-#include <utils/eoParam.h>
-#include <eoPop.h>
-#include <utils/eoMonitor.h>
-//#include <utils/eoCheckPoint.h>
-#include <utils/eoLogger.h>
+#include "../eoFunctor.h"
+#include "eoParam.h"
+#include "../eoPop.h"
+#include "eoMonitor.h"
+//#include "eoCheckPoint.h"
+#include "eoLogger.h"
 
 /** @defgroup Stats Statistics computation
  *

eo/src/utils/eoState.cpp

@@ -11,8 +11,8 @@
 #include <sstream>
 
 #include "eoState.h"
-#include "eoObject.h"
-#include "eoPersistent.h"
+#include "../eoObject.h"
+#include "../eoPersistent.h"
 
 using namespace std;
 

eo/src/utils/eoState.h

@@ -33,7 +33,7 @@
 #include <vector>
 #include <assert.h>
 
-#include <eoFunctorStore.h>
+#include "../eoFunctorStore.h"
 
 class eoObject;
 class eoPersistent;

eo/src/utils/eoStdoutMonitor.h

@@ -32,8 +32,8 @@ Authors:
 
 #include <string>
 
-#include <utils/eoOStreamMonitor.h>
-#include <eoObject.h>
+#include "eoOStreamMonitor.h"
+#include "../eoObject.h"
 
 /**
     Prints statistics to stdout

eo/src/utils/eoTimedMonitor.h

@@ -30,8 +30,8 @@
 #include <ctime>
 #include <string>
 
-#include <utils/eoMonitor.h>
-#include <eoObject.h>
+#include "eoMonitor.h"
+#include "../eoObject.h"
 
 /**
     Holds a collection of monitors and only fires them when a time limit

eo/src/utils/eoTimer.h

@@ -28,9 +28,9 @@ Authors:
 # include <vector> // std::vector
 # include <map> // std::map
 
-# include "utils/eoParallel.h" // eo::parallel
+# include "eoParallel.h" // eo::parallel
 
-# include "serial/eoSerial.h" // eo::Persistent
+# include "../serial/eoSerial.h" // eo::Persistent
 
 /**
  * @brief Timer allowing to measure time between a start point and a stop point.

eo/src/utils/eoUniformInit.h

@@ -39,7 +39,7 @@
 #define eoUniformInit_h
 
 #include "eoRNG.h"
-#include "eoInit.h"
+#include "../eoInit.h"
 #include "eoRealBounds.h"
 #include <stdexcept>
 

eo/src/utils/eoUpdatable.h

@@ -27,7 +27,7 @@
 #ifndef _eoUpdatable_h
 #define _eoUpdatable_h
 
-#include <utils/eoUpdater.h>
+#include "eoUpdater.h"
 
 /**
     eoUpdatable is a generic class for adding updatation to an existing class

eo/src/utils/eoUpdater.cpp

@@ -8,8 +8,8 @@
 
 #include <sstream>
 
-#include <utils/eoState.h>
-#include <utils/eoUpdater.h>
+#include "eoState.h"
+#include "eoUpdater.h"
 
 using namespace std;
 

eo/src/utils/eoUpdater.h

@@ -28,9 +28,9 @@
 #define _eoUpdater_h
 
 #include <string>
-#include <eoFunctor.h>
-#include <utils/eoState.h>
-#include <utils/eoParam.h>
+#include "../eoFunctor.h"
+#include "eoState.h"
+#include "eoParam.h"
 
 template <class EOT> class eoCheckPoint;
 

eo/src/utils/make_help.cpp

@@ -30,7 +30,7 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <utils/eoParser.h>
+#include "eoParser.h"
 
 using namespace std;
 

eo/src/utils/selectors.h

@@ -41,7 +41,7 @@
 #include <stdexcept>
 
 #include "eoRNG.h"
-#include <eoPop.h>
+#include "../eoPop.h"
 /**
 @addtogroup Selectors
 @{