Use relative includes in headers and absolute in code

- relative includes in headers
- absolute includes in exe code
- include sstream lib in eoExceptions.h
- fix ga/make_op_ga.cpp
- fix eoSGATransform.h

eo/src/EO.h

@@ -28,8 +28,8 @@
 //-----------------------------------------------------------------------------
 
 #include <stdexcept>       // std::runtime_error
-#include <eoObject.h>      // eoObject
-#include <eoPersistent.h>  // eoPersistent
+#include "eoObject.h"      // eoObject
+#include "eoPersistent.h"  // eoPersistent
 
 /**
     @defgroup Core Core components

eo/src/PO.h

@@ -27,7 +27,7 @@
 
 //-----------------------------------------------------------------------------
 #include <stdexcept>
-#include <EO.h>
+#include "EO.h"
 //-----------------------------------------------------------------------------
 
 /** PO inheriting from EO is specially designed for particle swarm optimization particle.POs have got a fitness,

eo/src/apply.h

@@ -26,10 +26,10 @@
 #ifndef _apply_h
 #define _apply_h
 
-#include <utils/eoParallel.h>
-#include <utils/eoParser.h>
-#include <utils/eoLogger.h>
-#include <eoFunctor.h>
+#include "utils/eoParallel.h"
+#include "utils/eoParser.h"
+#include "utils/eoLogger.h"
+#include "eoFunctor.h"
 #include <vector>
 
 #ifdef _OPENMP

eo/src/do/make_algo_easea.h

@@ -27,35 +27,35 @@
 #ifndef _make_algo_easea_h
 #define _make_algo_easea_h
 
-#include <utils/eoData.h>     // for eo_is_a_rate
+#include "../utils/eoData.h"     // for eo_is_a_rate
 // everything tha's needed for the algorithms - SCALAR fitness
 
 // Selection
 // the eoSelectOne's
-#include <eoRandomSelect.h>
-#include <eoSequentialSelect.h>
-#include <eoDetTournamentSelect.h>
-#include <eoProportionalSelect.h>
-#include <eoFitnessScalingSelect.h>
-#include <eoRankingSelect.h>
-#include <eoStochTournamentSelect.h>
+#include "../eoRandomSelect.h"
+#include "../eoSequentialSelect.h"
+#include "../eoDetTournamentSelect.h"
+#include "../eoProportionalSelect.h"
+#include "../eoFitnessScalingSelect.h"
+#include "../eoRankingSelect.h"
+#include "../eoStochTournamentSelect.h"
 // #include <eoSelect.h>    included in all others
 
 // Breeders
-#include <eoGeneralBreeder.h>
+#include "../eoGeneralBreeder.h"
 
 // Replacement
 #include "make_general_replacement.h"
-#include "eoMGGReplacement.h"
-#include "eoG3Replacement.h"
+#include "../eoMGGReplacement.h"
+#include "../eoG3Replacement.h"
 
 
 // Algorithm (only this one needed)
-#include <eoEasyEA.h>
+#include "../eoEasyEA.h"
 
   // also need the parser and param includes
-#include <utils/eoParser.h>
-#include <utils/eoState.h>
+#include "../utils/eoParser.h"
+#include "../utils/eoState.h"
 
 /*
  * This function builds the algorithm (i.e. selection and replacement)

eo/src/do/make_algo_scalar.h

@@ -27,39 +27,39 @@
 #ifndef _make_algo_scalar_h
 #define _make_algo_scalar_h
 
-#include <utils/eoData.h>     // for eo_is_a_rate
+#include "../utils/eoData.h"     // for eo_is_a_rate
 // everything tha's needed for the algorithms - SCALAR fitness
 
 // Selection
 // the eoSelectOne's
-#include <eoRandomSelect.h>
-#include <eoSequentialSelect.h>
-#include <eoDetTournamentSelect.h>
-#include <eoProportionalSelect.h>
-#include <eoFitnessScalingSelect.h>
-#include <eoRankingSelect.h>
-#include <eoStochTournamentSelect.h>
-#include <eoSharingSelect.h>
-#include <utils/eoDistance.h>
+#include "../eoRandomSelect.h"
+#include "../eoSequentialSelect.h"
+#include "../eoDetTournamentSelect.h"
+#include "../eoProportionalSelect.h"
+#include "../eoFitnessScalingSelect.h"
+#include "../eoRankingSelect.h"
+#include "../eoStochTournamentSelect.h"
+#include "../eoSharingSelect.h"
+#include "../utils/eoDistance.h"
 
 // Breeders
-#include <eoGeneralBreeder.h>
+#include "../eoGeneralBreeder.h"
 
 // Replacement
 // #include <eoReplacement.h>
-#include <eoMergeReduce.h>
-#include <eoReduceMerge.h>
-#include <eoSurviveAndDie.h>
+#include "../eoMergeReduce.h"
+#include "../eoReduceMerge.h"
+#include "../eoSurviveAndDie.h"
 
 // distance
-#include <utils/eoDistance.h>
+#include "../utils/eoDistance.h"
 
 // Algorithm (only this one needed)
-#include <eoEasyEA.h>
+#include "../eoEasyEA.h"
 
   // also need the parser and param includes
-#include <utils/eoParser.h>
-#include <utils/eoState.h>
+#include "../utils/eoParser.h"
+#include "../utils/eoState.h"
 
 
 /*

eo/src/do/make_checkpoint.h

@@ -33,11 +33,11 @@
 
 #include <climits>
 
-#include <eoScalarFitness.h>
-#include <utils/selectors.h> // for minimizing_fitness()
-#include <EO.h>
-#include <eoEvalFuncCounter.h>
-#include <utils/checkpointing>
+#include "../eoScalarFitness.h"
+#include "../utils/selectors.h" // for minimizing_fitness()
+#include "../EO.h"
+#include "../eoEvalFuncCounter.h"
+#include "../utils/checkpointing"
 
 // at the moment, in utils/make_help.cpp
 // this should become some eoUtils.cpp with corresponding eoUtils.h

eo/src/do/make_checkpoint_FDC.h

@@ -29,11 +29,11 @@
 
 #include <climits>
 
-#include <eoScalarFitness.h>
-#include <utils/selectors.h> // for minimizing_fitness()
-#include <EO.h>
-#include <eoEvalFuncCounter.h>
-#include <utils/checkpointing>
+#include "../eoScalarFitness.h"
+#include "../utils/selectors.h" // for minimizing_fitness()
+#include "../EO.h"
+#include "../eoEvalFuncCounter.h"
+#include "../utils/checkpointing"
 
 // at the moment, in utils/make_help.cpp
 // this should become some eoUtils.cpp with corresponding eoUtils.h

eo/src/do/make_checkpoint_assembled.h

@@ -38,11 +38,11 @@
 #include <vector>
 #include <string>
 
-#include <eoScalarFitnessAssembled.h>
-#include <utils/selectors.h>
-#include <EO.h>
-#include <eoEvalFuncCounter.h>
-#include <utils/checkpointing>
+#include "../eoScalarFitnessAssembled.h"
+#include "../utils/selectors.h"
+#include "../EO.h"
+#include "../eoEvalFuncCounter.h"
+#include "../utils/checkpointing"
 
 // at the moment, in utils/make_help.cpp
 // this should become some eoUtils.cpp with corresponding eoUtils.h

eo/src/do/make_continue.h

@@ -34,18 +34,18 @@ It can then be instantiated, and compiled on its own for a given EOType
 */
 
 // Continuators - all include eoContinue.h
-#include <eoCombinedContinue.h>
-#include <eoGenContinue.h>
-#include <eoSteadyFitContinue.h>
-#include <eoEvalContinue.h>
-#include <eoFitContinue.h>
+#include "../eoCombinedContinue.h"
+#include "../eoGenContinue.h"
+#include "../eoSteadyFitContinue.h"
+#include "../eoEvalContinue.h"
+#include "../eoFitContinue.h"
 #ifndef _MSC_VER
-#include <eoCtrlCContinue.h>  // CtrlC handling (using 2 global variables!)
+#include "../eoCtrlCContinue.h"  // CtrlC handling (using 2 global variables!)
 #endif
 
   // also need the parser and param includes
-#include <utils/eoParser.h>
-#include <utils/eoState.h>
+#include "../utils/eoParser.h"
+#include "../utils/eoState.h"
 
 
 /////////////////// the stopping criterion ////////////////

eo/src/do/make_general_replacement.h

@@ -27,14 +27,14 @@
 #ifndef _make_general_replacement_h
 #define _make_general_replacement_h
 
-#include <utils/eoData.h>     // for eo_is_a_rate
+#include "../utils/eoData.h"     // for eo_is_a_rate
 
 // Replacement
-#include <eoReduceMergeReduce.h>
+#include "../eoReduceMergeReduce.h"
 
 // also need the parser and param includes
-#include <utils/eoParser.h>
-#include <utils/eoState.h>
+#include "../utils/eoParser.h"
+#include "../utils/eoState.h"
 
 
 /** a helper function that decodes a parameter read by the parser into an

eo/src/do/make_pop.h

@@ -28,11 +28,11 @@
 #define _make_pop_h
 
 #include <ctime>  // for time(0) for random seeding
-#include <eoPop.h>
-#include <eoInit.h>
-#include <utils/eoRNG.h>
-#include <utils/eoParser.h>
-#include <utils/eoState.h>
+#include "../eoPop.h"
+#include "../eoInit.h"
+#include "../utils/eoRNG.h"
+#include "../utils/eoParser.h"
+#include "../utils/eoState.h"
 
 /** @defgroup Builders Automatic builders
  *

eo/src/do/make_run.h

@@ -28,7 +28,7 @@
 #define _make_run_h
 
 // Algorithm (only this one needed)
-#include <eoAlgo.h>
+#include "../eoAlgo.h"
 
 /*
  * A trivial function - only here to allow instanciation with a give EOType

eo/src/eo

@@ -33,118 +33,120 @@
 #endif
 
 // general purpose
-#include <utils/eoData.h>
-#include <eoObject.h>
-#include <eoPrintable.h>
-#include <eoPersistent.h>
-#include <eoScalarFitness.h>
-#include <eoDualFitness.h>
-#include <EO.h>
+#include "utils/eoData.h"
+#include "eoObject.h"
+#include "eoPrintable.h"
+#include "eoPersistent.h"
+#include "eoScalarFitness.h"
+#include "eoDualFitness.h"
+#include "EO.h"
 
-#include <utils/rnd_generators.h>
-#include <eoFunctor.h>
-#include <apply.h>
+#include "utils/rnd_generators.h"
+#include "eoFunctor.h"
+#include "apply.h"
 
 // eo's
-#include <eoVector.h>
+#include "eoVector.h"
 
-#include <other/eoString.h>
+#include "other/eoString.h"
 
-#include <utils/eoRndGenerators.h>
-#include <eoInit.h>
-#include <utils/eoUniformInit.h>
+#include "utils/eoRndGenerators.h"
+#include "eoInit.h"
+#include "utils/eoUniformInit.h"
 
 // the variation operators
-#include <eoOp.h>
-#include <eoGenOp.h>
-#include <eoCloneOps.h>
-#include <eoOpContainer.h>
+#include "eoOp.h"
+#include "eoGenOp.h"
+#include "eoCloneOps.h"
+#include "eoOpContainer.h"
 // combinations of simple eoOps (eoMonOp and eoQuadOp)
-#include <eoProportionalCombinedOp.h>
+#include "eoProportionalCombinedOp.h"
 // didactic (mimics SGA-like variation into an eoGenOp)
 // calls crossover and mutation sequentially,
 // with their respective mutation rates
-#include <eoSGAGenOp.h>
+#include "eoSGAGenOp.h"
 // its dual: crossover, mutation (and copy) - proportional choice
 // w.r.t. given relative weights
-#include <eoPropGAGenOp.h>
+#include "eoPropGAGenOp.h"
 
 // population
-#include <eoPop.h>
+#include "eoPop.h"
 
 // Evaluation functions (all include eoEvalFunc.h)
-#include <eoPopEvalFunc.h>
-#include <eoEvalFuncPtr.h>
-#include <eoEvalCounterThrowException.h>
-#include <eoEvalTimeThrowException.h>
-#include <eoEvalUserTimeThrowException.h>
+#include "eoPopEvalFunc.h"
+#include "eoEvalFuncPtr.h"
+#include "eoEvalCounterThrowException.h"
+#include "eoEvalTimeThrowException.h"
+#include "eoEvalUserTimeThrowException.h"
 
 // Continuators - all include eoContinue.h
-#include <eoCombinedContinue.h>
-#include <eoGenContinue.h>
-#include <eoSteadyFitContinue.h>
-#include <eoEvalContinue.h>
-#include <eoFitContinue.h>
-#include <eoPeriodicContinue.h>
-#include <eoTimeContinue.h> // added th T.Legrand
+#include "eoCombinedContinue.h"
+#include "eoGenContinue.h"
+#include "eoSteadyFitContinue.h"
+#include "eoEvalContinue.h"
+#include "eoFitContinue.h"
+#include "eoPeriodicContinue.h"
+#include "eoTimeContinue.h" // added th T.Legrand
 #ifndef _MSC_VER
-#include <eoCtrlCContinue.h>  // CtrlC handling (using 2 global variables!)
+#include "eoCtrlCContinue.h"  // CtrlC handling (using 2 global variables!)
 #endif
+
 // Selection
 // the eoSelectOne's
-#include <eoRandomSelect.h>
-#include <eoSequentialSelect.h>
-#include <eoDetTournamentSelect.h>
-#include <eoProportionalSelect.h>
-#include <eoFitnessScalingSelect.h> // also contains eoLinearFitScaling.h
-#include <eoRankingSelect.h>
-#include <eoStochTournamentSelect.h>
-#include <eoSharingSelect.h>
+#include "eoRandomSelect.h"
+#include "eoSequentialSelect.h"
+#include "eoDetTournamentSelect.h"
+#include "eoProportionalSelect.h"
+#include "eoFitnessScalingSelect.h" // also contains eoLinearFitScaling.h
+#include "eoRankingSelect.h"
+#include "eoStochTournamentSelect.h"
+#include "eoSharingSelect.h"
+
 // Embedding truncation selection
-#include <eoTruncatedSelectOne.h>
+#include "eoTruncatedSelectOne.h"
 
 // the batch selection - from an eoSelectOne
-#include <eoSelectPerc.h>
-#include <eoSelectNumber.h>
-#include <eoSelectMany.h>
-#include <eoTruncatedSelectMany.h>
+#include "eoSelectPerc.h"
+#include "eoSelectNumber.h"
+#include "eoSelectMany.h"
+#include "eoTruncatedSelectMany.h"
 
 // other batch selections
 // DetSelect can also be obtained as eoSequentialSelect, an eoSelectOne
 // (using setup and an index)
-#include <eoDetSelect.h>
-#include <eoRankMuSelect.h>
+#include "eoDetSelect.h"
+#include "eoRankMuSelect.h"
 
 // Breeders
-#include <eoGeneralBreeder.h>	// applies one eoGenOp, stop on offspring count
-// #include <eoOneToOneBreeder.h>	// parent + SINGLE offspring compete (e.g. DE) - not ready yet...
+#include "eoGeneralBreeder.h"	// applies one eoGenOp, stop on offspring count
+// #include "eoOneToOneBreeder.h"	// parent + SINGLE offspring compete (e.g. DE) - not ready yet...
 
 // Replacement
-// #include <eoReplacement.h>
-#include <eoMergeReduce.h>
-#include <eoReduceMerge.h>
-#include <eoSurviveAndDie.h>
+// #include "eoReplacement.h"
+#include "eoMergeReduce.h"
+#include "eoReduceMerge.h"
+#include "eoSurviveAndDie.h"
 
 // a simple transformer
-#include <eoSGATransform.h>
+#include "eoSGATransform.h"
 
 // Perf2Worth stuff - includes eoSelectFromWorth.h
-#include <eoNDSorting.h>
+#include "eoNDSorting.h"
 
 
 // Algorithms
-#include <eoEasyEA.h>
-#include <eoSGA.h>
-// #include <eoEvolutionStrategy.h>   removed for a while - until eoGenOp is done
+#include "eoEasyEA.h"
+#include "eoSGA.h"
+// #include "eoEvolutionStrategy.h"   removed for a while - until eoGenOp is done
 
 // Utils
-#include <utils/checkpointing>
-#include <utils/eoRealVectorBounds.h> // includes eoRealBounds.h
-#include <utils/eoIntBounds.h>        // no eoIntVectorBounds
+#include "utils/checkpointing"
+#include "utils/eoRealVectorBounds.h" // includes eoRealBounds.h
+#include "utils/eoIntBounds.h"        // no eoIntVectorBounds
 
 // aliens
-#include <other/external_eo>
-#include <eoCounter.h>
+#include "other/external_eo"
+#include "eoCounter.h"
 
 
 //-----------------------------------------------------------------------------
@@ -154,54 +156,54 @@
 /*** Particle Swarm Optimization stuff ***/
 
 // basic particle definitions
-#include <PO.h>
-#include <eoVectorParticle.h>
-#include <eoBitParticle.h>
-#include <eoRealParticle.h>
+#include "PO.h"
+#include "eoVectorParticle.h"
+#include "eoBitParticle.h"
+#include "eoRealParticle.h"
 
 // initialization
-#include <eoParticleBestInit.h>
-#include <eoInitializer.h>
+#include "eoParticleBestInit.h"
+#include "eoInitializer.h"
 
 // velocities
-#include <eoVelocity.h>
-#include <eoStandardVelocity.h>
-#include <eoExtendedVelocity.h>
-#include <eoIntegerVelocity.h>
-#include <eoConstrictedVelocity.h>
-#include <eoFixedInertiaWeightedVelocity.h>
-#include <eoVariableInertiaWeightedVelocity.h>
-#include <eoConstrictedVariableWeightVelocity.h>
+#include "eoVelocity.h"
+#include "eoStandardVelocity.h"
+#include "eoExtendedVelocity.h"
+#include "eoIntegerVelocity.h"
+#include "eoConstrictedVelocity.h"
+#include "eoFixedInertiaWeightedVelocity.h"
+#include "eoVariableInertiaWeightedVelocity.h"
+#include "eoConstrictedVariableWeightVelocity.h"
 
 // flights
-#include <eoFlight.h>
-#include <eoStandardFlight.h>
-#include <eoVelocityInit.h>
-#include <eoBinaryFlight.h>
-#include <eoSigBinaryFlight.h>
+#include "eoFlight.h"
+#include "eoStandardFlight.h"
+#include "eoVelocityInit.h"
+#include "eoBinaryFlight.h"
+#include "eoSigBinaryFlight.h"
 
 // topologies
-#include <eoTopology.h>
-#include <eoStarTopology.h>
-#include <eoLinearTopology.h>
-#include <eoRingTopology.h>
-#include <eoNeighborhood.h>
-#include <eoSocialNeighborhood.h>
+#include "eoTopology.h"
+#include "eoStarTopology.h"
+#include "eoLinearTopology.h"
+#include "eoRingTopology.h"
+#include "eoNeighborhood.h"
+#include "eoSocialNeighborhood.h"
 
 // PS algorithms
-#include <eoPSO.h>
-#include <eoEasyPSO.h>
-#include <eoSyncEasyPSO.h>
+#include "eoPSO.h"
+#include "eoEasyPSO.h"
+#include "eoSyncEasyPSO.h"
 
 // utils
-#include <eoRealBoundModifier.h>
-#include <eoRandomRealWeightUp.h>
-#include <eoWeightUpdater.h>
-#include <eoLinearDecreasingWeightUp.h>
-#include <eoGaussRealWeightUp.h>
+#include "eoRealBoundModifier.h"
+#include "eoRandomRealWeightUp.h"
+#include "eoWeightUpdater.h"
+#include "eoLinearDecreasingWeightUp.h"
+#include "eoGaussRealWeightUp.h"
 
-#include <utils/eoLogger.h>
-#include <utils/eoParallel.h>
+#include "utils/eoLogger.h"
+#include "utils/eoParallel.h"
 
 #endif
 

eo/src/eoAlgo.h

@@ -25,8 +25,8 @@
 #ifndef _EOALGO_H
 #define _EOALGO_H
 
-#include <eoPop.h>                   // for population
-#include <eoFunctor.h>
+#include "eoPop.h"     // for population
+#include "eoFunctor.h"
 
 /**
   @defgroup Algorithms Algorithms

eo/src/eoBinaryFlight.h

@@ -26,7 +26,7 @@
 #define EOBINARYFLIGHT_H
 
 //-----------------------------------------------------------------------------
-#include <eoFlight.h>
+#include "eoFlight.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoBitParticle.h

@@ -26,7 +26,7 @@
 #define _EOBITPARTICLE_H
 
 
-#include <eoVectorParticle.h>
+#include "eoVectorParticle.h"
 
 
 /** eoBitParticle: Implementation of a bit-coded particle (swarm optimization).

eo/src/eoBreed.h

@@ -27,10 +27,10 @@
 
 
 //-----------------------------------------------------------------------------
-#include <eoPop.h>
-#include <eoFunctor.h>
-#include <eoSelect.h>
-#include <eoTransform.h>
+#include "eoPop.h"
+#include "eoFunctor.h"
+#include "eoSelect.h"
+#include "eoTransform.h"
 //-----------------------------------------------------------------------------
 
 /** Breeding: combination of selecting and transforming a population

eo/src/eoCellularEasyEA.h

@@ -24,12 +24,12 @@
 #ifndef eoCellularEasyEA_h
 #define eoCellularEasyEA_h
 
-#include <eoContinue.h>
-#include <eoEvalFunc.h>
-#include <eoSelectOne.h>
-#include <eoPopEvalFunc.h>
-#include <eoAlgo.h>
-#include <eoOp.h>
+#include "eoContinue.h"
+#include "eoEvalFunc.h"
+#include "eoSelectOne.h"
+#include "eoPopEvalFunc.h"
+#include "eoAlgo.h"
+#include "eoOp.h"
 
 /**
    The abstract cellular easy algorithm.

eo/src/eoCloneOps.h

@@ -25,7 +25,7 @@
 #ifndef _eoCloneOps_H
 #define _eoCloneOps_H
 
-#include <eoOp.h>
+#include "eoOp.h"
 
 /**
  * The different null-variation operators (i.e. they do nothing)

eo/src/eoCombinedContinue.h

@@ -22,15 +22,15 @@
 Authors :
     todos@geneura.ugr.es
     Marc Schoenauer
-    Ramón Casero Cañas
-    Johann Dréo
+    Ram<EFBFBD>n Casero Ca<EFBFBD>as
+    Johann Dr<EFBFBD>o
  */
 //-----------------------------------------------------------------------------
 
 #ifndef _eoCombinedContinue_h
 #define _eoCombinedContinue_h
 
-#include <eoContinue.h>
+#include "eoContinue.h"
 
 /**
     Combined continuators - logical AND:
@@ -40,7 +40,7 @@ Authors :
              to be consistent with other Combined constructs
              and allow to easily handle more than 2 continuators
 
-02/2003 Ramón Casero Cañas - added the removeLast() method
+02/2003 Ram<EFBFBD>n Casero Ca<EFBFBD>as - added the removeLast() method
 
 @ingroup Combination
 */

eo/src/eoCombinedInit.h

@@ -25,7 +25,7 @@
 #ifndef _eoCombinedInit_h
 #define _eoCombinedInit_h
 
-#include <eoInit.h>
+#include "eoInit.h"
 
 /**
     Combined INIT: a proportional recombination of eoInit objects

eo/src/eoConstrictedVariableWeightVelocity.h

@@ -26,11 +26,11 @@
 #define EOCONSTRICTEDVARIABLEWEIGHTVELOCITY_H
 
 //-----------------------------------------------------------------------------
-#include <eoVelocity.h>
-#include <eoTopology.h>
-#include <eoWeightUpdater.h>
-#include <utils/eoRealVectorBounds.h>
-#include <eoRealBoundModifier.h>
+#include "eoVelocity.h"
+#include "eoTopology.h"
+#include "eoWeightUpdater.h"
+#include "utils/eoRealVectorBounds.h"
+#include "eoRealBoundModifier.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoConstrictedVelocity.h

@@ -27,11 +27,11 @@
 #define EOCONSTRICTEDVELOCITY_H
 
 //-----------------------------------------------------------------------------
-#include <eoFunctor.h>
-#include <utils/eoRNG.h>
-#include <eoPop.h>
-#include <utils/eoRealVectorBounds.h>
-#include <eoTopology.h>
+#include "eoFunctor.h"
+#include "utils/eoRNG.h"
+#include "eoPop.h"
+#include "utils/eoRealVectorBounds.h"
+#include "eoTopology.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoContinue.h

@@ -25,9 +25,9 @@
 #ifndef _eoContinue_h
 #define _eoContinue_h
 
-#include <eoFunctor.h>
-#include <eoPop.h>
-#include <eoPersistent.h>
+#include "eoFunctor.h"
+#include "eoPop.h"
+#include "eoPersistent.h"
 
 /** @defgroup Continuators Stopping criteria
  *

eo/src/eoCounter.h

@@ -26,9 +26,9 @@
 #ifndef _eoCounter_h
 #define _eoCounter_h
 
-#include <eoFunctor.h>
-#include <eoFunctorStore.h>
-#include <utils/eoParam.h>
+#include "eoFunctor.h"
+#include "eoFunctorStore.h"
+#include "utils/eoParam.h"
 
 /**
         Generic counter class that counts the number of times

eo/src/eoCtrlCContinue.cpp

@@ -28,7 +28,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <utils/eoLogger.h>
+#include "utils/eoLogger.h"
 
 #include <signal.h>
 #include <iostream>

eo/src/eoCtrlCContinue.h

@@ -31,7 +31,7 @@
 #define eoCtrlCContinue_h
 
 #include <csignal>
-#include <eoContinue.h>
+#include "eoContinue.h"
 
 /**
  * @addtogroup Continuators

eo/src/eoDetSelect.h

@@ -29,8 +29,8 @@
 
 
 //-----------------------------------------------------------------------------
-#include <eoSelect.h>
-#include <utils/eoHowMany.h>
+#include "eoSelect.h"
+#include "utils/eoHowMany.h"
 #include <math.h>
 //-----------------------------------------------------------------------------
 

eo/src/eoDetTournamentSelect.h

@@ -31,10 +31,10 @@
 #include <functional>  //
 #include <numeric>     // accumulate
 
-#include <eoFunctor.h>
-#include <eoPop.h>
-#include <utils/eoLogger.h>
-#include <utils/selectors.h>
+#include "eoFunctor.h"
+#include "eoPop.h"
+#include "utils/eoLogger.h"
+#include "utils/selectors.h"
 
 /** eoDetTournamentSelect: a selection method that selects ONE individual by
  deterministic tournament

eo/src/eoDistribUpdater.h

@@ -28,8 +28,8 @@
 
 #include <algorithm>
 
-#include <eoDistribution.h>
-#include <eoPop.h>
+#include "eoDistribution.h"
+#include "eoPop.h"
 
 /**
  * Base class for Distribution Evolution Algorithms within EO:

eo/src/eoDistribution.h

@@ -28,8 +28,8 @@
 
 #include <algorithm>
 
-#include <eoInit.h>
-#include <eoPop.h>
+#include "eoInit.h"
+#include "eoPop.h"
 
 /**
  * Abstract class for Distribution Evolution Algorithms within EO:

eo/src/eoDualFitness.h

@@ -31,8 +31,8 @@ Authors:
 #include <utility> // for std::pair
 #include <string>
 
-#include <utils/eoStat.h>
-#include <utils/eoLogger.h>
+#include "utils/eoStat.h"
+#include "utils/eoLogger.h"
 
 /** @addtogroup Evaluation
  * @{

eo/src/eoEDA.h

@@ -28,7 +28,7 @@
 
 //-----------------------------------------------------------------------------
 
-#include <eoDistribution.h>
+#include "eoDistribution.h"
 
 /** The abstract class for estimation of disribution algorithms.
  * This design evolve a probability distribution

eo/src/eoEasyEA.h

@@ -27,15 +27,15 @@
 
 //-----------------------------------------------------------------------------
 
-#include <apply.h>
-#include <eoAlgo.h>
-#include <eoPopEvalFunc.h>
-#include <eoContinue.h>
-#include <eoSelect.h>
-#include <eoTransform.h>
-#include <eoBreed.h>
-#include <eoMergeReduce.h>
-#include <eoReplacement.h>
+#include "apply.h"
+#include "eoAlgo.h"
+#include "eoPopEvalFunc.h"
+#include "eoContinue.h"
+#include "eoSelect.h"
+#include "eoTransform.h"
+#include "eoBreed.h"
+#include "eoMergeReduce.h"
+#include "eoReplacement.h"
 
 
 

eo/src/eoEasyPSO.h

@@ -26,10 +26,10 @@
 #define _EOEASYPSO_H
 
 //-----------------------------------------------------------------------------
-#include <eoContinue.h>
-#include <eoPSO.h>
-#include <eoVelocity.h>
-#include <eoFlight.h>
+#include "eoContinue.h"
+#include "eoPSO.h"
+#include "eoVelocity.h"
+#include "eoFlight.h"
 //-----------------------------------------------------------------------------
 
 /** An easy-to-use particle swarm algorithm.

eo/src/eoEvalContinue.h

@@ -26,8 +26,8 @@
 #ifndef _eoEvalContinue_h
 #define _eoEvalContinue_h
 
-#include <eoContinue.h>
-#include <eoEvalFuncCounter.h>
+#include "eoContinue.h"
+#include "eoEvalFuncCounter.h"
 
 /**
  * Continues until a number of evaluations has been made

eo/src/eoEvalCounterThrowException.h

@@ -26,9 +26,9 @@ Caner Candan <caner.candan@thalesgroup.com>
 #ifndef __eoEvalCounterThrowException_h__
 #define __eoEvalCounterThrowException_h__
 
-#include <eoEvalFuncCounter.h>
-#include <utils/eoParam.h>
-#include <eoExceptions.h>
+#include "eoEvalFuncCounter.h"
+#include "utils/eoParam.h"
+#include "eoExceptions.h"
 
 /*!
 Wrap an evaluation function so that an exception may be thrown when the

eo/src/eoEvalDump.h

@@ -25,7 +25,7 @@
 
 #include <fstream>
 
-#include <eoEvalFunc.h>
+#include "eoEvalFunc.h"
 
 /**
 Dump an evaluated individual to a given file.

eo/src/eoEvalFunc.h

@@ -25,7 +25,7 @@
 #ifndef eoEvalFunc_H
 #define eoEvalFunc_H
 
-#include <eoFunctor.h>
+#include "eoFunctor.h"
 
 /** @defgroup Evaluation Evaluation
  * @ingroup Operators

eo/src/eoEvalFuncCounter.h

@@ -27,8 +27,8 @@
 #ifndef eoEvalFuncCounter_H
 #define eoEvalFuncCounter_H
 
-#include <eoEvalFunc.h>
-#include <utils/eoParam.h>
+#include "eoEvalFunc.h"
+#include "utils/eoParam.h"
 
 /**
 Counts the number of evaluations actually performed.

eo/src/eoEvalFuncCounterBounder.h

@@ -1,8 +1,8 @@
 #ifndef eoEvalFuncCounterBounder_H
 #define eoEvalFuncCounterBounder_H
 
-#include <eoEvalFunc.h>
-#include <utils/eoParam.h>
+#include "eoEvalFunc.h"
+#include "utils/eoParam.h"
 
 /** @addtogroup Evaluation
  * @{

eo/src/eoEvalFuncPtr.h

@@ -28,7 +28,7 @@
 #ifndef EOEVALFUNCPTR_H
 #define EOEVALFUNCPTR_H
 
-#include <eoEvalFunc.h>
+#include "eoEvalFunc.h"
 
 /** EOEvalFuncPtr: This class
  * takes an existing function pointer and converts it into a evaluation

eo/src/eoEvalKeepBest.h

@@ -25,8 +25,8 @@
 
 #include <fstream>
 
-#include <eoEvalFunc.h>
-#include <utils/eoParam.h>
+#include "eoEvalFunc.h"
+#include "utils/eoParam.h"
 
 /**
   Evaluate with the given evaluator and keep the best individual found so far.

eo/src/eoEvalTimeThrowException.h

@@ -23,7 +23,7 @@ Johann Dréo <johann.dreo@thalesgroup.com>
 
 #include <ctime>
 
-#include <eoExceptions.h>
+#include "eoExceptions.h"
 
 /** Check at each evaluation if a given tie contract has been reached.
  *

eo/src/eoEvalUserTimeThrowException.h

@@ -38,7 +38,7 @@ Johann Dréo <johann.dreo@thalesgroup.com>
  * @ingroup Evaluation
  */
 
-#include <eoExceptions.h>
+#include "eoExceptions.h"
 
 #ifdef __unix__
 

eo/src/eoExceptions.h

@@ -26,6 +26,7 @@ Johann Dréo <johann.dreo@thalesgroup.com>
 
 #include <ctime>
 #include <stdexcept>
+#include <sstream>
 
 class eoMaxException : public std::exception {};
 

eo/src/eoExtendedVelocity.h

@@ -26,12 +26,12 @@
 #define eoExtendedVelocity_H
 
 //-----------------------------------------------------------------------------
-#include <eoFunctor.h>
-#include <utils/eoRNG.h>
-#include <eoPop.h>
-#include <utils/eoRealVectorBounds.h>
-#include <eoRealBoundModifier.h>
-#include <eoTopology.h>
+#include "eoFunctor.h"
+#include "utils/eoRNG.h"
+#include "eoPop.h"
+#include "utils/eoRealVectorBounds.h"
+#include "eoRealBoundModifier.h"
+#include "eoTopology.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoFactory.h

@@ -26,12 +26,12 @@
 #define _EOFACTORY_H
 
 //-----------------------------------------------------------------------------
-#include <eoObject.h>
+#include "eoObject.h"
 
 //-----------------------------------------------------------------------------
 
 /** EO Factory. A factory is used to create other objects. In particular,
-it can be used so that objects of that kind can´t be created in any other
+it can be used so that objects of that kind can<EFBFBD>t be created in any other
 way. It should be instantiated with anything that needs a factory, like selectors
 or whatever; but the instance class should be the parent class from which all the
 object that are going to be created descend. This class basically defines an interface,

eo/src/eoFitContinue.h

@@ -25,8 +25,8 @@
 #ifndef _eoFitContinue_h
 #define _eoFitContinue_h
 
-#include <eoContinue.h>
-#include <utils/eoLogger.h>
+#include "eoContinue.h"
+#include "utils/eoLogger.h"
 
 /**
 Continues until the optimum fitness level is reached.

eo/src/eoFitnessScalingSelect.h

@@ -29,8 +29,8 @@
 
 //-----------------------------------------------------------------------------
 
-#include <eoSelectFromWorth.h>
-#include <eoLinearFitScaling.h>
+#include "eoSelectFromWorth.h"
+#include "eoLinearFitScaling.h"
 
 /** eoFitnessScalingSelect: select an individual proportional to the
  *  linearly scaled fitness that is computed by the private

eo/src/eoFixedInertiaWeightedVelocity.h

@@ -26,11 +26,11 @@
 #define EOFIXEDINERTIAWEIGHTEDVELOCITY_H
 
 //-----------------------------------------------------------------------------
-#include <eoFunctor.h>
-#include <utils/eoRNG.h>
-#include <eoPop.h>
-#include <utils/eoRealVectorBounds.h>
-#include <eoTopology.h>
+#include "eoFunctor.h"
+#include "utils/eoRNG.h"
+#include "eoPop.h"
+#include "utils/eoRealVectorBounds.h"
+#include "eoTopology.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoFlOrBinOp.h

@@ -26,8 +26,8 @@
 #ifndef _eoFlOrBinOp_h
 #define _eoFlOrBinOp_h
 
-#include <eoFunctor.h>
-#include <eoOp.h>
+#include "eoFunctor.h"
+#include "eoOp.h"
 
 /** @addtogroup Variators
  * @{

eo/src/eoFlOrMonOp.h

@@ -26,9 +26,9 @@
 #ifndef _eoFlOrMonOp_h
 #define _eoFlOrMonOp_h
 
-#include <eoFunctor.h>
-#include <eoOp.h>
-#include <eoInit.h>
+#include "eoFunctor.h"
+#include "eoOp.h"
+#include "eoInit.h"
 
 /** @addtogroup Variators
  * @{

eo/src/eoFlOrQuadOp.h

@@ -26,8 +26,8 @@
 #ifndef _eoFlOrQuadOp_h
 #define _eoFlOrQuadOp_h
 
-#include <eoFunctor.h>
-#include <eoOp.h>
+#include "eoFunctor.h"
+#include "eoOp.h"
 
 /** @addtogroup Variators
  * @{

eo/src/eoFlight.h

@@ -26,8 +26,8 @@
 #define EOFLIGHT_H
 
 //-----------------------------------------------------------------------------
-#include <eoFunctor.h>
-#include <utils/eoRealVectorBounds.h>
+#include "eoFunctor.h"
+#include "utils/eoRealVectorBounds.h"
 //-----------------------------------------------------------------------------
 
 /** Abstract class for particle swarm optimization flight.

eo/src/eoFunctorStore.cpp

@@ -5,8 +5,8 @@
 
 #include <cstddef>
 
-#include <eoFunctorStore.h>
-#include <eoFunctor.h>
+#include "eoFunctorStore.h"
+#include "eoFunctor.h"
 
 
 /// clears the memory

eo/src/eoFunctorStore.h

@@ -28,7 +28,7 @@
 #define _eoFunctorStore_h
 
 #include <vector>
-#include<algorithm>
+#include <algorithm>
 
 #include "utils/eoLogger.h"
 

eo/src/eoG3Replacement.h

@@ -28,12 +28,12 @@
 
 
 //-----------------------------------------------------------------------------
-#include <eoPop.h>
-#include <eoFunctor.h>
-#include <eoMerge.h>
-#include <eoReduce.h>
-#include <utils/eoHowMany.h>
-#include <eoReduceSplit.h>
+#include "eoPop.h"
+#include "eoFunctor.h"
+#include "eoMerge.h"
+#include "eoReduce.h"
+#include "utils/eoHowMany.h"
+#include "eoReduceSplit.h"
 //-----------------------------------------------------------------------------
 
 /**

eo/src/eoGaussRealWeightUp.h

@@ -26,8 +26,8 @@
 #define EOGAUSSREALWEIGHTUP_H
 
 //-----------------------------------------------------------------------------
-#include <eoWeightUpdater.h>
-#include <utils/eoRNG.h>
+#include "eoWeightUpdater.h"
+#include "utils/eoRNG.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoGenContinue.h

@@ -25,9 +25,9 @@
 #ifndef _eoGenContinue_h
 #define _eoGenContinue_h
 
-#include <eoContinue.h>
-#include <utils/eoParam.h>
-#include <utils/eoLogger.h>
+#include "eoContinue.h"
+#include "utils/eoParam.h"
+#include "utils/eoLogger.h"
 
 /**
     Generational continuator: continues until a number of generations is reached

eo/src/eoGenOp.h

@@ -26,9 +26,9 @@
 #ifndef _eoGenOp_H
 #define _eoGenOp_H
 
-#include <eoOp.h>
-#include <eoPopulator.h>
-#include <eoFunctorStore.h>
+#include "eoOp.h"
+#include "eoPopulator.h"
+#include "eoFunctorStore.h"
 #include <assert.h>
 
 /** @name General variation operators

eo/src/eoGeneralBreeder.h

@@ -32,12 +32,12 @@
  * eoGeneralBreeder: transforms a population using the generalOp construct.
  *****************************************************************************/
 
-#include <eoOp.h>
-#include <eoGenOp.h>
-#include <eoPopulator.h>
-#include <eoSelectOne.h>
-#include <eoBreed.h>
-#include <utils/eoHowMany.h>
+#include "eoOp.h"
+#include "eoGenOp.h"
+#include "eoPopulator.h"
+#include "eoSelectOne.h"
+#include "eoBreed.h"
+#include "utils/eoHowMany.h"
 
 /**
   Base class for breeders using generalized operators.

eo/src/eoInit.h

@@ -29,10 +29,10 @@
 
 #include <algorithm>
 
-#include <eoOp.h>
-#include <eoSTLFunctor.h>
-#include <utils/eoRndGenerators.h>
-#include <utils/rnd_generators.h>  // for shuffle method
+#include "eoOp.h"
+#include "eoSTLFunctor.h"
+#include "utils/eoRndGenerators.h"
+#include "utils/rnd_generators.h"  // for shuffle method
 
 
 /**

eo/src/eoInitializer.h

@@ -27,11 +27,11 @@
 #ifndef _eoInitializer_H
 #define _eoInitializer_H
 
-#include <utils/eoRealVectorBounds.h>
-#include <eoVelocityInit.h>
-#include <eoPop.h>
-#include <eoParticleBestInit.h>
-#include <eoTopology.h>
+#include "utils/eoRealVectorBounds.h"
+#include "eoVelocityInit.h"
+#include "eoPop.h"
+#include "eoParticleBestInit.h"
+#include "eoTopology.h"
 
 /**
  @addtogroup Initializators

eo/src/eoInt.h

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

eo/src/eoIntegerVelocity.h

@@ -27,12 +27,12 @@
 #define EOINTEGERVELOCITY_H
 
 //-----------------------------------------------------------------------------
-#include <eoFunctor.h>
-#include <utils/eoRNG.h>
-#include <eoPop.h>
-#include <utils/eoRealVectorBounds.h>
-#include <eoRealBoundModifier.h>
-#include <eoTopology.h>
+#include "eoFunctor.h"
+#include "utils/eoRNG.h"
+#include "eoPop.h"
+#include "utils/eoRealVectorBounds.h"
+#include "eoRealBoundModifier.h"
+#include "eoTopology.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoInvalidateOps.h

@@ -27,7 +27,7 @@
 #ifndef _eoInvalidateOps_h
 #define _eoInvalidateOps_h
 
-#include <eoOp.h>
+#include "eoOp.h"
 
 /** @addtogroup Utilities
 

eo/src/eoInvertedContinue.h

@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _eoInvertedContinue_h
 #define _eoInvertedContinue_h
 
-#include <eoContinue.h>
+#include "eoContinue.h"
 
 /**
  * Return the opposite of the wrapped continuator

eo/src/eoLinearDecreasingWeightUp.h

@@ -26,7 +26,7 @@
 #define EOLINEARDECREASINGWEIGHTUP_H
 
 //-----------------------------------------------------------------------------
-#include <eoWeightUpdater.h>
+#include "eoWeightUpdater.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoLinearFitScaling.h

@@ -27,8 +27,8 @@
 #ifndef eoLinearFitScaling_h
 #define eoLinearFitScaling_h
 
-#include <eoSelectFromWorth.h>
-#include <eoPerf2Worth.h>
+#include "eoSelectFromWorth.h"
+#include "eoPerf2Worth.h"
 
 /** An instance of eoPerf2Worth
  *  COmputes the linearly scaled fitnesses

eo/src/eoLinearTopology.h

@@ -27,9 +27,9 @@
 #define EOLINEARTOPOLOGY_H_
 
 //-----------------------------------------------------------------------------
-#include <eoPop.h>
-#include <eoTopology.h>
-#include <eoSocialNeighborhood.h>
+#include "eoPop.h"
+#include "eoTopology.h"
+#include "eoSocialNeighborhood.h"
 //-----------------------------------------------------------------------------
 
 

eo/src/eoMGGReplacement.h

@@ -28,12 +28,12 @@
 
 
 //-----------------------------------------------------------------------------
-#include <eoPop.h>
-#include <eoFunctor.h>
-#include <eoMerge.h>
-#include <eoReduce.h>
-#include <utils/eoHowMany.h>
-#include <eoReduceSplit.h>
+#include "eoPop.h"
+#include "eoFunctor.h"
+#include "eoMerge.h"
+#include "eoReduce.h"
+#include "utils/eoHowMany.h"
+#include "eoReduceSplit.h"
 //-----------------------------------------------------------------------------
 
 /**

eo/src/eoMerge.h

@@ -31,9 +31,9 @@
 #include <stdexcept>
 
 // EO includes
-#include <eoPop.h>     // eoPop
-#include <eoFunctor.h>  // eoMerge
-#include <utils/eoLogger.h>
+#include "eoPop.h"     // eoPop
+#include "eoFunctor.h"  // eoMerge
+#include "utils/eoLogger.h"
 
 /**
  * eoMerge: Base class for elitist replacement algorithms.

eo/src/eoMergeReduce.h

@@ -27,12 +27,12 @@
 
 
 //-----------------------------------------------------------------------------
-#include <eoPop.h>
-#include <eoFunctor.h>
-#include <eoMerge.h>
-#include <eoReduce.h>
-#include <eoReplacement.h>
-#include <utils/eoHowMany.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.

eo/src/eoNDSorting.h

@@ -27,10 +27,10 @@
 #ifndef eoNDSorting_h
 #define eoNDSorting_h
 
-#include <EO.h>
+#include "EO.h"
 #include <algorithm>
-#include <eoPop.h>
-#include <eoPerf2Worth.h>
+#include "eoPop.h"
+#include "eoPerf2Worth.h"
 #include <cassert>
 
 /**

eo/src/eoObject.h

@@ -27,11 +27,11 @@
 
 //-----------------------------------------------------------------------------
 
-#include <utils/eoData.h>	// For limits definition
+#include "utils/eoData.h"	// For limits definition
 #include <iostream>		// std::istream, std::ostream
 #include <string>		// std::string
 
-#include <utils/compatibility.h>
+#include "utils/compatibility.h"
 
 /*
 eoObject used to be the base class for the whole hierarchy, but this has
@@ -39,7 +39,7 @@ changed. eoObject is used to define a name (#className#)
 that is used when loading or saving the state.
 
 Previously, this object also defined a print and read
-interface, but it´s been moved to eoPrintable and eoPersistent.
+interface, but it<EFBFBD>s been moved to eoPrintable and eoPersistent.
 */
 
 /** Defines a name (#className#), used when loading or saving a state.

eo/src/eoOneToOneBreeder.h

@@ -28,15 +28,15 @@
 
 //-----------------------------------------------------------------------------
 
-#include <eoOp.h>
-#include <eoGenOp.h>
-#include <eoPopulator.h>
-#include <eoSelectOne.h>
-#include <eoSequentialSelect.h>
-#include <eoBreed.h>
-#include <eoEvalFunc.h>
-#include <eoPopulator.h>
-#include <utils/eoHowMany.h>
+#include "eoOp.h"
+#include "eoGenOp.h"
+#include "eoPopulator.h"
+#include "eoSelectOne.h"
+#include "eoSequentialSelect.h"
+#include "eoBreed.h"
+#include "eoEvalFunc.h"
+#include "eoPopulator.h"
+#include "utils/eoHowMany.h"
 
 /** eoOneToOneBreeder: transforms a population using
  *   - an operator that MODIFIES only one parent from the populator

eo/src/eoOp.h

@@ -25,10 +25,10 @@
 #ifndef _eoOp_H
 #define _eoOp_H
 
-#include <eoObject.h>
-#include <eoPrintable.h>
-#include <eoFunctor.h>
-#include <utils/eoRNG.h>
+#include "eoObject.h"
+#include "eoPrintable.h"
+#include "eoFunctor.h"
+#include "utils/eoRNG.h"
 
 /**
 @defgroup Operators Evolutionary Operators

eo/src/eoOpContainer.h

@@ -26,7 +26,7 @@
 #ifndef _eoOpContainer_H
 #define _eoOpContainer_H
 
-#include <eoGenOp.h>
+#include "eoGenOp.h"
 
 /** eoOpContainer is a base class for the sequential and proportional selectors
  *  It takes care of wrapping the other operators,

eo/src/eoOpSelMason.h

@@ -24,7 +24,7 @@
 #ifndef _EOOPSELMASON_H
 #define _EOOPSELMASON_H
 
-#include <eoOpFactory.h>	// for eoFactory and eoOpFactory
+#include "eoFactory.h"	// for eoFactory and eoOpFactory
 
 #include <map>
 
@@ -58,7 +58,7 @@ public:
         ...\\
         Stores all operators built in a database (#allocMap#), so that somebody
         can destroy them later. The Mason is in charge or destroying the operators,
-        since the built object can´t do it itself. The objects built must be destroyed
+        since the built object can<EFBFBD>t do it itself. The objects built must be destroyed
         from outside, using the "destroy" method
         */
         virtual eoOpSelector<eoClass>* make(std::istream& _is) {
@@ -79,7 +79,7 @@ public:
                         _is >> rate;
                         if ( _is ) {
                                 eoOp<eoClass>* op = operatorFactory.make( _is );	// This reads the rest of the line
-                                // Add the operators to the selector, don´t pay attention to the IDs
+                                // Add the operators to the selector, don<EFBFBD>t pay attention to the IDs
                                 opSelectorP->addOp( *op, rate );
                                 // Keep it in the store, to destroy later
                                 tmpPVec.push_back( op );

eo/src/eoOrderXover.h

@@ -9,8 +9,8 @@
 //-----------------------------------------------------------------------------
 
 #include <algorithm>
-#include <utils/eoRNG.h>
-#include <eoInit.h>
+#include "utils/eoRNG.h"
+#include "eoInit.h"
 
 /**
  * apply orderXover on two chromosomes.

eo/src/eoPSO.h

@@ -26,7 +26,7 @@
 #define _EOPSO_H
 
 //-----------------------------------------------------------------------------
-#include <eoAlgo.h>
+#include "eoAlgo.h"
 //-----------------------------------------------------------------------------
 
 /**

eo/src/eoPartiallyMappedXover.h

@@ -32,7 +32,7 @@
 //-----------------------------------------------------------------------------
 
 #include <algorithm>
-#include <utils/eoRNG.h>
+#include "utils/eoRNG.h"
 
 /**
  *

eo/src/eoParticleBestInit.h

@@ -26,7 +26,7 @@
 #define _EOPARTICLEBESTINIT_H
 
 //-----------------------------------------------------------------------------
-#include <eoFunctor.h>
+#include "eoFunctor.h"
 //-----------------------------------------------------------------------------
 
 /**

eo/src/eoParticleFullInitializer.h

@@ -27,11 +27,11 @@
 #ifndef _eoParticleFullInitializer_H
 #define _eoParticleFullInitializer_H
 
-#include <utils/eoRealVectorBounds.h>
-#include <eoVelocityInit.h>
-#include <eoPop.h>
-#include <eoParticleBestInit.h>
-#include <eoTopology.h>
+#include "utils/eoRealVectorBounds.h"
+#include "eoVelocityInit.h"
+#include "eoPop.h"
+#include "eoParticleBestInit.h"
+#include "eoTopology.h"
 
 /**
  @addtogroup Initializators

eo/src/eoPerf2Worth.h

@@ -27,9 +27,9 @@
 #ifndef eoPerf2Worth_h
 #define eoPerf2Worth_h
 
-#include <utils/eoParam.h>
-#include <eoPop.h>
-#include <eoFunctor.h>
+#include "utils/eoParam.h"
+#include "eoPop.h"
+#include "eoFunctor.h"
 
 #include <algorithm>
 #include <vector>

eo/src/eoPeriodicContinue.h

@@ -22,8 +22,8 @@
 #ifndef __eoPeriodicContinue_h
 #define __eoPeriodicContinue_h
 
-#include <eoContinue.h>
-#include <eoPop.h>
+#include "eoContinue.h"
+#include "eoPop.h"
 
 /** A continue that becomes true periodically.
  */

eo/src/eoPersistent.cpp

@@ -3,7 +3,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <eoPersistent.h>
+#include "eoPersistent.h"
 
 //Implementation of these objects
 

eo/src/eoPop.h

@@ -41,10 +41,10 @@ Authors:
 #include <assert.h>
 
 // EO includes
-#include <eoOp.h> // for eoInit
-#include <eoPersistent.h>
-#include <eoInit.h>
-#include <utils/rnd_generators.h>  // for shuffle method
+#include "eoOp.h" // for eoInit
+#include "eoPersistent.h"
+#include "eoInit.h"
+#include "utils/rnd_generators.h"  // for shuffle method
 
 /** A std::vector of EO object, to be used in all algorithms
  *      (selectors, operators, replacements, ...).

eo/src/eoPopEvalFunc.h

@@ -27,15 +27,15 @@
 #ifndef eoPopEvalFunc_H
 #define eoPopEvalFunc_H
 
-#include <eoEvalFunc.h>
-#include <apply.h>
+#include "eoEvalFunc.h"
+#include "apply.h"
 
 # ifdef WITH_MPI
-#include <mpi/eoMpi.h>
-#include <mpi/eoTerminateJob.h>
-#include <mpi/eoMpiAssignmentAlgorithm.h>
-#include <mpi/eoParallelApply.h>
-#include <utils/eoParallel.h>
+#include "mpi/eoMpi.h"
+#include "mpi/eoTerminateJob.h"
+#include "mpi/eoMpiAssignmentAlgorithm.h"
+#include "mpi/eoParallelApply.h"
+#include "utils/eoParallel.h"
 
 #include <cmath> // ceil
 # endif // WITH_MPI

eo/src/eoPopulator.h

@@ -26,8 +26,8 @@
 #ifndef _eoPopulator_H
 #define _eoPopulator_H
 
-#include <eoPop.h>
-#include <eoSelectOne.h>
+#include "eoPop.h"
+#include "eoSelectOne.h"
 
 /** eoPopulator is a helper class for general operators eoGenOp
     It is an eoPop but also behaves like an eoPop::iterator

eo/src/eoPrintable.cpp

@@ -7,7 +7,7 @@
 // eoPrintable.cpp
 //-----------------------------------------------------------------------------
 
-#include <eoPrintable.h>
+#include "eoPrintable.h"
 
 //-----------------------------------------------------------------------------
 //Implementation of these objects

eo/src/eoPrintable.h

@@ -27,8 +27,8 @@
 
 //-----------------------------------------------------------------------------
 
-#include <iostream>  // std::istream, std::ostream
-#include <string> // para std::string
+#include "iostream"  // std::istream, std::ostream
+#include "string" // para std::string
 
 /*
 This functionality was separated from eoObject, since it makes no sense to print

eo/src/eoProportionalCombinedOp.h

@@ -24,12 +24,12 @@
 #ifndef _eoCombinedOp_H
 #define _eoCombinedOp_H
 
-#include <eoObject.h>
-#include <eoPrintable.h>
-#include <eoFunctor.h>
-#include <eoOp.h>
-#include <utils/eoRNG.h>
-#include <utils/eoLogger.h>
+#include "eoObject.h"
+#include "eoPrintable.h"
+#include "eoFunctor.h"
+#include "eoOp.h"
+#include "utils/eoRNG.h"
+#include "utils/eoLogger.h"
 
 /**
 \defgroup Utilities Utilities

eo/src/eoProportionalSelect.h

@@ -29,10 +29,10 @@
 
 //-----------------------------------------------------------------------------
 
-#include <utils/eoRNG.h>
-#include <utils/selectors.h>
-#include <eoSelectOne.h>
-#include <eoPop.h>
+#include "utils/eoRNG.h"
+#include "utils/selectors.h"
+#include "eoSelectOne.h"
+#include "eoPop.h"
 
 /** eoProportionalSelect: select an individual proportional to her stored fitness
     value

eo/src/eoRandomRealWeightUp.h

@@ -26,8 +26,8 @@
 #define EORANDOMREALWEIGHTUP_H
 
 //-----------------------------------------------------------------------------
-#include <eoWeightUpdater.h>
-#include <utils/eoRNG.h>
+#include "eoWeightUpdater.h"
+#include "utils/eoRNG.h"
 //-----------------------------------------------------------------------------
 
 /**

eo/src/eoRandomSelect.h

@@ -32,8 +32,8 @@
  * eoSequentialSelect      returns all individuals in turn
  */
 
-#include <utils/eoRNG.h>
-#include <eoSelectOne.h>
+#include "utils/eoRNG.h"
+#include "eoSelectOne.h"
 
 /** eoRandomSelect: a selection method that selects ONE individual randomly
  *

eo/src/eoRanking.h

@@ -27,7 +27,7 @@
 #ifndef eoRanking_h
 #define eoRanking_h
 
-#include <eoPerf2Worth.h>
+#include "eoPerf2Worth.h"
 
 /** An instance of eoPerfFromWorth
  *  COmputes the ranked fitness: fitnesses range in [m,M]

eo/src/eoRankingSelect.h

@@ -28,8 +28,8 @@
 
 //-----------------------------------------------------------------------------
 
-#include <eoSelectFromWorth.h>
-#include <eoRanking.h>
+#include "eoSelectFromWorth.h"
+#include "eoRanking.h"
 
 /** eoRankingSelect: select an individual by roulette wheel on its rank
  *  is an eoRouletteWorthSelect, i.e. a selector using a std::vector of worthes

eo/src/eoRealBoundModifier.h

@@ -24,8 +24,8 @@
 #ifndef EOREALBOUNDMODIFIER_H
 #define EOREALBOUNDMODIFIER_H
 
-#include <eoFunctor.h>
-#include <utils/eoRealVectorBounds.h>
+#include "eoFunctor.h"
+#include "utils/eoRealVectorBounds.h"
 
 /** @defgroup Bounds Bounds management
  *