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
This commit is contained in:
Ronaldd Pinho 2019-06-29 18:44:27 -03:00 • committed by nojhan
commit aa5dbe82c6
284 changed files with 996 additions and 989 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

206
eo/src/eo
View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

Some files were not shown because too many files have changed in this diff Show more