From 6387aa48abfc4a98f7a7a0e78c9f18be39b4b014 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 29 Jun 2019 19:45:05 -0300 Subject: [PATCH] Adapting headers of general inclusions to relative include --- eo/src/PO.h | 2 +- eo/src/apply.h | 8 ++++---- eo/src/es.h | 26 +++++++++++++------------- eo/src/ga.h | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eo/src/PO.h b/eo/src/PO.h index 0c246135e..c3498591a 100644 --- a/eo/src/PO.h +++ b/eo/src/PO.h @@ -27,7 +27,7 @@ //----------------------------------------------------------------------------- #include -#include +#include //----------------------------------------------------------------------------- /** PO inheriting from EO is specially designed for particle swarm optimization particle.POs have got a fitness, diff --git a/eo/src/apply.h b/eo/src/apply.h index 45c4cfc2d..71cf892fc 100644 --- a/eo/src/apply.h +++ b/eo/src/apply.h @@ -26,10 +26,10 @@ #ifndef _apply_h #define _apply_h -#include -#include -#include -#include +#include "utils/eoParallel.h" +#include "utils/eoParser.h" +#include "utils/eoLogger.h" +#include "eoFunctor.h" #include #ifdef _OPENMP diff --git a/eo/src/es.h b/eo/src/es.h index d5dffc2f3..9e2fd78f9 100644 --- a/eo/src/es.h +++ b/eo/src/es.h @@ -36,28 +36,28 @@ //----------------------------------------------------------------------------- // the genotypes - from plain std::vector to full correlated mutation -#include -#include -#include -#include +#include "eoReal.h" +#include "eoEsSimple.h" +#include "eoEsStdev.h" +#include "eoEsFull.h" // the initialization -#include +#include "eoEsChromInit.h" // general operators -#include -#include -#include // for generic operators +#include "eoRealOp.h" +#include "eoNormalMutation.h" +#include "eoRealAtomXover.h" // for generic operators // SBX crossover (following Deb) -#include +#include "eoSBXcross.h" // ES specific operators -#include // Global ES Xover -#include // 2-parents ES Xover +#include "eoEsGlobalXover.h" // Global ES Xover +#include "eoEsStandardXover.h" // 2-parents ES Xover // the ES-mutations -#include -#include +#include "eoEsMutationInit.h" +#include "eoEsMutate.h" #endif diff --git a/eo/src/ga.h b/eo/src/ga.h index 6abb0181a..2f20dc879 100644 --- a/eo/src/ga.h +++ b/eo/src/ga.h @@ -30,10 +30,10 @@ #define _ga_h // all bitstring-specific files -#include +#include "ga/eoBit.h" // the operators -#include +#include "ga/eoBitOp.h" // #include to be corrected - thanks someone!