nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated includes on mo/sampling

Browse source
This commit is contained in:
Ronaldd Pinho 2019-08-17 17:13:18 -03:00
commit ea8510ce32
15 changed files with 125 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mo/src/perturb/moLocalSearchInit.h
View file

@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moLocalSearchInit_h #ifndef _moLocalSearchInit_h
#define _moLocalSearchInit_h #define _moLocalSearchInit_h
#include "../../eo/eoInit.h" #include <paradiseo/eo/eoInit.h>
#include "../algo/moLocalSearch.h" #include "../algo/moLocalSearch.h"
/** /**

28
mo/src/sampling/moAdaptiveWalkSampling.h
View file

@ -35,20 +35,20 @@
#ifndef moAdaptiveWalkSampling_h #ifndef moAdaptiveWalkSampling_h
#define moAdaptiveWalkSampling_h #define moAdaptiveWalkSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <continuator/moCheckpoint.h> #include "../continuator/moCheckpoint.h"
#include <perturb/moLocalSearchInit.h> #include "../perturb/moLocalSearchInit.h"
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <algo/moFirstImprHC.h> #include "../algo/moFirstImprHC.h"
#include <continuator/moSolutionStat.h> #include "../continuator/moSolutionStat.h"
#include <continuator/moMinusOneCounterStat.h> #include "../continuator/moMinusOneCounterStat.h"
#include <continuator/moStatFromStat.h> #include "../continuator/moStatFromStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
#include <eval/moEvalCounter.h> #include "../eval/moEvalCounter.h"
#include <eoEvalFuncCounter.h> #include <paradiseo/eo/eoEvalFuncCounter.h>
#include <continuator/moValueStat.h> #include "../continuator/moValueStat.h"
/** /**
* To compute the length and final solution of an adaptive walk: * To compute the length and final solution of an adaptive walk:

12
mo/src/sampling/moAutocorrelationSampling.h
View file

@ -35,12 +35,12 @@
#ifndef moAutocorrelationSampling_h #ifndef moAutocorrelationSampling_h
#define moAutocorrelationSampling_h #define moAutocorrelationSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomWalk.h> #include "../algo/moRandomWalk.h"
#include <continuator/moFitnessStat.h> #include "../continuator/moFitnessStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
/** /**
* To compute the autocorrelation function: * To compute the autocorrelation function:

10
mo/src/sampling/moDensityOfStatesSampling.h
View file

@ -35,11 +35,11 @@
#ifndef moDensityOfStatesSampling_h #ifndef moDensityOfStatesSampling_h
#define moDensityOfStatesSampling_h #define moDensityOfStatesSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <continuator/moFitnessStat.h> #include "../continuator/moFitnessStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
/** /**
* To compute the density of states: * To compute the density of states:

16
mo/src/sampling/moFDCsampling.h
View file

@ -35,14 +35,14 @@
#ifndef moFDCsampling_h #ifndef moFDCsampling_h
#define moFDCsampling_h #define moFDCsampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <continuator/moFitnessStat.h> #include "../continuator/moFitnessStat.h"
#include <utils/eoDistance.h> #include <paradiseo/eo/utils/eoDistance.h>
#include <continuator/moDistanceStat.h> #include "../continuator/moDistanceStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
/** /**
* To compute the fitness distance correlation: * To compute the fitness distance correlation:

16
mo/src/sampling/moFitnessCloudSampling.h
View file

@ -35,14 +35,14 @@
#ifndef moFitnessCloudSampling_h #ifndef moFitnessCloudSampling_h
#define moFitnessCloudSampling_h #define moFitnessCloudSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moDummyLS.h> #include "../algo/moDummyLS.h"
#include <continuator/moFitnessStat.h> #include "../continuator/moFitnessStat.h"
#include <continuator/moNeighborFitnessStat.h> #include "../continuator/moNeighborFitnessStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
/** /**
* To compute an estimation of the fitness cloud, * To compute an estimation of the fitness cloud,

22
mo/src/sampling/moHillClimberSampling.h
View file

@ -35,17 +35,17 @@
#ifndef moHillClimberSampling_h #ifndef moHillClimberSampling_h
#define moHillClimberSampling_h #define moHillClimberSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <continuator/moCheckpoint.h> #include "../continuator/moCheckpoint.h"
#include <perturb/moLocalSearchInit.h> #include "../perturb/moLocalSearchInit.h"
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <algo/moSimpleHC.h> #include "../algo/moSimpleHC.h"
#include <continuator/moSolutionStat.h> #include "../continuator/moSolutionStat.h"
#include <continuator/moMinusOneCounterStat.h> #include "../continuator/moMinusOneCounterStat.h"
#include <continuator/moStatFromStat.h> #include "../continuator/moStatFromStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
/** /**
* To compute the length and final solution of an adaptive walk: * To compute the length and final solution of an adaptive walk:

14
mo/src/sampling/moMHBestFitnessCloudSampling.h
View file

@ -35,13 +35,13 @@
#ifndef moMHBestFitnessCloudSampling_h #ifndef moMHBestFitnessCloudSampling_h
#define moMHBestFitnessCloudSampling_h #define moMHBestFitnessCloudSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moMetropolisHasting.h> #include "../algo/moMetropolisHasting.h"
#include <continuator/moNeighborBestStat.h> #include"../continuator/moNeighborBestStat.h"
#include <sampling/moFitnessCloudSampling.h> #include "moFitnessCloudSampling.h"
/** /**
* To compute an estimation of the fitness cloud, * To compute an estimation of the fitness cloud,

14
mo/src/sampling/moMHRndFitnessCloudSampling.h
View file

@ -35,13 +35,13 @@
#ifndef moMHRndFitnessCloudSampling_h #ifndef moMHRndFitnessCloudSampling_h
#define moMHRndFitnessCloudSampling_h #define moMHRndFitnessCloudSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moMetropolisHasting.h> #include "../algo/moMetropolisHasting.h"
#include <continuator/moNeighborFitnessStat.h> #include "../continuator/moNeighborFitnessStat.h"
#include <sampling/moFitnessCloudSampling.h> #include "moFitnessCloudSampling.h"
/** /**
* To compute an estimation of the fitness cloud, * To compute an estimation of the fitness cloud,

18
mo/src/sampling/moNeutralDegreeSampling.h
View file

@ -35,15 +35,15 @@
#ifndef moNeutralDegreeSampling_h #ifndef moNeutralDegreeSampling_h
#define moNeutralDegreeSampling_h #define moNeutralDegreeSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <continuator/moFitnessStat.h> #include "../continuator/moFitnessStat.h"
#include <continuator/moNeighborhoodStat.h> #include "../continuator/moNeighborhoodStat.h"
#include <continuator/moNeutralDegreeNeighborStat.h> #include "../continuator/moNeutralDegreeNeighborStat.h"
#include <sampling/moSampling.h> #include "moSampling.h"
/** /**
* To compute the neutral degree: * To compute the neutral degree:

45
mo/src/sampling/moNeutralWalkSampling.h
View file

@ -35,27 +35,30 @@
#ifndef moNeutralWalkSampling_h #ifndef moNeutralWalkSampling_h
#define moNeutralWalkSampling_h #define moNeutralWalkSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomNeutralWalk.h>
#include <sampling/moSampling.h> #include "../algo/moRandomNeutralWalk.h"
#include <perturb/moSolInit.h> #include "moSampling.h"
#include <continuator/moSolutionStat.h> #include "../perturb/moSolInit.h"
#include <utils/eoDistance.h> #include "../continuator/moSolutionStat.h"
#include <continuator/moDistanceStat.h>
#include <continuator/moNeighborhoodStat.h> #include <paradiseo/eo/utils/eoDistance.h>
#include <continuator/moMaxNeighborStat.h>
#include <continuator/moMinNeighborStat.h> #include "../continuator/moDistanceStat.h"
#include <continuator/moQ1NeighborStat.h> #include "../continuator/moNeighborhoodStat.h"
#include <continuator/moQ3NeighborStat.h> #include "../continuator/moMaxNeighborStat.h"
#include <continuator/moMedianNeighborStat.h> #include "../continuator/moMinNeighborStat.h"
#include <continuator/moAverageFitnessNeighborStat.h> #include "../continuator/moQ1NeighborStat.h"
#include <continuator/moStdFitnessNeighborStat.h> #include "../continuator/moQ3NeighborStat.h"
#include <continuator/moSizeNeighborStat.h> #include "../continuator/moMedianNeighborStat.h"
#include <continuator/moNbInfNeighborStat.h> #include "../continuator/moAverageFitnessNeighborStat.h"
#include <continuator/moNbSupNeighborStat.h> #include "../continuator/moStdFitnessNeighborStat.h"
#include <continuator/moNeutralDegreeNeighborStat.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: * To explore the evolvability of solutions in a neutral networks:

14
mo/src/sampling/moRndBestFitnessCloudSampling.h
View file

@ -35,13 +35,13 @@
#ifndef moRndBestFitnessCloudSampling_h #ifndef moRndBestFitnessCloudSampling_h
#define moRndBestFitnessCloudSampling_h #define moRndBestFitnessCloudSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <continuator/moNeighborBestStat.h> #include "../continuator/moNeighborBestStat.h"
#include <sampling/moFitnessCloudSampling.h> #include "moFitnessCloudSampling.h"
/** /**
* To compute an estimation of the fitness cloud, * To compute an estimation of the fitness cloud,

14
mo/src/sampling/moRndRndFitnessCloudSampling.h
View file

@ -35,13 +35,13 @@
#ifndef moRndRndFitnessCloudSampling_h #ifndef moRndRndFitnessCloudSampling_h
#define moRndRndFitnessCloudSampling_h #define moRndRndFitnessCloudSampling_h
#include <eoInit.h> #include <paradiseo/eo/eoInit.h>
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eval/moEval.h> #include "../eval/moEval.h"
#include <eoEvalFunc.h> #include <paradiseo/eo/eoEvalFunc.h>
#include <algo/moRandomSearch.h> #include "../algo/moRandomSearch.h"
#include <continuator/moNeighborFitnessStat.h> #include "../continuator/moNeighborFitnessStat.h"
#include <sampling/moFitnessCloudSampling.h> #include "moFitnessCloudSampling.h"
/** /**
* To compute an estimation of the fitness cloud, * To compute an estimation of the fitness cloud,

17
mo/src/sampling/moSampling.h
View file

@ -40,13 +40,16 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <cstdlib> #include <cstdlib>
#include <eoFunctor.h>
#include <utils/eoMonitor.h> #include <paradiseo/eo/eoFunctor.h>
#include <continuator/moStat.h> #include <paradiseo/eo/utils/eoMonitor.h>
#include <continuator/moCheckpoint.h>
#include <continuator/moVectorMonitor.h> #include "../continuator/moStat.h"
#include <algo/moLocalSearch.h> #include "../continuator/moCheckpoint.h"
#include <eoInit.h> #include "../continuator/moVectorMonitor.h"
#include "../algo/moLocalSearch.h"
#include <paradiseo/eo/eoInit.h>
/** /**

2
mo/src/sampling/moStatistics.h
View file

@ -37,7 +37,7 @@
#include <vector> #include <vector>
#include <cmath> #include <cmath>
#include <utils/eoDistance.h> #include <paradiseo/eo/utils/eoDistance.h>
/** /**
* Tools to compute some basic statistics * Tools to compute some basic statistics