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
2019-06-29 18:44:27 -03:00 · 2019-06-29 18:44:27 -03:00 · aa5dbe82c6
commit aa5dbe82c6
parent d83681d6fa
284 changed files with 996 additions and 989 deletions
--- a/eo/src/EO.h
+++ b/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
--- a/eo/src/PO.h
+++ b/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,
--- a/eo/src/apply.h
+++ b/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
--- a/eo/src/do/make_algo_easea.h
+++ b/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)
--- a/eo/src/do/make_algo_scalar.h
+++ b/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"


 /*
--- a/eo/src/do/make_checkpoint.h
+++ b/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
--- a/eo/src/do/make_checkpoint_FDC.h
+++ b/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
--- a/eo/src/do/make_checkpoint_assembled.h
+++ b/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
--- a/eo/src/do/make_continue.h
+++ b/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 ////////////////
--- a/eo/src/do/make_general_replacement.h
+++ b/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
--- a/eo/src/do/make_pop.h
+++ b/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
 *
--- a/eo/src/do/make_run.h
+++ b/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
--- a/eo/src/eo
+++ b/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

--- a/eo/src/eoAlgo.h
+++ b/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
--- a/eo/src/eoBinaryFlight.h
+++ b/eo/src/eoBinaryFlight.h
@ -26,7 +26,7 @@
 #define EOBINARYFLIGHT_H

 //-----------------------------------------------------------------------------
-#include <eoFlight.h>
+#include "eoFlight.h"
 //-----------------------------------------------------------------------------


--- a/eo/src/eoBitParticle.h
+++ b/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).
--- a/eo/src/eoBreed.h
+++ b/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
--- a/eo/src/eoCellularEasyEA.h
+++ b/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.
--- a/eo/src/eoCloneOps.h
+++ b/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)
--- a/eo/src/eoCombinedContinue.h
+++ b/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
 */
--- a/Show more
+++ b/Show more