From ea8510ce3225c92e0fd8d7c91b5c7efbc04c060d Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 17:13:18 -0300 Subject: [PATCH] Updated includes on mo/sampling --- mo/src/perturb/moLocalSearchInit.h | 2 +- mo/src/sampling/moAdaptiveWalkSampling.h | 28 ++++++------ mo/src/sampling/moAutocorrelationSampling.h | 12 ++--- mo/src/sampling/moDensityOfStatesSampling.h | 10 ++--- mo/src/sampling/moFDCsampling.h | 16 +++---- mo/src/sampling/moFitnessCloudSampling.h | 16 +++---- mo/src/sampling/moHillClimberSampling.h | 22 ++++----- .../sampling/moMHBestFitnessCloudSampling.h | 14 +++--- mo/src/sampling/moMHRndFitnessCloudSampling.h | 14 +++--- mo/src/sampling/moNeutralDegreeSampling.h | 18 ++++---- mo/src/sampling/moNeutralWalkSampling.h | 45 ++++++++++--------- .../sampling/moRndBestFitnessCloudSampling.h | 14 +++--- .../sampling/moRndRndFitnessCloudSampling.h | 14 +++--- mo/src/sampling/moSampling.h | 17 ++++--- mo/src/sampling/moStatistics.h | 2 +- 15 files changed, 125 insertions(+), 119 deletions(-) diff --git a/mo/src/perturb/moLocalSearchInit.h b/mo/src/perturb/moLocalSearchInit.h index e8f977111..3cae04544 100644 --- a/mo/src/perturb/moLocalSearchInit.h +++ b/mo/src/perturb/moLocalSearchInit.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moLocalSearchInit_h #define _moLocalSearchInit_h -#include "../../eo/eoInit.h" +#include #include "../algo/moLocalSearch.h" /** diff --git a/mo/src/sampling/moAdaptiveWalkSampling.h b/mo/src/sampling/moAdaptiveWalkSampling.h index 04dafe876..1da48ad14 100644 --- a/mo/src/sampling/moAdaptiveWalkSampling.h +++ b/mo/src/sampling/moAdaptiveWalkSampling.h @@ -35,20 +35,20 @@ #ifndef moAdaptiveWalkSampling_h #define moAdaptiveWalkSampling_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "../eval/moEval.h" +#include +#include "../continuator/moCheckpoint.h" +#include "../perturb/moLocalSearchInit.h" +#include "../algo/moRandomSearch.h" +#include "../algo/moFirstImprHC.h" +#include "../continuator/moSolutionStat.h" +#include "../continuator/moMinusOneCounterStat.h" +#include "../continuator/moStatFromStat.h" +#include "moSampling.h" +#include "../eval/moEvalCounter.h" +#include +#include "../continuator/moValueStat.h" /** * To compute the length and final solution of an adaptive walk: diff --git a/mo/src/sampling/moAutocorrelationSampling.h b/mo/src/sampling/moAutocorrelationSampling.h index 3dbeaf954..0bf332b55 100644 --- a/mo/src/sampling/moAutocorrelationSampling.h +++ b/mo/src/sampling/moAutocorrelationSampling.h @@ -35,12 +35,12 @@ #ifndef moAutocorrelationSampling_h #define moAutocorrelationSampling_h -#include -#include -#include -#include -#include -#include +#include +#include "../eval/moEval.h" +#include +#include "../algo/moRandomWalk.h" +#include "../continuator/moFitnessStat.h" +#include "moSampling.h" /** * To compute the autocorrelation function: diff --git a/mo/src/sampling/moDensityOfStatesSampling.h b/mo/src/sampling/moDensityOfStatesSampling.h index 571f546de..e48ef0708 100644 --- a/mo/src/sampling/moDensityOfStatesSampling.h +++ b/mo/src/sampling/moDensityOfStatesSampling.h @@ -35,11 +35,11 @@ #ifndef moDensityOfStatesSampling_h #define moDensityOfStatesSampling_h -#include -#include -#include -#include -#include +#include +#include +#include "../algo/moRandomSearch.h" +#include "../continuator/moFitnessStat.h" +#include "moSampling.h" /** * To compute the density of states: diff --git a/mo/src/sampling/moFDCsampling.h b/mo/src/sampling/moFDCsampling.h index f3ed422c1..bdde164cf 100644 --- a/mo/src/sampling/moFDCsampling.h +++ b/mo/src/sampling/moFDCsampling.h @@ -35,14 +35,14 @@ #ifndef moFDCsampling_h #define moFDCsampling_h -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "../eval/moEval.h" +#include +#include "../algo/moRandomSearch.h" +#include "../continuator/moFitnessStat.h" +#include +#include "../continuator/moDistanceStat.h" +#include "moSampling.h" /** * To compute the fitness distance correlation: diff --git a/mo/src/sampling/moFitnessCloudSampling.h b/mo/src/sampling/moFitnessCloudSampling.h index 15817555a..771724684 100644 --- a/mo/src/sampling/moFitnessCloudSampling.h +++ b/mo/src/sampling/moFitnessCloudSampling.h @@ -35,14 +35,14 @@ #ifndef moFitnessCloudSampling_h #define moFitnessCloudSampling_h -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include +#include "../algo/moDummyLS.h" +#include "../continuator/moFitnessStat.h" +#include "../continuator/moNeighborFitnessStat.h" +#include "moSampling.h" /** * To compute an estimation of the fitness cloud, diff --git a/mo/src/sampling/moHillClimberSampling.h b/mo/src/sampling/moHillClimberSampling.h index d6bc45a28..e52f79ff1 100644 --- a/mo/src/sampling/moHillClimberSampling.h +++ b/mo/src/sampling/moHillClimberSampling.h @@ -35,17 +35,17 @@ #ifndef moHillClimberSampling_h #define moHillClimberSampling_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "../eval/moEval.h" +#include +#include "../continuator/moCheckpoint.h" +#include "../perturb/moLocalSearchInit.h" +#include "../algo/moRandomSearch.h" +#include "../algo/moSimpleHC.h" +#include "../continuator/moSolutionStat.h" +#include "../continuator/moMinusOneCounterStat.h" +#include "../continuator/moStatFromStat.h" +#include "moSampling.h" /** * To compute the length and final solution of an adaptive walk: diff --git a/mo/src/sampling/moMHBestFitnessCloudSampling.h b/mo/src/sampling/moMHBestFitnessCloudSampling.h index ebba8a3b9..d8d607c1f 100644 --- a/mo/src/sampling/moMHBestFitnessCloudSampling.h +++ b/mo/src/sampling/moMHBestFitnessCloudSampling.h @@ -35,13 +35,13 @@ #ifndef moMHBestFitnessCloudSampling_h #define moMHBestFitnessCloudSampling_h -#include -#include -#include -#include -#include -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include +#include "../algo/moMetropolisHasting.h" +#include"../continuator/moNeighborBestStat.h" +#include "moFitnessCloudSampling.h" /** * To compute an estimation of the fitness cloud, diff --git a/mo/src/sampling/moMHRndFitnessCloudSampling.h b/mo/src/sampling/moMHRndFitnessCloudSampling.h index 292d42344..c51b4a034 100644 --- a/mo/src/sampling/moMHRndFitnessCloudSampling.h +++ b/mo/src/sampling/moMHRndFitnessCloudSampling.h @@ -35,13 +35,13 @@ #ifndef moMHRndFitnessCloudSampling_h #define moMHRndFitnessCloudSampling_h -#include -#include -#include -#include -#include -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include +#include "../algo/moMetropolisHasting.h" +#include "../continuator/moNeighborFitnessStat.h" +#include "moFitnessCloudSampling.h" /** * To compute an estimation of the fitness cloud, diff --git a/mo/src/sampling/moNeutralDegreeSampling.h b/mo/src/sampling/moNeutralDegreeSampling.h index 397a3bd43..ddc9fa6d6 100644 --- a/mo/src/sampling/moNeutralDegreeSampling.h +++ b/mo/src/sampling/moNeutralDegreeSampling.h @@ -35,15 +35,15 @@ #ifndef moNeutralDegreeSampling_h #define moNeutralDegreeSampling_h -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include +#include "../algo/moRandomSearch.h" +#include "../continuator/moFitnessStat.h" +#include "../continuator/moNeighborhoodStat.h" +#include "../continuator/moNeutralDegreeNeighborStat.h" +#include "moSampling.h" /** * To compute the neutral degree: diff --git a/mo/src/sampling/moNeutralWalkSampling.h b/mo/src/sampling/moNeutralWalkSampling.h index 0db5f6c06..2cc9c82c9 100644 --- a/mo/src/sampling/moNeutralWalkSampling.h +++ b/mo/src/sampling/moNeutralWalkSampling.h @@ -35,27 +35,30 @@ #ifndef moNeutralWalkSampling_h #define moNeutralWalkSampling_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "../eval/moEval.h" +#include + +#include "../algo/moRandomNeutralWalk.h" +#include "moSampling.h" +#include "../perturb/moSolInit.h" +#include "../continuator/moSolutionStat.h" + +#include + +#include "../continuator/moDistanceStat.h" +#include "../continuator/moNeighborhoodStat.h" +#include "../continuator/moMaxNeighborStat.h" +#include "../continuator/moMinNeighborStat.h" +#include "../continuator/moQ1NeighborStat.h" +#include "../continuator/moQ3NeighborStat.h" +#include "../continuator/moMedianNeighborStat.h" +#include "../continuator/moAverageFitnessNeighborStat.h" +#include "../continuator/moStdFitnessNeighborStat.h" +#include "../continuator/moSizeNeighborStat.h" +#include "../continuator/moNbInfNeighborStat.h" +#include "../continuator/moNbSupNeighborStat.h" +#include "../continuator/moNeutralDegreeNeighborStat.h" /** * To explore the evolvability of solutions in a neutral networks: diff --git a/mo/src/sampling/moRndBestFitnessCloudSampling.h b/mo/src/sampling/moRndBestFitnessCloudSampling.h index 371aead94..b1545b60c 100644 --- a/mo/src/sampling/moRndBestFitnessCloudSampling.h +++ b/mo/src/sampling/moRndBestFitnessCloudSampling.h @@ -35,13 +35,13 @@ #ifndef moRndBestFitnessCloudSampling_h #define moRndBestFitnessCloudSampling_h -#include -#include -#include -#include -#include -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include +#include "../algo/moRandomSearch.h" +#include "../continuator/moNeighborBestStat.h" +#include "moFitnessCloudSampling.h" /** * To compute an estimation of the fitness cloud, diff --git a/mo/src/sampling/moRndRndFitnessCloudSampling.h b/mo/src/sampling/moRndRndFitnessCloudSampling.h index db6ddb984..00b5b0347 100644 --- a/mo/src/sampling/moRndRndFitnessCloudSampling.h +++ b/mo/src/sampling/moRndRndFitnessCloudSampling.h @@ -35,13 +35,13 @@ #ifndef moRndRndFitnessCloudSampling_h #define moRndRndFitnessCloudSampling_h -#include -#include -#include -#include -#include -#include -#include +#include +#include "../neighborhood/moNeighborhood.h" +#include "../eval/moEval.h" +#include +#include "../algo/moRandomSearch.h" +#include "../continuator/moNeighborFitnessStat.h" +#include "moFitnessCloudSampling.h" /** * To compute an estimation of the fitness cloud, diff --git a/mo/src/sampling/moSampling.h b/mo/src/sampling/moSampling.h index c2db1fa73..a85a5c7b1 100644 --- a/mo/src/sampling/moSampling.h +++ b/mo/src/sampling/moSampling.h @@ -40,13 +40,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include "../continuator/moStat.h" +#include "../continuator/moCheckpoint.h" +#include "../continuator/moVectorMonitor.h" +#include "../algo/moLocalSearch.h" + +#include /** diff --git a/mo/src/sampling/moStatistics.h b/mo/src/sampling/moStatistics.h index 7c74cbc16..9e2926954 100644 --- a/mo/src/sampling/moStatistics.h +++ b/mo/src/sampling/moStatistics.h @@ -37,7 +37,7 @@ #include #include -#include +#include /** * Tools to compute some basic statistics