From 8329642e925cddc0eee7efde9b4f322922833448 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 16:56:52 -0300 Subject: [PATCH] Updated includes on mo/explorer --- mo/src/explorer/moDummyExplorer.h | 2 +- mo/src/explorer/moFirstImprHCexplorer.h | 8 ++++---- mo/src/explorer/moILSexplorer.h | 12 ++++++------ mo/src/explorer/moMetropolisHastingExplorer.h | 10 +++++----- mo/src/explorer/moNeighborhoodExplorer.h | 10 +++++----- mo/src/explorer/moNeutralHCexplorer.h | 8 ++++---- mo/src/explorer/moRandomBestHCexplorer.h | 10 +++++----- mo/src/explorer/moRandomNeutralWalkExplorer.h | 6 +++--- mo/src/explorer/moRandomSearchExplorer.h | 8 ++++---- mo/src/explorer/moRandomWalkExplorer.h | 8 ++++---- mo/src/explorer/moSAexplorer.h | 10 +++++----- mo/src/explorer/moSimpleHCexplorer.h | 8 ++++---- mo/src/explorer/moTSexplorer.h | 16 ++++++++-------- mo/src/explorer/moVNSexplorer.h | 8 ++++---- 14 files changed, 62 insertions(+), 62 deletions(-) diff --git a/mo/src/explorer/moDummyExplorer.h b/mo/src/explorer/moDummyExplorer.h index 3d58dbb08..62c94fd09 100644 --- a/mo/src/explorer/moDummyExplorer.h +++ b/mo/src/explorer/moDummyExplorer.h @@ -35,7 +35,7 @@ #ifndef _moDummyExplorer_h #define _moDummyExplorer_h -#include +#include "moNeighborhoodExplorer.h" /** * Dummy Explorer the neighborhood: nothing is explored diff --git a/mo/src/explorer/moFirstImprHCexplorer.h b/mo/src/explorer/moFirstImprHCexplorer.h index e341908d3..37eaa5ce5 100644 --- a/mo/src/explorer/moFirstImprHCexplorer.h +++ b/mo/src/explorer/moFirstImprHCexplorer.h @@ -35,10 +35,10 @@ #ifndef _moFirstImprHCexplorer_h #define _moFirstImprHCexplorer_h -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" /** * Explorer for a first improvement heuristic diff --git a/mo/src/explorer/moILSexplorer.h b/mo/src/explorer/moILSexplorer.h index 761009005..34b406968 100644 --- a/mo/src/explorer/moILSexplorer.h +++ b/mo/src/explorer/moILSexplorer.h @@ -35,12 +35,12 @@ #ifndef _moILSexplorer_h #define _moILSexplorer_h -#include -#include -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../algo/moLocalSearch.h" +#include "../perturb/moPerturbation.h" +#include "../acceptCrit/moAcceptanceCriterion.h" //#include //#include diff --git a/mo/src/explorer/moMetropolisHastingExplorer.h b/mo/src/explorer/moMetropolisHastingExplorer.h index 1989ff1c3..9d3804312 100644 --- a/mo/src/explorer/moMetropolisHastingExplorer.h +++ b/mo/src/explorer/moMetropolisHastingExplorer.h @@ -37,12 +37,12 @@ #include -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "comparator/moNeighborComparator.h" +#include "comparator/moSolNeighborComparator.h" +#include "neighborhood/moNeighborhood.h" -#include +#include /** * Explorer for the Metropolis-Hasting Sampling. diff --git a/mo/src/explorer/moNeighborhoodExplorer.h b/mo/src/explorer/moNeighborhoodExplorer.h index 8b4113b7a..94f464a56 100644 --- a/mo/src/explorer/moNeighborhoodExplorer.h +++ b/mo/src/explorer/moNeighborhoodExplorer.h @@ -36,12 +36,12 @@ #define _neighborhoodExplorer_h //EO inclusion -#include +#include -#include -#include -#include -#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include "../neighborhood/moDummyNeighborhood.h" +#include "../eval/moDummyEval.h" /** * Explore the neighborhood according to the local search algorithm diff --git a/mo/src/explorer/moNeutralHCexplorer.h b/mo/src/explorer/moNeutralHCexplorer.h index 40443de40..00cc88cdc 100644 --- a/mo/src/explorer/moNeutralHCexplorer.h +++ b/mo/src/explorer/moNeutralHCexplorer.h @@ -35,10 +35,10 @@ #ifndef _moNeutralHCexplorer_h #define _moNeutralHCexplorer_h -#include -#include -#include -#include +#include "moRandomBestHCexplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" /** * Explorer for a neutral Hill-climbing diff --git a/mo/src/explorer/moRandomBestHCexplorer.h b/mo/src/explorer/moRandomBestHCexplorer.h index e96f6673b..5e591e0f6 100644 --- a/mo/src/explorer/moRandomBestHCexplorer.h +++ b/mo/src/explorer/moRandomBestHCexplorer.h @@ -35,12 +35,12 @@ #ifndef _moRandomBestHCexplorer_h #define _moRandomBestHCexplorer_h -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" #include -#include +#include /** * Explorer for Hill-Climbing diff --git a/mo/src/explorer/moRandomNeutralWalkExplorer.h b/mo/src/explorer/moRandomNeutralWalkExplorer.h index 95995c753..460c9e156 100644 --- a/mo/src/explorer/moRandomNeutralWalkExplorer.h +++ b/mo/src/explorer/moRandomNeutralWalkExplorer.h @@ -35,9 +35,9 @@ #ifndef _moRandomNeutralWalkexplorer_h #define _moRandomNeutralWalkexplorer_h -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" /** * Explorer for a random neutral walk diff --git a/mo/src/explorer/moRandomSearchExplorer.h b/mo/src/explorer/moRandomSearchExplorer.h index 0b09da1d9..efee48b48 100644 --- a/mo/src/explorer/moRandomSearchExplorer.h +++ b/mo/src/explorer/moRandomSearchExplorer.h @@ -35,10 +35,10 @@ #ifndef _moRandomSearchexplorer_h #define _moRandomSearchexplorer_h -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../neighborhood/moNeighborhood.h" +#include +#include /** * Explorer for a pure random search: diff --git a/mo/src/explorer/moRandomWalkExplorer.h b/mo/src/explorer/moRandomWalkExplorer.h index 78f1be303..8bd78ac1d 100644 --- a/mo/src/explorer/moRandomWalkExplorer.h +++ b/mo/src/explorer/moRandomWalkExplorer.h @@ -35,10 +35,10 @@ #ifndef _moRandomWalkexplorer_h #define _moRandomWalkexplorer_h -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" /** * Explorer for a random walk diff --git a/mo/src/explorer/moSAexplorer.h b/mo/src/explorer/moSAexplorer.h index 08d859035..cc0877381 100644 --- a/mo/src/explorer/moSAexplorer.h +++ b/mo/src/explorer/moSAexplorer.h @@ -37,12 +37,12 @@ #include -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../coolingSchedule/moCoolingSchedule.h" +#include "../neighborhood/moNeighborhood.h" -#include +#include /** * Explorer for the Simulated Annealing diff --git a/mo/src/explorer/moSimpleHCexplorer.h b/mo/src/explorer/moSimpleHCexplorer.h index b4f235ae8..a53ae5f8d 100644 --- a/mo/src/explorer/moSimpleHCexplorer.h +++ b/mo/src/explorer/moSimpleHCexplorer.h @@ -35,10 +35,10 @@ #ifndef _moSimpleHCexplorer_h #define _moSimpleHCexplorer_h -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" /** * Explorer for a simple Hill-climbing diff --git a/mo/src/explorer/moTSexplorer.h b/mo/src/explorer/moTSexplorer.h index 062af93cc..06c84c368 100644 --- a/mo/src/explorer/moTSexplorer.h +++ b/mo/src/explorer/moTSexplorer.h @@ -34,14 +34,14 @@ #ifndef _moTSexplorer_h #define _moTSexplorer_h -#include -#include -#include -#include -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../memory/moAspiration.h" +#include "../memory/moTabuList.h" +#include "../memory/moIntensification.h" +#include "../memory/moDiversification.h" +#include "../neighborhood/moNeighborhood.h" /** * Explorer for a Tabu Search diff --git a/mo/src/explorer/moVNSexplorer.h b/mo/src/explorer/moVNSexplorer.h index 3c9c2ef27..a79d4d5a0 100644 --- a/mo/src/explorer/moVNSexplorer.h +++ b/mo/src/explorer/moVNSexplorer.h @@ -30,10 +30,10 @@ #ifndef _moVNSexplorer_h #define _moVNSexplorer_h -#include -#include -#include -#include +#include "moNeighborhoodExplorer.h" +#include "../neighborhood/moVariableNeighborhoodSelection.h" +#include +#include "../acceptCrit/moAcceptanceCriterion.h" /** * Explorer for the "Variable Neighborhood Search" metaheuristic