From a12cce576d0d19be1e9764e48cf3c727aadf45f8 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Fri, 16 Aug 2019 23:48:14 -0300 Subject: [PATCH] Rafactor includes on mo/algo folder --- mo/src/algo/eoDummyMonOp.h | 2 +- mo/src/algo/moDummyLS.h | 6 +++--- mo/src/algo/moFirstImprHC.h | 10 +++++----- mo/src/algo/moILS.h | 20 ++++++++++---------- mo/src/algo/moLocalSearch.h | 10 +++++----- mo/src/algo/moMetropolisHasting.h | 10 +++++----- mo/src/algo/moNeutralHC.h | 10 +++++----- mo/src/algo/moRandomBestHC.h | 10 +++++----- mo/src/algo/moRandomNeutralWalk.h | 10 +++++----- mo/src/algo/moRandomSearch.h | 10 +++++----- mo/src/algo/moRandomWalk.h | 10 +++++----- mo/src/algo/moSA.h | 14 +++++++------- mo/src/algo/moSimpleHC.h | 10 +++++----- mo/src/algo/moTS.h | 24 ++++++++++++------------ mo/src/algo/moVNS.h | 14 +++++++------- 15 files changed, 85 insertions(+), 85 deletions(-) diff --git a/mo/src/algo/eoDummyMonOp.h b/mo/src/algo/eoDummyMonOp.h index dba88fa7f..a3da7d955 100644 --- a/mo/src/algo/eoDummyMonOp.h +++ b/mo/src/algo/eoDummyMonOp.h @@ -35,7 +35,7 @@ #ifndef _moDummyMonOp_h #define _moDummyMonOp_h -#include +#include "../../eo/eoOp.h" /** * The mutation operator that does nothing at all ! diff --git a/mo/src/algo/moDummyLS.h b/mo/src/algo/moDummyLS.h index fd24d3575..4ee4d8f96 100644 --- a/mo/src/algo/moDummyLS.h +++ b/mo/src/algo/moDummyLS.h @@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyLS_h #define _moDummyLS_h -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moDummyExplorer.h" +#include "../continuator/moTrueContinuator.h" /** * Dummy Local Search: diff --git a/mo/src/algo/moFirstImprHC.h b/mo/src/algo/moFirstImprHC.h index 4793ef626..07cfed192 100644 --- a/mo/src/algo/moFirstImprHC.h +++ b/mo/src/algo/moFirstImprHC.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moFirstImprHC_h #define _moFirstImprHC_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moFirstImprHCexplorer.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include /** * First improvement HC: diff --git a/mo/src/algo/moILS.h b/mo/src/algo/moILS.h index 934335b2d..278c4b7b8 100644 --- a/mo/src/algo/moILS.h +++ b/mo/src/algo/moILS.h @@ -30,16 +30,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moILS_h #define _moILS_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moILSexplorer.h" +#include "../continuator/moIterContinuator.h" +#include +#include "../neighborhood/moDummyNeighbor.h" +#include "../perturb/moMonOpPerturb.h" +#include "../perturb/moPerturbation.h" +#include "../acceptCrit/moAlwaysAcceptCrit.h" +#include "../eval/moEval.h" +#include /** diff --git a/mo/src/algo/moLocalSearch.h b/mo/src/algo/moLocalSearch.h index bf77a8f3f..7b0c8f7fe 100644 --- a/mo/src/algo/moLocalSearch.h +++ b/mo/src/algo/moLocalSearch.h @@ -35,11 +35,11 @@ #ifndef _moLocalSearch_h #define _moLocalSearch_h -#include -#include -#include -#include -#include +#include "../explorer/moNeighborhoodExplorer.h" +#include "../continuator/moContinuator.h" +#include "../neighborhood/moNeighborhood.h" +#include "../../eo/eoEvalFunc.h" +#include "../../eo/eoOp.h" /** * the main algorithm of the local search diff --git a/mo/src/algo/moMetropolisHasting.h b/mo/src/algo/moMetropolisHasting.h index 5b4292459..6dca517f4 100644 --- a/mo/src/algo/moMetropolisHasting.h +++ b/mo/src/algo/moMetropolisHasting.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moMetropolisHasting_h #define _moMetropolisHasting_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moMetropolisHastingExplorer.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include "../../eo/eoEvalFunc.h" /** * Metropolis-Hasting local search diff --git a/mo/src/algo/moNeutralHC.h b/mo/src/algo/moNeutralHC.h index 2fd2583d5..717857113 100644 --- a/mo/src/algo/moNeutralHC.h +++ b/mo/src/algo/moNeutralHC.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moNeutralHC_h #define _moNeutralHC_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moNeutralHCexplorer.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include /** * Hill-Climbing local search diff --git a/mo/src/algo/moRandomBestHC.h b/mo/src/algo/moRandomBestHC.h index 3e7a32d62..74ce6e862 100644 --- a/mo/src/algo/moRandomBestHC.h +++ b/mo/src/algo/moRandomBestHC.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moRandomBestHC_h #define _moRandomBestHC_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moRandomBestHCexplorer.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include /** * Random Best HC: diff --git a/mo/src/algo/moRandomNeutralWalk.h b/mo/src/algo/moRandomNeutralWalk.h index 4f21588c5..72161bea4 100644 --- a/mo/src/algo/moRandomNeutralWalk.h +++ b/mo/src/algo/moRandomNeutralWalk.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moRandomNeutralWalk_h #define _moRandomNeutralWalk_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moRandomNeutralWalkExplorer.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include /** * Random Neutral Walk: diff --git a/mo/src/algo/moRandomSearch.h b/mo/src/algo/moRandomSearch.h index c0a468d6a..a036933e3 100644 --- a/mo/src/algo/moRandomSearch.h +++ b/mo/src/algo/moRandomSearch.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moRandomSearch_h #define _moRandomSearch_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moRandomSearchExplorer.h" +#include "../continuator/moTrueContinuator.h" +#include +#include /** * Random Search: diff --git a/mo/src/algo/moRandomWalk.h b/mo/src/algo/moRandomWalk.h index 6ccdbc107..3919ffca7 100644 --- a/mo/src/algo/moRandomWalk.h +++ b/mo/src/algo/moRandomWalk.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moRandomWalk_h #define _moRandomWalk_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moRandomWalkExplorer.h" +#include "../continuator/moIterContinuator.h" +#include "../eval/moEval.h" +#include /** * Random Walk: diff --git a/mo/src/algo/moSA.h b/mo/src/algo/moSA.h index c126f31fc..9ea280a18 100644 --- a/mo/src/algo/moSA.h +++ b/mo/src/algo/moSA.h @@ -30,13 +30,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moSA_h #define _moSA_h -#include -#include -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moSAexplorer.h" +#include "../coolingSchedule/moCoolingSchedule.h" +#include "../coolingSchedule/moSimpleCoolingSchedule.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include /** * Simulated Annealing diff --git a/mo/src/algo/moSimpleHC.h b/mo/src/algo/moSimpleHC.h index c334d0629..f2838c9a2 100644 --- a/mo/src/algo/moSimpleHC.h +++ b/mo/src/algo/moSimpleHC.h @@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moSimpleHC_h #define _moSimpleHC_h -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moSimpleHCexplorer.h" +#include "../continuator/moTrueContinuator.h" +#include "../eval/moEval.h" +#include /** * Simple HC: diff --git a/mo/src/algo/moTS.h b/mo/src/algo/moTS.h index cd1a6dc57..ac6b6f255 100644 --- a/mo/src/algo/moTS.h +++ b/mo/src/algo/moTS.h @@ -30,18 +30,18 @@ #ifndef _moTS_h #define _moTS_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "moLocalSearch.h" +#include "../explorer/moTSexplorer.h" +#include "../memory/moNeighborVectorTabuList.h" +#include "../memory/moIntensification.h" +#include "../memory/moDummyIntensification.h" +#include "../memory/moDiversification.h" +#include "../memory/moDummyDiversification.h" +#include "../memory/moAspiration.h" +#include "../memory/moBestImprAspiration.h" +#include "../continuator/moTimeContinuator.h" +#include "../eval/moEval.h" +#include /** * Tabu Search diff --git a/mo/src/algo/moVNS.h b/mo/src/algo/moVNS.h index 050e29593..38dbbe02a 100644 --- a/mo/src/algo/moVNS.h +++ b/mo/src/algo/moVNS.h @@ -30,14 +30,14 @@ #ifndef _moVNS_h #define _moVNS_h -#include -#include -#include -#include +#include "moLocalSearch.h" +#include +#include "../comparator/moSolComparator.h" +#include "../continuator/moContinuator.h" -#include -#include -#include +#include "../explorer/moVNSexplorer.h" +#include "../neighborhood/moVariableNeighborhoodSelection.h" +#include "../acceptCrit/moAcceptanceCriterion.h" /**