Refactoring last files to relative includes

This commit is contained in:
Ronaldd Pinho 2019-06-29 22:14:10 -03:00
commit c9a9a0741f
2 changed files with 123 additions and 123 deletions

204
eo/src/eo
View file

@ -33,120 +33,120 @@
#endif #endif
// general purpose // general purpose
#include <paradiseo/eo/utils/eoData.h> #include "utils/eoData.h"
#include <paradiseo/eo/eoObject.h> #include "eoObject.h"
#include <paradiseo/eo/eoPrintable.h> #include "eoPrintable.h"
#include <paradiseo/eo/eoPersistent.h> #include "eoPersistent.h"
#include <paradiseo/eo/eoScalarFitness.h> #include "eoScalarFitness.h"
#include <paradiseo/eo/eoDualFitness.h> #include "eoDualFitness.h"
#include <paradiseo/eo/EO.h> #include "EO.h"
#include <paradiseo/eo/utils/rnd_generators.h> #include "utils/rnd_generators.h"
#include <paradiseo/eo/eoFunctor.h> #include "eoFunctor.h"
#include <paradiseo/eo/apply.h> #include "apply.h"
// eo's // eo's
#include <paradiseo/eo/eoVector.h> #include "eoVector.h"
#include <paradiseo/eo/other/eoString.h> #include "other/eoString.h"
#include <paradiseo/eo/utils/eoRndGenerators.h> #include "utils/eoRndGenerators.h"
#include <paradiseo/eo/eoInit.h> #include "eoInit.h"
#include <paradiseo/eo/utils/eoUniformInit.h> #include "utils/eoUniformInit.h"
// the variation operators // the variation operators
#include <paradiseo/eo/eoOp.h> #include "eoOp.h"
#include <paradiseo/eo/eoGenOp.h> #include "eoGenOp.h"
#include <paradiseo/eo/eoCloneOps.h> #include "eoCloneOps.h"
#include <paradiseo/eo/eoOpContainer.h> #include "eoOpContainer.h"
// combinations of simple eoOps (eoMonOp and eoQuadOp) // combinations of simple eoOps (eoMonOp and eoQuadOp)
#include <paradiseo/eo/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 <paradiseo/eo/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 <paradiseo/eo/eoPropGAGenOp.h> #include "eoPropGAGenOp.h"
// population // population
#include <paradiseo/eo/eoPop.h> #include "eoPop.h"
// Evaluation functions (all include eoEvalFunc.h) // Evaluation functions (all include eoEvalFunc.h)
#include <paradiseo/eo/eoPopEvalFunc.h> #include "eoPopEvalFunc.h"
#include <paradiseo/eo/eoEvalFuncPtr.h> #include "eoEvalFuncPtr.h"
#include <paradiseo/eo/eoEvalCounterThrowException.h> #include "eoEvalCounterThrowException.h"
#include <paradiseo/eo/eoEvalTimeThrowException.h> #include "eoEvalTimeThrowException.h"
#include <paradiseo/eo/eoEvalUserTimeThrowException.h> #include "eoEvalUserTimeThrowException.h"
// Continuators - all include eoContinue.h // Continuators - all include eoContinue.h
#include <paradiseo/eo/eoCombinedContinue.h> #include "eoCombinedContinue.h"
#include <paradiseo/eo/eoGenContinue.h> #include "eoGenContinue.h"
#include <paradiseo/eo/eoSteadyFitContinue.h> #include "eoSteadyFitContinue.h"
#include <paradiseo/eo/eoEvalContinue.h> #include "eoEvalContinue.h"
#include <paradiseo/eo/eoFitContinue.h> #include "eoFitContinue.h"
#include <paradiseo/eo/eoPeriodicContinue.h> #include "eoPeriodicContinue.h"
#include <paradiseo/eo/eoTimeContinue.h> // added th T.Legrand #include "eoTimeContinue.h" // added th T.Legrand
#ifndef _MSC_VER #ifndef _MSC_VER
#include <paradiseo/eo/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 <paradiseo/eo/eoRandomSelect.h> #include "eoRandomSelect.h"
#include <paradiseo/eo/eoSequentialSelect.h> #include "eoSequentialSelect.h"
#include <paradiseo/eo/eoDetTournamentSelect.h> #include "eoDetTournamentSelect.h"
#include <paradiseo/eo/eoProportionalSelect.h> #include "eoProportionalSelect.h"
#include <paradiseo/eo/eoFitnessScalingSelect.h> // also contains eoLinearFitScaling.h #include "eoFitnessScalingSelect.h" // also contains eoLinearFitScaling.h
#include <paradiseo/eo/eoRankingSelect.h> #include "eoRankingSelect.h"
#include <paradiseo/eo/eoStochTournamentSelect.h> #include "eoStochTournamentSelect.h"
#include <paradiseo/eo/eoSharingSelect.h> #include "eoSharingSelect.h"
// Embedding truncation selection // Embedding truncation selection
#include <paradiseo/eo/eoTruncatedSelectOne.h> #include "eoTruncatedSelectOne.h"
// the batch selection - from an eoSelectOne // the batch selection - from an eoSelectOne
#include <paradiseo/eo/eoSelectPerc.h> #include "eoSelectPerc.h"
#include <paradiseo/eo/eoSelectNumber.h> #include "eoSelectNumber.h"
#include <paradiseo/eo/eoSelectMany.h> #include "eoSelectMany.h"
#include <paradiseo/eo/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 <paradiseo/eo/eoDetSelect.h> #include "eoDetSelect.h"
#include <paradiseo/eo/eoRankMuSelect.h> #include "eoRankMuSelect.h"
// Breeders // Breeders
#include <paradiseo/eo/eoGeneralBreeder.h> // applies one eoGenOp, stop on offspring count #include "eoGeneralBreeder.h" // applies one eoGenOp, stop on offspring count
// #include <paradiseo/eo/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 <paradiseo/eo/eoReplacement.h> // #include "eoReplacement.h"
#include <paradiseo/eo/eoMergeReduce.h> #include "eoMergeReduce.h"
#include <paradiseo/eo/eoReduceMerge.h> #include "eoReduceMerge.h"
#include <paradiseo/eo/eoSurviveAndDie.h> #include "eoSurviveAndDie.h"
// a simple transformer // a simple transformer
#include <paradiseo/eo/eoSGATransform.h> #include "eoSGATransform.h"
// Perf2Worth stuff - includes eoSelectFromWorth.h // Perf2Worth stuff - includes eoSelectFromWorth.h
#include <paradiseo/eo/eoNDSorting.h> #include "eoNDSorting.h"
// Algorithms // Algorithms
#include <paradiseo/eo/eoEasyEA.h> #include "eoEasyEA.h"
#include <paradiseo/eo/eoSGA.h> #include "eoSGA.h"
// #include <paradiseo/eo/eoEvolutionStrategy.h> removed for a while - until eoGenOp is done // #include "eoEvolutionStrategy.h" removed for a while - until eoGenOp is done
// Utils // Utils
#include <paradiseo/eo/utils/checkpointing> #include "utils/checkpointing"
#include <paradiseo/eo/utils/eoRealVectorBounds.h> // includes eoRealBounds.h #include "utils/eoRealVectorBounds.h" // includes eoRealBounds.h
#include <paradiseo/eo/utils/eoIntBounds.h> // no eoIntVectorBounds #include "utils/eoIntBounds.h" // no eoIntVectorBounds
// aliens // aliens
#include <paradiseo/eo/other/external_eo> #include "other/external_eo"
#include <paradiseo/eo/eoCounter.h> #include "eoCounter.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -156,54 +156,54 @@
/*** Particle Swarm Optimization stuff ***/ /*** Particle Swarm Optimization stuff ***/
// basic particle definitions // basic particle definitions
#include <paradiseo/eo/PO.h> #include "PO.h"
#include <paradiseo/eo/eoVectorParticle.h> #include "eoVectorParticle.h"
#include <paradiseo/eo/eoBitParticle.h> #include "eoBitParticle.h"
#include <paradiseo/eo/eoRealParticle.h> #include "eoRealParticle.h"
// initialization // initialization
#include <paradiseo/eo/eoParticleBestInit.h> #include "eoParticleBestInit.h"
#include <paradiseo/eo/eoInitializer.h> #include "eoInitializer.h"
// velocities // velocities
#include <paradiseo/eo/eoVelocity.h> #include "eoVelocity.h"
#include <paradiseo/eo/eoStandardVelocity.h> #include "eoStandardVelocity.h"
#include <paradiseo/eo/eoExtendedVelocity.h> #include "eoExtendedVelocity.h"
#include <paradiseo/eo/eoIntegerVelocity.h> #include "eoIntegerVelocity.h"
#include <paradiseo/eo/eoConstrictedVelocity.h> #include "eoConstrictedVelocity.h"
#include <paradiseo/eo/eoFixedInertiaWeightedVelocity.h> #include "eoFixedInertiaWeightedVelocity.h"
#include <paradiseo/eo/eoVariableInertiaWeightedVelocity.h> #include "eoVariableInertiaWeightedVelocity.h"
#include <paradiseo/eo/eoConstrictedVariableWeightVelocity.h> #include "eoConstrictedVariableWeightVelocity.h"
// flights // flights
#include <paradiseo/eo/eoFlight.h> #include "eoFlight.h"
#include <paradiseo/eo/eoStandardFlight.h> #include "eoStandardFlight.h"
#include <paradiseo/eo/eoVelocityInit.h> #include "eoVelocityInit.h"
#include <paradiseo/eo/eoBinaryFlight.h> #include "eoBinaryFlight.h"
#include <paradiseo/eo/eoSigBinaryFlight.h> #include "eoSigBinaryFlight.h"
// topologies // topologies
#include <paradiseo/eo/eoTopology.h> #include "eoTopology.h"
#include <paradiseo/eo/eoStarTopology.h> #include "eoStarTopology.h"
#include <paradiseo/eo/eoLinearTopology.h> #include "eoLinearTopology.h"
#include <paradiseo/eo/eoRingTopology.h> #include "eoRingTopology.h"
#include <paradiseo/eo/eoNeighborhood.h> #include "eoNeighborhood.h"
#include <paradiseo/eo/eoSocialNeighborhood.h> #include "eoSocialNeighborhood.h"
// PS algorithms // PS algorithms
#include <paradiseo/eo/eoPSO.h> #include "eoPSO.h"
#include <paradiseo/eo/eoEasyPSO.h> #include "eoEasyPSO.h"
#include <paradiseo/eo/eoSyncEasyPSO.h> #include "eoSyncEasyPSO.h"
// utils // utils
#include <paradiseo/eo/eoRealBoundModifier.h> #include "eoRealBoundModifier.h"
#include <paradiseo/eo/eoRandomRealWeightUp.h> #include "eoRandomRealWeightUp.h"
#include <paradiseo/eo/eoWeightUpdater.h> #include "eoWeightUpdater.h"
#include <paradiseo/eo/eoLinearDecreasingWeightUp.h> #include "eoLinearDecreasingWeightUp.h"
#include <paradiseo/eo/eoGaussRealWeightUp.h> #include "eoGaussRealWeightUp.h"
#include <paradiseo/eo/utils/eoLogger.h> #include "utils/eoLogger.h"
#include <paradiseo/eo/utils/eoParallel.h> #include "utils/eoParallel.h"
#endif #endif

View file

@ -24,27 +24,27 @@
#ifndef _CHECKPOINTING_ #ifndef _CHECKPOINTING_
#define _CHECKPOINTING_ #define _CHECKPOINTING_
#include <paradiseo/eo/utils/eoParser.h> #include "eoParser.h"
#include <paradiseo/eo/utils/eoState.h> #include "eoState.h"
#include <paradiseo/eo/utils/eoUpdater.h> #include "eoUpdater.h"
#include <paradiseo/eo/utils/eoMonitor.h> #include "eoMonitor.h"
#include <paradiseo/eo/utils/eoFileMonitor.h> #include "eoFileMonitor.h"
#include <paradiseo/eo/utils/eoStdoutMonitor.h> #include "eoStdoutMonitor.h"
#include <paradiseo/eo/utils/eoOStreamMonitor.h> #include "eoOStreamMonitor.h"
#ifndef _MSC_VER #ifndef _MSC_VER
#include <paradiseo/eo/utils/eoGnuplot1DMonitor.h> #include "eoGnuplot1DMonitor.h"
#include <paradiseo/eo/utils/eoGnuplot1DSnapshot.h> #include "eoGnuplot1DSnapshot.h"
#endif #endif
#include <paradiseo/eo/utils/eoCheckPoint.h> #include "eoCheckPoint.h"
#include <paradiseo/eo/utils/eoSignal.h> #include "eoSignal.h"
#include <paradiseo/eo/utils/eoStat.h> #include "eoStat.h"
#include <paradiseo/eo/utils/eoScalarFitnessStat.h> #include "eoScalarFitnessStat.h"
#include <paradiseo/eo/utils/eoAssembledFitnessStat.h> #include "eoAssembledFitnessStat.h"
#include <paradiseo/eo/utils/eoFDCStat.h> #include "eoFDCStat.h"
#include <paradiseo/eo/utils/eoMOFitnessStat.h> #include "eoMOFitnessStat.h"
#include <paradiseo/eo/utils/eoPopStat.h> #include "eoPopStat.h"
#include <paradiseo/eo/utils/eoTimeCounter.h> #include "eoTimeCounter.h"
#include <paradiseo/eo/utils/eoGenCounter.h> #include "eoGenCounter.h"
// and make_help - any better suggestion to include it? // and make_help - any better suggestion to include it?
void make_help(eoParser & _parser); void make_help(eoParser & _parser);