From 2afe369ff1584104af2329f8d7cc567bfbf5354d Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Thu, 15 Aug 2019 23:44:13 -0300 Subject: [PATCH 1/7] Changed includes in acceptCrit folder to relative includes --- mo/src/acceptCrit/moAcceptanceCriterion.h | 4 ++-- mo/src/acceptCrit/moAlwaysAcceptCrit.h | 4 ++-- mo/src/acceptCrit/moBetterAcceptCrit.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mo/src/acceptCrit/moAcceptanceCriterion.h b/mo/src/acceptCrit/moAcceptanceCriterion.h index 266b30f45..4e3291703 100644 --- a/mo/src/acceptCrit/moAcceptanceCriterion.h +++ b/mo/src/acceptCrit/moAcceptanceCriterion.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moAcceptanceCriterion_h #define _moAcceptanceCriterion_h -#include -#include +#include "../../eo/eoFunctor.h" +#include "../memory/moMemory.h" /** * Abstract class for Acceptance criteria diff --git a/mo/src/acceptCrit/moAlwaysAcceptCrit.h b/mo/src/acceptCrit/moAlwaysAcceptCrit.h index 777ef0b18..1f441401e 100644 --- a/mo/src/acceptCrit/moAlwaysAcceptCrit.h +++ b/mo/src/acceptCrit/moAlwaysAcceptCrit.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moAlwaysAcceptCrit_h #define _moAlwaysAcceptCrit_h -#include -#include +#include "moAcceptanceCriterion.h" +#include "../memory/moDummyMemory.h" /** * Acceptance Criterion for extreme diversification : always accept new solution diff --git a/mo/src/acceptCrit/moBetterAcceptCrit.h b/mo/src/acceptCrit/moBetterAcceptCrit.h index e8bfae9d5..ed87eecc2 100644 --- a/mo/src/acceptCrit/moBetterAcceptCrit.h +++ b/mo/src/acceptCrit/moBetterAcceptCrit.h @@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moBetterAcceptCrit_h #define _moBetterAcceptCrit_h -#include -#include -#include +#include "moAcceptanceCriterion.h" +#include "../memory/moDummyMemory.h" +#include "../comparator/moSolComparator.h" /** * Acceptance Criterion for extreme intensification : accept if the new solution is better than previous one From 278bdd00d0b7a6493fa6ceae33e56bb9e101db3f Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Thu, 15 Aug 2019 23:53:10 -0300 Subject: [PATCH 2/7] Include from perturb files was updated --- mo/src/perturb/moLocalSearchInit.h | 4 ++-- mo/src/perturb/moMonOpPerturb.h | 8 ++++---- mo/src/perturb/moNeighborhoodPerturb.h | 6 +++--- mo/src/perturb/moPerturbation.h | 4 ++-- mo/src/perturb/moRestartPerturb.h | 8 ++++---- mo/src/perturb/moSolInit.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mo/src/perturb/moLocalSearchInit.h b/mo/src/perturb/moLocalSearchInit.h index d91c5c719..e8f977111 100644 --- a/mo/src/perturb/moLocalSearchInit.h +++ b/mo/src/perturb/moLocalSearchInit.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moLocalSearchInit_h #define _moLocalSearchInit_h -#include -#include +#include "../../eo/eoInit.h" +#include "../algo/moLocalSearch.h" /** * Initialization of the solution with a local search diff --git a/mo/src/perturb/moMonOpPerturb.h b/mo/src/perturb/moMonOpPerturb.h index b043a99e9..e776643f3 100644 --- a/mo/src/perturb/moMonOpPerturb.h +++ b/mo/src/perturb/moMonOpPerturb.h @@ -30,10 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moMonOpPerturb_h #define _moMonOpPerturb_h -#include -#include -#include -#include +#include "../../eo/eoEvalFunc.h" +#include "../../eo/eoOp.h" +#include "moPerturbation.h" +#include "../memory/moDummyMemory.h" /** * Perturbation operator using only a eoMonOp diff --git a/mo/src/perturb/moNeighborhoodPerturb.h b/mo/src/perturb/moNeighborhoodPerturb.h index 676f5a828..30613e2f6 100644 --- a/mo/src/perturb/moNeighborhoodPerturb.h +++ b/mo/src/perturb/moNeighborhoodPerturb.h @@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moNeighborhoodPerturb_h #define _moNeighborhoodPerturb_h -#include -#include -#include +#include "../eval/moEval.h" +#include "moPerturbation.h" +#include "../neighborhood/moNeighborhood.h" /** * Neighborhood Perturbation: explore the neighborhood to perturb the solution (the neighborhood could be different as the one used in the Local Search) diff --git a/mo/src/perturb/moPerturbation.h b/mo/src/perturb/moPerturbation.h index 46fb9b0b9..415a195c4 100644 --- a/mo/src/perturb/moPerturbation.h +++ b/mo/src/perturb/moPerturbation.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moPertubation_h #define _moPertubation_h -#include -#include +#include +#include "../memory/moMemory.h" /** * Abstract class for Perturbation operator diff --git a/mo/src/perturb/moRestartPerturb.h b/mo/src/perturb/moRestartPerturb.h index c1b4b78ba..5f70f356d 100644 --- a/mo/src/perturb/moRestartPerturb.h +++ b/mo/src/perturb/moRestartPerturb.h @@ -31,10 +31,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #define _moRestartPerturb_h -#include -#include -#include -#include +#include +#include +#include "moPerturbation.h" +#include "../memory/moCountMoveMemory.h" /** * Restart Perturbation : restart when maximum number of iteration with no improvement is reached diff --git a/mo/src/perturb/moSolInit.h b/mo/src/perturb/moSolInit.h index 8707d47fa..8b831ded4 100644 --- a/mo/src/perturb/moSolInit.h +++ b/mo/src/perturb/moSolInit.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moSolInit_h #define _moSolInit_h -#include +#include /** * Initialization of the solution with the external solution From a12cce576d0d19be1e9764e48cf3c727aadf45f8 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Fri, 16 Aug 2019 23:48:14 -0300 Subject: [PATCH 3/7] 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" /** From 026b3f9192d5e547e6fca171f2485c0b8c25b000 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 00:21:46 -0300 Subject: [PATCH 4/7] Update includes on mo/continuator --- mo/src/continuator/moAverageFitnessNeighborStat.h | 4 ++-- mo/src/continuator/moBestFitnessStat.h | 2 +- mo/src/continuator/moBestNoImproveContinuator.h | 6 +++--- mo/src/continuator/moBestSoFarStat.h | 2 +- mo/src/continuator/moBooleanStat.h | 2 +- mo/src/continuator/moCheckpoint.h | 12 ++++++------ mo/src/continuator/moCombinedContinuator.h | 4 ++-- mo/src/continuator/moContinuator.h | 4 ++-- mo/src/continuator/moCounterMonitorSaver.h | 4 ++-- mo/src/continuator/moCounterStat.h | 2 +- mo/src/continuator/moDistanceStat.h | 4 ++-- mo/src/continuator/moEvalsContinuator.h | 8 ++++---- mo/src/continuator/moFitContinuator.h | 4 ++-- mo/src/continuator/moFitnessStat.h | 2 +- mo/src/continuator/moFullEvalContinuator.h | 6 +++--- mo/src/continuator/moIterContinuator.h | 4 ++-- mo/src/continuator/moMaxNeighborStat.h | 6 +++--- mo/src/continuator/moMedianNeighborStat.h | 6 +++--- mo/src/continuator/moMinNeighborStat.h | 6 +++--- mo/src/continuator/moMinusOneCounterStat.h | 2 +- mo/src/continuator/moNbInfNeighborStat.h | 6 +++--- mo/src/continuator/moNbSupNeighborStat.h | 6 +++--- mo/src/continuator/moNeighborBestStat.h | 10 +++++----- mo/src/continuator/moNeighborEvalContinuator.h | 6 +++--- mo/src/continuator/moNeighborFitnessStat.h | 6 +++--- mo/src/continuator/moNeighborhoodStat.h | 11 ++++++----- mo/src/continuator/moNeutralDegreeNeighborStat.h | 4 ++-- mo/src/continuator/moQ1NeighborStat.h | 6 +++--- mo/src/continuator/moQ3NeighborStat.h | 6 +++--- mo/src/continuator/moQuartilesNeighborStat.h | 4 ++-- mo/src/continuator/moSecondMomentNeighborStat.h | 4 ++-- mo/src/continuator/moSizeNeighborStat.h | 4 ++-- mo/src/continuator/moSolutionStat.h | 2 +- mo/src/continuator/moStat.h | 2 +- mo/src/continuator/moStatBase.h | 4 ++-- mo/src/continuator/moStatFromStat.h | 2 +- mo/src/continuator/moStdFitnessNeighborStat.h | 4 ++-- mo/src/continuator/moTimeContinuator.h | 2 +- mo/src/continuator/moTrueContinuator.h | 2 +- mo/src/continuator/moUnsignedStat.h | 2 +- mo/src/continuator/moUpdater.h | 4 ++-- mo/src/continuator/moValueParamContinuator.h | 4 ++-- mo/src/continuator/moValueStat.h | 4 ++-- mo/src/continuator/moVectorMonitor.h | 4 ++-- 44 files changed, 100 insertions(+), 99 deletions(-) diff --git a/mo/src/continuator/moAverageFitnessNeighborStat.h b/mo/src/continuator/moAverageFitnessNeighborStat.h index 7d12abc0a..eee74b516 100644 --- a/mo/src/continuator/moAverageFitnessNeighborStat.h +++ b/mo/src/continuator/moAverageFitnessNeighborStat.h @@ -35,8 +35,8 @@ #ifndef moAverageFitnessNeighborStat_h #define moAverageFitnessNeighborStat_h -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" /** * From moNeighborhoodStat, to compute the average of fitness in the neighborhood diff --git a/mo/src/continuator/moBestFitnessStat.h b/mo/src/continuator/moBestFitnessStat.h index 192919c88..dfc7bd061 100644 --- a/mo/src/continuator/moBestFitnessStat.h +++ b/mo/src/continuator/moBestFitnessStat.h @@ -35,7 +35,7 @@ #ifndef moBestFitnessStat_h #define moBestFitnessStat_h -#include +#include "moStat.h" /** * The statistic which save the best solution found during the search diff --git a/mo/src/continuator/moBestNoImproveContinuator.h b/mo/src/continuator/moBestNoImproveContinuator.h index 86981bef4..0168361ef 100644 --- a/mo/src/continuator/moBestNoImproveContinuator.h +++ b/mo/src/continuator/moBestNoImproveContinuator.h @@ -30,9 +30,9 @@ #ifndef _moBestNoImproveContinuator_h #define _moBestNoImproveContinuator_h -#include -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" +#include "../comparator/moSolComparator.h" /** * Stop when the best solution cannot be improved diff --git a/mo/src/continuator/moBestSoFarStat.h b/mo/src/continuator/moBestSoFarStat.h index fa5797139..3c8433405 100644 --- a/mo/src/continuator/moBestSoFarStat.h +++ b/mo/src/continuator/moBestSoFarStat.h @@ -35,7 +35,7 @@ #ifndef moBestSoFarStat_h #define moBestSoFarStat_h -#include +#include "moStat.h" /** * The statistic which save the best solution found during the search diff --git a/mo/src/continuator/moBooleanStat.h b/mo/src/continuator/moBooleanStat.h index a098efc23..f264ccb22 100644 --- a/mo/src/continuator/moBooleanStat.h +++ b/mo/src/continuator/moBooleanStat.h @@ -35,7 +35,7 @@ #ifndef moBooleanStat_h #define moBooleanStat_h -#include +#include "moStat.h" /** * The statistic gives from a boolean variable diff --git a/mo/src/continuator/moCheckpoint.h b/mo/src/continuator/moCheckpoint.h index 37b5cd610..63dd9116d 100644 --- a/mo/src/continuator/moCheckpoint.h +++ b/mo/src/continuator/moCheckpoint.h @@ -35,12 +35,12 @@ #ifndef moCheckpoint_h #define moCheckpoint_h -#include -#include -#include -#include -#include -#include +#include "moContinuator.h" +#include +#include "moStatBase.h" +#include +#include "moUpdater.h" +#include "../neighborhood/moNeighborhood.h" /** * Continuator allowing to add others (continuators, stats, monitors or updaters) diff --git a/mo/src/continuator/moCombinedContinuator.h b/mo/src/continuator/moCombinedContinuator.h index 7533bd4fa..420fb1aef 100644 --- a/mo/src/continuator/moCombinedContinuator.h +++ b/mo/src/continuator/moCombinedContinuator.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moCombinedContinuator_h #define _moCombinedContinuator_h -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" #include /** diff --git a/mo/src/continuator/moContinuator.h b/mo/src/continuator/moContinuator.h index cec268038..2967b6293 100644 --- a/mo/src/continuator/moContinuator.h +++ b/mo/src/continuator/moContinuator.h @@ -35,8 +35,8 @@ #ifndef _moContinuator_h #define _moContinuator_h -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" /** * To make specific continuator from a solution diff --git a/mo/src/continuator/moCounterMonitorSaver.h b/mo/src/continuator/moCounterMonitorSaver.h index f57e05d2d..d302f9e39 100644 --- a/mo/src/continuator/moCounterMonitorSaver.h +++ b/mo/src/continuator/moCounterMonitorSaver.h @@ -35,8 +35,8 @@ #ifndef moCounterMonitorSaver_h #define moCounterMonitorSaver_h -#include -#include +#include +#include /** * Class calling monitors with a given frequency diff --git a/mo/src/continuator/moCounterStat.h b/mo/src/continuator/moCounterStat.h index 85534e67e..680e8b399 100644 --- a/mo/src/continuator/moCounterStat.h +++ b/mo/src/continuator/moCounterStat.h @@ -35,7 +35,7 @@ #ifndef moCounterStat_h #define moCounterStat_h -#include +#include "moStat.h" /** * The statistic gives the number of iteration diff --git a/mo/src/continuator/moDistanceStat.h b/mo/src/continuator/moDistanceStat.h index 06cfe0007..e20c0e575 100644 --- a/mo/src/continuator/moDistanceStat.h +++ b/mo/src/continuator/moDistanceStat.h @@ -35,8 +35,8 @@ #ifndef moDistanceStat_h #define moDistanceStat_h -#include -#include +#include +#include "moStat.h" /** * The statistic gives the distance to a reference solution diff --git a/mo/src/continuator/moEvalsContinuator.h b/mo/src/continuator/moEvalsContinuator.h index 1a020da6c..9117f0f10 100644 --- a/mo/src/continuator/moEvalsContinuator.h +++ b/mo/src/continuator/moEvalsContinuator.h @@ -30,10 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moEvalsContinuator_h #define _moEvalsContinuator_h -#include -#include -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" +#include +#include "../eval/moEvalCounter.h" /** * Continue until a maximum fixed number of full evaluation and neighbor evaluation is reached (total number of evaluation = full evaluation + incremental evaluation) diff --git a/mo/src/continuator/moFitContinuator.h b/mo/src/continuator/moFitContinuator.h index 03ac6b686..02628047d 100644 --- a/mo/src/continuator/moFitContinuator.h +++ b/mo/src/continuator/moFitContinuator.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moFitContinuator_h #define _moFitContinuator_h -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" /** * Continue until a maximum fitness is reached diff --git a/mo/src/continuator/moFitnessStat.h b/mo/src/continuator/moFitnessStat.h index d4f2f4bea..23d1f5416 100644 --- a/mo/src/continuator/moFitnessStat.h +++ b/mo/src/continuator/moFitnessStat.h @@ -35,7 +35,7 @@ #ifndef moFitnessStat_h #define moFitnessStat_h -#include +#include "moStat.h" /** * Stat given the fitness of the current solution diff --git a/mo/src/continuator/moFullEvalContinuator.h b/mo/src/continuator/moFullEvalContinuator.h index 5239c1dea..28a61c942 100644 --- a/mo/src/continuator/moFullEvalContinuator.h +++ b/mo/src/continuator/moFullEvalContinuator.h @@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moFullEvalContinuator_h #define _moFullEvalContinuator_h -#include -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" +#include /** * Continue until a maximum fixed number of full evaluation is reached diff --git a/mo/src/continuator/moIterContinuator.h b/mo/src/continuator/moIterContinuator.h index f10db39f5..fab530e9a 100644 --- a/mo/src/continuator/moIterContinuator.h +++ b/mo/src/continuator/moIterContinuator.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moIterContinuator_h #define _moIterContinuator_h -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" /** * Continue until a maximum fixed number of iterations is reached diff --git a/mo/src/continuator/moMaxNeighborStat.h b/mo/src/continuator/moMaxNeighborStat.h index f0b165d72..a482ac99a 100644 --- a/mo/src/continuator/moMaxNeighborStat.h +++ b/mo/src/continuator/moMaxNeighborStat.h @@ -35,9 +35,9 @@ #ifndef moMaxNeighborStat_h #define moMaxNeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, to compute the max fitness in the neighborhood diff --git a/mo/src/continuator/moMedianNeighborStat.h b/mo/src/continuator/moMedianNeighborStat.h index 4c3cfb8f2..959856d11 100644 --- a/mo/src/continuator/moMedianNeighborStat.h +++ b/mo/src/continuator/moMedianNeighborStat.h @@ -35,9 +35,9 @@ #ifndef moMedianNeighborStat_h #define moMedianNeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, diff --git a/mo/src/continuator/moMinNeighborStat.h b/mo/src/continuator/moMinNeighborStat.h index bd1cae1f9..1a952292a 100644 --- a/mo/src/continuator/moMinNeighborStat.h +++ b/mo/src/continuator/moMinNeighborStat.h @@ -35,9 +35,9 @@ #ifndef moMinNeighborStat_h #define moMinNeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, to compute the min fitness in the neighborhood diff --git a/mo/src/continuator/moMinusOneCounterStat.h b/mo/src/continuator/moMinusOneCounterStat.h index dfb9be881..3eba9dd73 100644 --- a/mo/src/continuator/moMinusOneCounterStat.h +++ b/mo/src/continuator/moMinusOneCounterStat.h @@ -35,7 +35,7 @@ #ifndef moMinusOneCounterStat_h #define moMinusOneCounterStat_h -#include +#include "moStat.h" /** * The statistic gives the number of iteration minus 1 diff --git a/mo/src/continuator/moNbInfNeighborStat.h b/mo/src/continuator/moNbInfNeighborStat.h index e3bc27bb7..43f634e09 100644 --- a/mo/src/continuator/moNbInfNeighborStat.h +++ b/mo/src/continuator/moNbInfNeighborStat.h @@ -35,9 +35,9 @@ #ifndef moNbInfNeighborStat_h #define moNbInfNeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, to compute the number of solutions in the neighborhood diff --git a/mo/src/continuator/moNbSupNeighborStat.h b/mo/src/continuator/moNbSupNeighborStat.h index 8febf94f8..034bd9a20 100644 --- a/mo/src/continuator/moNbSupNeighborStat.h +++ b/mo/src/continuator/moNbSupNeighborStat.h @@ -35,9 +35,9 @@ #ifndef moNbSupNeighborStat_h #define moNbSupNeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, to compute the number of solutions in the neighborhood diff --git a/mo/src/continuator/moNeighborBestStat.h b/mo/src/continuator/moNeighborBestStat.h index f7e607985..98d50cba3 100644 --- a/mo/src/continuator/moNeighborBestStat.h +++ b/mo/src/continuator/moNeighborBestStat.h @@ -35,12 +35,12 @@ #ifndef moNeighborBestStat_h #define moNeighborBestStat_h -#include +#include "moStat.h" -#include -#include -#include -#include +#include "../explorer/moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" /** * Compute the fitness of the best solution among k neighbor or all neighbors diff --git a/mo/src/continuator/moNeighborEvalContinuator.h b/mo/src/continuator/moNeighborEvalContinuator.h index ba3a41a9d..9e0be7d39 100644 --- a/mo/src/continuator/moNeighborEvalContinuator.h +++ b/mo/src/continuator/moNeighborEvalContinuator.h @@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moNeighborEvalContinuator_h #define _moNeighborEvalContinuator_h -#include -#include -#include +#include "moContinuator.h" +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEvalCounter.h" /** * Continue until a maximum fixed number of neighbor evaluation is reached diff --git a/mo/src/continuator/moNeighborFitnessStat.h b/mo/src/continuator/moNeighborFitnessStat.h index ab0d3bcb9..10556bc49 100644 --- a/mo/src/continuator/moNeighborFitnessStat.h +++ b/mo/src/continuator/moNeighborFitnessStat.h @@ -35,9 +35,9 @@ #ifndef moNeighborFitnessStat_h #define moNeighborFitnessStat_h -#include -#include -#include +#include "moStat.h" +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" /** * Compute the fitness of one random neighbor diff --git a/mo/src/continuator/moNeighborhoodStat.h b/mo/src/continuator/moNeighborhoodStat.h index 3ce7d3757..e70af855f 100644 --- a/mo/src/continuator/moNeighborhoodStat.h +++ b/mo/src/continuator/moNeighborhoodStat.h @@ -35,12 +35,13 @@ #ifndef moNeighborhoodStat_h #define moNeighborhoodStat_h -#include +#include "moStat.h" + +#include "../explorer/moNeighborhoodExplorer.h" +#include "../comparator/moNeighborComparator.h" +#include "../comparator/moSolNeighborComparator.h" +#include "../neighborhood/moNeighborhood.h" -#include -#include -#include -#include #include #include // std::sort diff --git a/mo/src/continuator/moNeutralDegreeNeighborStat.h b/mo/src/continuator/moNeutralDegreeNeighborStat.h index d46e99475..4d24c53a1 100644 --- a/mo/src/continuator/moNeutralDegreeNeighborStat.h +++ b/mo/src/continuator/moNeutralDegreeNeighborStat.h @@ -35,8 +35,8 @@ #ifndef moNeutralDegreeNeighborStat_h #define moNeutralDegreeNeighborStat_h -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" /** * From moNeighborhoodStat, to compute the neutral degree of the solution diff --git a/mo/src/continuator/moQ1NeighborStat.h b/mo/src/continuator/moQ1NeighborStat.h index 4d74be68d..4709364aa 100644 --- a/mo/src/continuator/moQ1NeighborStat.h +++ b/mo/src/continuator/moQ1NeighborStat.h @@ -35,9 +35,9 @@ #ifndef moQ1NeighborStat_h #define moQ1NeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, diff --git a/mo/src/continuator/moQ3NeighborStat.h b/mo/src/continuator/moQ3NeighborStat.h index 50426e65f..82c52306b 100644 --- a/mo/src/continuator/moQ3NeighborStat.h +++ b/mo/src/continuator/moQ3NeighborStat.h @@ -35,9 +35,9 @@ #ifndef moQ3NeighborStat_h #define moQ3NeighborStat_h -#include -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" +#include "../neighborhood/moNeighborhood.h" /** * From moNeighborhoodStat, diff --git a/mo/src/continuator/moQuartilesNeighborStat.h b/mo/src/continuator/moQuartilesNeighborStat.h index 69f6af68a..81cdd02f5 100644 --- a/mo/src/continuator/moQuartilesNeighborStat.h +++ b/mo/src/continuator/moQuartilesNeighborStat.h @@ -35,8 +35,8 @@ #ifndef moQuartilesNeighborStat_h #define moQuartilesNeighborStat_h -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" /** * From moNeighborhoodStat, diff --git a/mo/src/continuator/moSecondMomentNeighborStat.h b/mo/src/continuator/moSecondMomentNeighborStat.h index 7c3a08fff..eb93d8c5d 100644 --- a/mo/src/continuator/moSecondMomentNeighborStat.h +++ b/mo/src/continuator/moSecondMomentNeighborStat.h @@ -35,8 +35,8 @@ #ifndef moSecondMomentNeighborStat_h #define moSecondMomentNeighborStat_h -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" /** * From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood diff --git a/mo/src/continuator/moSizeNeighborStat.h b/mo/src/continuator/moSizeNeighborStat.h index 1a5b5b123..b6b15a55a 100644 --- a/mo/src/continuator/moSizeNeighborStat.h +++ b/mo/src/continuator/moSizeNeighborStat.h @@ -35,8 +35,8 @@ #ifndef moSizeNeighborStat_h #define moSizeNeighborStat_h -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" /** * From moNeighborhoodStat, to compute the number of solutions in the neighborhood diff --git a/mo/src/continuator/moSolutionStat.h b/mo/src/continuator/moSolutionStat.h index 93c4f57f5..08a9ac77c 100644 --- a/mo/src/continuator/moSolutionStat.h +++ b/mo/src/continuator/moSolutionStat.h @@ -35,7 +35,7 @@ #ifndef moSolutionStat_h #define moSolutionStat_h -#include +#include "moStat.h" /** * The statistic which only give the current solution. diff --git a/mo/src/continuator/moStat.h b/mo/src/continuator/moStat.h index b986166f3..903816440 100644 --- a/mo/src/continuator/moStat.h +++ b/mo/src/continuator/moStat.h @@ -35,7 +35,7 @@ #ifndef moStat_h #define moStat_h -#include +#include "moStatBase.h" /** * The actual class that will be used as base for all statistics diff --git a/mo/src/continuator/moStatBase.h b/mo/src/continuator/moStatBase.h index f0553ee1f..7f338ccb7 100644 --- a/mo/src/continuator/moStatBase.h +++ b/mo/src/continuator/moStatBase.h @@ -35,8 +35,8 @@ #ifndef moStatBase_h #define moStatBase_h -#include -#include +#include +#include /** * Base class for all statistics that need to be calculated diff --git a/mo/src/continuator/moStatFromStat.h b/mo/src/continuator/moStatFromStat.h index 962106eb0..b895f487d 100644 --- a/mo/src/continuator/moStatFromStat.h +++ b/mo/src/continuator/moStatFromStat.h @@ -35,7 +35,7 @@ #ifndef moStatFromStat_h #define moStatFromStat_h -#include +#include "moStat.h" /** * The statistic which copy another statistic diff --git a/mo/src/continuator/moStdFitnessNeighborStat.h b/mo/src/continuator/moStdFitnessNeighborStat.h index 649308f74..8e2f7347e 100644 --- a/mo/src/continuator/moStdFitnessNeighborStat.h +++ b/mo/src/continuator/moStdFitnessNeighborStat.h @@ -35,8 +35,8 @@ #ifndef moStdFitnessNeighborStat_h #define moStdFitnessNeighborStat_h -#include -#include +#include "moStat.h" +#include "moNeighborhoodStat.h" /** * From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood diff --git a/mo/src/continuator/moTimeContinuator.h b/mo/src/continuator/moTimeContinuator.h index 513928000..2d47313ac 100644 --- a/mo/src/continuator/moTimeContinuator.h +++ b/mo/src/continuator/moTimeContinuator.h @@ -32,7 +32,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include -#include +#include "moContinuator.h" /** * Termination condition until a running time is reached. diff --git a/mo/src/continuator/moTrueContinuator.h b/mo/src/continuator/moTrueContinuator.h index 88feb91a3..d83af6ea6 100644 --- a/mo/src/continuator/moTrueContinuator.h +++ b/mo/src/continuator/moTrueContinuator.h @@ -35,7 +35,7 @@ #ifndef _moTrueContinuator_h #define _moTrueContinuator_h -#include +#include "moContinuator.h" /** * Continuator always return True diff --git a/mo/src/continuator/moUnsignedStat.h b/mo/src/continuator/moUnsignedStat.h index c1f8342cd..bc1eba9c3 100644 --- a/mo/src/continuator/moUnsignedStat.h +++ b/mo/src/continuator/moUnsignedStat.h @@ -35,7 +35,7 @@ #ifndef moUnsignedStat_h #define moUnsignedStat_h -#include +#include "moStat.h" /** * The statistic gives from a boolean variable diff --git a/mo/src/continuator/moUpdater.h b/mo/src/continuator/moUpdater.h index 0be846d38..ae4bee87c 100644 --- a/mo/src/continuator/moUpdater.h +++ b/mo/src/continuator/moUpdater.h @@ -35,8 +35,8 @@ #ifndef moUpdater_h #define moUpdater_h -#include -#include +#include +#include /** * Base class for to update what ever you want diff --git a/mo/src/continuator/moValueParamContinuator.h b/mo/src/continuator/moValueParamContinuator.h index 3fade146c..c5ae85be2 100644 --- a/mo/src/continuator/moValueParamContinuator.h +++ b/mo/src/continuator/moValueParamContinuator.h @@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moValueParamContinuator_h #define _moValueParamContinuator_h -#include +#include "moContinuator.h" //#include -#include +#include /** * Continue until a maximum fixed number of full evaluation is reached diff --git a/mo/src/continuator/moValueStat.h b/mo/src/continuator/moValueStat.h index 0d8d8877d..e843535b9 100644 --- a/mo/src/continuator/moValueStat.h +++ b/mo/src/continuator/moValueStat.h @@ -35,8 +35,8 @@ #ifndef moValueStat_h #define moValueStat_h -#include -#include +#include "moStat.h" +#include /** * The statistic gives the number of iteration diff --git a/mo/src/continuator/moVectorMonitor.h b/mo/src/continuator/moVectorMonitor.h index 853096448..a2e3cbb85 100644 --- a/mo/src/continuator/moVectorMonitor.h +++ b/mo/src/continuator/moVectorMonitor.h @@ -36,8 +36,8 @@ #define moVectorMonitor_h #include -#include -#include +#include +#include /** * To save the values of the same type (double, unsigned int, or EOT) in a vector From e9a31d2b5baa0a22e9b8cfa307df518b61c34580 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 00:25:34 -0300 Subject: [PATCH 5/7] Update includes on mo/comparator --- mo/src/comparator/moComparator.h | 4 ++-- mo/src/comparator/moEqualNeighborComparator.h | 4 ++-- mo/src/comparator/moEqualSolComparator.h | 2 +- mo/src/comparator/moEqualSolNeighborComparator.h | 8 ++++---- mo/src/comparator/moNeighborComparator.h | 4 ++-- mo/src/comparator/moSolComparator.h | 2 +- mo/src/comparator/moSolNeighborComparator.h | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mo/src/comparator/moComparator.h b/mo/src/comparator/moComparator.h index 153e39422..dc9bb1394 100644 --- a/mo/src/comparator/moComparator.h +++ b/mo/src/comparator/moComparator.h @@ -35,8 +35,8 @@ #ifndef _moComparator_h #define _moComparator_h -#include -#include +#include +#include /** diff --git a/mo/src/comparator/moEqualNeighborComparator.h b/mo/src/comparator/moEqualNeighborComparator.h index 6ea148df0..b54aee0ea 100644 --- a/mo/src/comparator/moEqualNeighborComparator.h +++ b/mo/src/comparator/moEqualNeighborComparator.h @@ -35,8 +35,8 @@ #ifndef _moEqualNeighborComparator_h #define _moEqualNeighborComparator_h -#include -#include +#include "../neighborhood/moNeighbor.h" +#include "moNeighborComparator.h" /** * Comparator of two neighbors : a neighbor is better if the fitness is higher or equal diff --git a/mo/src/comparator/moEqualSolComparator.h b/mo/src/comparator/moEqualSolComparator.h index 0764d4e21..174bc5a62 100644 --- a/mo/src/comparator/moEqualSolComparator.h +++ b/mo/src/comparator/moEqualSolComparator.h @@ -35,7 +35,7 @@ #ifndef _moEqualSolComparator_h #define _moEqualSolComparator_h -#include +#include "moSolComparator.h" /** * Comparator of two solutions : a neighbor is better if the fitness is higher or equal diff --git a/mo/src/comparator/moEqualSolNeighborComparator.h b/mo/src/comparator/moEqualSolNeighborComparator.h index 6f706dc73..ee8f97d85 100644 --- a/mo/src/comparator/moEqualSolNeighborComparator.h +++ b/mo/src/comparator/moEqualSolNeighborComparator.h @@ -35,11 +35,11 @@ #ifndef _moEqualSolNeighborComparator_h #define _moEqualSolNeighborComparator_h -#include -#include +#include +#include -#include -#include +#include "../neighborhood/moNeighbor.h" +#include "../comparator/moSolNeighborComparator.h" /** diff --git a/mo/src/comparator/moNeighborComparator.h b/mo/src/comparator/moNeighborComparator.h index 869adbb5c..6e8d06dcf 100644 --- a/mo/src/comparator/moNeighborComparator.h +++ b/mo/src/comparator/moNeighborComparator.h @@ -35,8 +35,8 @@ #ifndef _moNeighborComparator_h #define _moNeighborComparator_h -#include -#include +#include "../neighborhood/moNeighbor.h" +#include "moComparator.h" /** * Comparator of two neighbors diff --git a/mo/src/comparator/moSolComparator.h b/mo/src/comparator/moSolComparator.h index d7f30c2f8..d1b638c92 100644 --- a/mo/src/comparator/moSolComparator.h +++ b/mo/src/comparator/moSolComparator.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moSolComparator_h #define _moSolComparator_h -#include +#include "moComparator.h" /** * Comparator of two solutions diff --git a/mo/src/comparator/moSolNeighborComparator.h b/mo/src/comparator/moSolNeighborComparator.h index 2275a6494..3b127d499 100644 --- a/mo/src/comparator/moSolNeighborComparator.h +++ b/mo/src/comparator/moSolNeighborComparator.h @@ -35,11 +35,11 @@ #ifndef _moSolNeighborComparator_h #define _moSolNeighborComparator_h -#include -#include +#include +#include -#include -#include +#include "../neighborhood/moNeighbor.h" +#include "moComparator.h" /** From b884a5bebf41474977d36192217504718b6956d2 Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 00:27:10 -0300 Subject: [PATCH 6/7] Update includes on mo/coolingSchedule --- mo/src/coolingSchedule/moCoolingSchedule.h | 2 +- mo/src/coolingSchedule/moDynSpanCoolingSchedule.h | 2 +- mo/src/coolingSchedule/moSimpleCoolingSchedule.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mo/src/coolingSchedule/moCoolingSchedule.h b/mo/src/coolingSchedule/moCoolingSchedule.h index 9b65cf1b5..8a11a2bab 100644 --- a/mo/src/coolingSchedule/moCoolingSchedule.h +++ b/mo/src/coolingSchedule/moCoolingSchedule.h @@ -35,7 +35,7 @@ #ifndef _moCoolingSchedule_h #define _moCoolingSchedule_h -#include +#include /** * Cooling Schedule of the temperature in the simulated algorithm diff --git a/mo/src/coolingSchedule/moDynSpanCoolingSchedule.h b/mo/src/coolingSchedule/moDynSpanCoolingSchedule.h index 34b386312..ae5aae5ba 100644 --- a/mo/src/coolingSchedule/moDynSpanCoolingSchedule.h +++ b/mo/src/coolingSchedule/moDynSpanCoolingSchedule.h @@ -35,7 +35,7 @@ #ifndef _moDynSpanCoolingSchedule_h #define _moDynSpanCoolingSchedule_h -#include +#include "moCoolingSchedule.h" /** * Cooling Schedule of the temperature in the simulated algorithm diff --git a/mo/src/coolingSchedule/moSimpleCoolingSchedule.h b/mo/src/coolingSchedule/moSimpleCoolingSchedule.h index 5ff4f4920..f3b7b8ae8 100644 --- a/mo/src/coolingSchedule/moSimpleCoolingSchedule.h +++ b/mo/src/coolingSchedule/moSimpleCoolingSchedule.h @@ -35,7 +35,7 @@ #ifndef _moSimpleCoolingSchedule_h #define _moSimpleCoolingSchedule_h -#include +#include "moCoolingSchedule.h" /** * Classical cooling Schedule of the temperature in the simulated algorithm with initial and final temperature and a factor of decrease From 5ce19f52f5ca080224f66196d1a30662ab6cd10a Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 16:11:07 -0300 Subject: [PATCH 7/7] Update includes on mo/neighborhood --- mo/src/neighborhood/moBackableNeighbor.h | 2 +- mo/src/neighborhood/moBackwardVectorVNSelection.h | 2 +- mo/src/neighborhood/moDummyNeighbor.h | 2 +- mo/src/neighborhood/moDummyNeighborhood.h | 4 ++-- mo/src/neighborhood/moEvaluatedNeighborhood.h | 4 ++-- mo/src/neighborhood/moForwardVectorVNSelection.h | 2 +- mo/src/neighborhood/moIndexNeighbor.h | 2 +- mo/src/neighborhood/moIndexNeighborhood.h | 2 +- mo/src/neighborhood/moNeighbor.h | 6 +++--- mo/src/neighborhood/moNeighborhood.h | 2 +- mo/src/neighborhood/moOrderNeighborhood.h | 2 +- mo/src/neighborhood/moRndNeighborhood.h | 2 +- mo/src/neighborhood/moRndVectorVNSelection.h | 6 +++--- mo/src/neighborhood/moRndWithReplNeighborhood.h | 6 +++--- mo/src/neighborhood/moRndWithoutReplNeighborhood.h | 6 +++--- mo/src/neighborhood/moVariableNeighborhoodSelection.h | 2 +- mo/src/neighborhood/moVectorVNSelection.h | 4 ++-- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mo/src/neighborhood/moBackableNeighbor.h b/mo/src/neighborhood/moBackableNeighbor.h index 4a851c451..608674938 100644 --- a/mo/src/neighborhood/moBackableNeighbor.h +++ b/mo/src/neighborhood/moBackableNeighbor.h @@ -35,7 +35,7 @@ #ifndef _BackableNeighbor_h #define _BackableNeighbor_h -#include +#include "moNeighbor.h" /** * Neighbor with a move back function to use in a moFullEvalByModif diff --git a/mo/src/neighborhood/moBackwardVectorVNSelection.h b/mo/src/neighborhood/moBackwardVectorVNSelection.h index b3050c439..cb9c41035 100644 --- a/mo/src/neighborhood/moBackwardVectorVNSelection.h +++ b/mo/src/neighborhood/moBackwardVectorVNSelection.h @@ -30,7 +30,7 @@ #ifndef _moBackwardVectorVNSelection_h #define _moBackwardVectorVNSelection_h -#include +#include "moVectorVNSelection.h" /** * This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection diff --git a/mo/src/neighborhood/moDummyNeighbor.h b/mo/src/neighborhood/moDummyNeighbor.h index a8cd01087..09913cb64 100644 --- a/mo/src/neighborhood/moDummyNeighbor.h +++ b/mo/src/neighborhood/moDummyNeighbor.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyNeighbor_h #define _moDummyNeighbor_h -#include +#include "moNeighbor.h" /** * Dummy Neighborhood diff --git a/mo/src/neighborhood/moDummyNeighborhood.h b/mo/src/neighborhood/moDummyNeighborhood.h index 26c62163c..954416078 100644 --- a/mo/src/neighborhood/moDummyNeighborhood.h +++ b/mo/src/neighborhood/moDummyNeighborhood.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyNeighborhood_h #define _moDummyNeighborhood_h -#include -#include +#include "moDummyNeighbor.h" +#include "moNeighborhood.h" /** * Dummy Neighborhood diff --git a/mo/src/neighborhood/moEvaluatedNeighborhood.h b/mo/src/neighborhood/moEvaluatedNeighborhood.h index 52f1f54d8..ac303ce4d 100644 --- a/mo/src/neighborhood/moEvaluatedNeighborhood.h +++ b/mo/src/neighborhood/moEvaluatedNeighborhood.h @@ -35,8 +35,8 @@ #ifndef _moEvaluatedNeighborhood_h #define _moEvaluatedNeighborhood_h -#include -#include +#include "moNeighborhood.h" +#include "../eval/moNeighborhoodEvaluation.h" /** * A Neighborhood for the evaluation of all neighbors diff --git a/mo/src/neighborhood/moForwardVectorVNSelection.h b/mo/src/neighborhood/moForwardVectorVNSelection.h index d7d3546cb..b6ba0f7f9 100644 --- a/mo/src/neighborhood/moForwardVectorVNSelection.h +++ b/mo/src/neighborhood/moForwardVectorVNSelection.h @@ -30,7 +30,7 @@ #ifndef _moForwardVectorVNSelection_h #define _moForwardVectorVNSelection_h -#include +#include "moVectorVNSelection.h" /** * This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection diff --git a/mo/src/neighborhood/moIndexNeighbor.h b/mo/src/neighborhood/moIndexNeighbor.h index eaf302966..35e822f6b 100644 --- a/mo/src/neighborhood/moIndexNeighbor.h +++ b/mo/src/neighborhood/moIndexNeighbor.h @@ -35,7 +35,7 @@ #ifndef _IndexNeighbor_h #define _IndexNeighbor_h -#include +#include "moNeighbor.h" /** * Index Neighbor diff --git a/mo/src/neighborhood/moIndexNeighborhood.h b/mo/src/neighborhood/moIndexNeighborhood.h index 83d06b267..4eed4b826 100644 --- a/mo/src/neighborhood/moIndexNeighborhood.h +++ b/mo/src/neighborhood/moIndexNeighborhood.h @@ -35,7 +35,7 @@ #ifndef _moIndexNeighborhood_h #define _moIndexNeighborhood_h -#include +#include "moNeighborhood.h" /** * A Indexed Neighborhood diff --git a/mo/src/neighborhood/moNeighbor.h b/mo/src/neighborhood/moNeighbor.h index 889dd6817..a5dcad4cf 100644 --- a/mo/src/neighborhood/moNeighbor.h +++ b/mo/src/neighborhood/moNeighbor.h @@ -36,9 +36,9 @@ #define _moNeighbor_h //EO inclusion -#include -#include -#include +#include +#include +#include /** * Container of the neighbor informations diff --git a/mo/src/neighborhood/moNeighborhood.h b/mo/src/neighborhood/moNeighborhood.h index 60d11c1f2..08f830bd2 100644 --- a/mo/src/neighborhood/moNeighborhood.h +++ b/mo/src/neighborhood/moNeighborhood.h @@ -35,7 +35,7 @@ #ifndef _moNeighborhood_h #define _moNeighborhood_h -#include +#include /** * A Neighborhood diff --git a/mo/src/neighborhood/moOrderNeighborhood.h b/mo/src/neighborhood/moOrderNeighborhood.h index 384d0dda7..ac3a9276d 100644 --- a/mo/src/neighborhood/moOrderNeighborhood.h +++ b/mo/src/neighborhood/moOrderNeighborhood.h @@ -35,7 +35,7 @@ #ifndef _moOrderNeighborhood_h #define _moOrderNeighborhood_h -#include +#include "moIndexNeighborhood.h" /** * An ordered Neighborhood diff --git a/mo/src/neighborhood/moRndNeighborhood.h b/mo/src/neighborhood/moRndNeighborhood.h index 9c7ec2d22..a9a9d28fa 100644 --- a/mo/src/neighborhood/moRndNeighborhood.h +++ b/mo/src/neighborhood/moRndNeighborhood.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moRndNeighborhood_h #define _moRndNeighborhood_h -#include +#include "moNeighborhood.h" /** * Class used to specify a neighborhood is random diff --git a/mo/src/neighborhood/moRndVectorVNSelection.h b/mo/src/neighborhood/moRndVectorVNSelection.h index 3debb85d4..b35ed7525 100644 --- a/mo/src/neighborhood/moRndVectorVNSelection.h +++ b/mo/src/neighborhood/moRndVectorVNSelection.h @@ -30,10 +30,10 @@ #ifndef _moRndVectorVNSelection_h #define _moRndVectorVNSelection_h -#include -#include +#include "../utils/eoRndGenerators.h" +#include "../utils/rnd_generators.h" -#include +#include "moVectorVNSelection.h" /** * This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection diff --git a/mo/src/neighborhood/moRndWithReplNeighborhood.h b/mo/src/neighborhood/moRndWithReplNeighborhood.h index 89537bf09..40f6b9e42 100644 --- a/mo/src/neighborhood/moRndWithReplNeighborhood.h +++ b/mo/src/neighborhood/moRndWithReplNeighborhood.h @@ -35,9 +35,9 @@ #ifndef _moRndWithReplNeighborhood_h #define _moRndWithReplNeighborhood_h -#include -#include -#include +#include "moIndexNeighborhood.h" +#include "moRndNeighborhood.h" +#include /** * A Random With replacement Neighborhood diff --git a/mo/src/neighborhood/moRndWithoutReplNeighborhood.h b/mo/src/neighborhood/moRndWithoutReplNeighborhood.h index e51c6d6e7..77d598831 100644 --- a/mo/src/neighborhood/moRndWithoutReplNeighborhood.h +++ b/mo/src/neighborhood/moRndWithoutReplNeighborhood.h @@ -35,9 +35,9 @@ #ifndef _moRndWithoutReplNeighborhood_h #define _moRndWithoutReplNeighborhood_h -#include -#include -#include +#include "moIndexNeighborhood.h" +#include "moRndNeighborhood.h" +#include /** * A Random without replacement Neighborhood diff --git a/mo/src/neighborhood/moVariableNeighborhoodSelection.h b/mo/src/neighborhood/moVariableNeighborhoodSelection.h index 99af9a98d..9260523da 100644 --- a/mo/src/neighborhood/moVariableNeighborhoodSelection.h +++ b/mo/src/neighborhood/moVariableNeighborhoodSelection.h @@ -30,7 +30,7 @@ #ifndef _moVariableNeighborhoodSelection_h #define _moVariableNeighborhoodSelection_h -#include +#include #include /** diff --git a/mo/src/neighborhood/moVectorVNSelection.h b/mo/src/neighborhood/moVectorVNSelection.h index 3070e0e9a..6863e015d 100644 --- a/mo/src/neighborhood/moVectorVNSelection.h +++ b/mo/src/neighborhood/moVectorVNSelection.h @@ -30,8 +30,8 @@ #ifndef _moVectorVNSelection_h #define _moVectorVNSelection_h -#include -#include +#include "moVariableNeighborhoodSelection.h" +#include /** * This class is used for the Variable Neighborhood Search explorer inherits from moVariableNeighborhoodSelection