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

Update includes on mo/continuator

Browse source
This commit is contained in:
Ronaldd Pinho 2019-08-17 00:21:46 -03:00
commit 026b3f9192
44 changed files with 100 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mo/src/continuator/moAverageFitnessNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moAverageFitnessNeighborStat_h
#define moAverageFitnessNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the average of fitness in the neighborhood

2
mo/src/continuator/moBestFitnessStat.h
View file

@ -35,7 +35,7 @@
#ifndef moBestFitnessStat_h
#define moBestFitnessStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which save the best solution found during the search

6
mo/src/continuator/moBestNoImproveContinuator.h
View file

@ -30,9 +30,9 @@
#ifndef _moBestNoImproveContinuator_h
#define _moBestNoImproveContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <comparator/moSolComparator.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include "../comparator/moSolComparator.h"
/**
* Stop when the best solution cannot be improved

2
mo/src/continuator/moBestSoFarStat.h
View file

@ -35,7 +35,7 @@
#ifndef moBestSoFarStat_h
#define moBestSoFarStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which save the best solution found during the search

2
mo/src/continuator/moBooleanStat.h
View file

@ -35,7 +35,7 @@
#ifndef moBooleanStat_h
#define moBooleanStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives from a boolean variable

12
mo/src/continuator/moCheckpoint.h
View file

@ -35,12 +35,12 @@
#ifndef moCheckpoint_h
#define moCheckpoint_h
#include <continuator/moContinuator.h>
#include <utils/eoMonitor.h>
#include <continuator/moStatBase.h>
#include <utils/eoUpdater.h>
#include <continuator/moUpdater.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include <paradiseo/eo/utils/eoMonitor.h>
#include "moStatBase.h"
#include <paradiseo/eo/utils/eoUpdater.h>
#include "moUpdater.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Continuator allowing to add others (continuators, stats, monitors or updaters)

4
mo/src/continuator/moCombinedContinuator.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moCombinedContinuator_h
#define _moCombinedContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include <vector>
/**

4
mo/src/continuator/moContinuator.h
View file

@ -35,8 +35,8 @@
#ifndef _moContinuator_h
#define _moContinuator_h
#include <eoFunctor.h>
#include <neighborhood/moNeighborhood.h>
#include <paradiseo/eo/eoFunctor.h>
#include "../neighborhood/moNeighborhood.h"
/**
* To make specific continuator from a solution

4
mo/src/continuator/moCounterMonitorSaver.h
View file

@ -35,8 +35,8 @@
#ifndef moCounterMonitorSaver_h
#define moCounterMonitorSaver_h
#include <utils/eoUpdater.h>
#include <utils/eoMonitor.h>
#include <paradiseo/eo/utils/eoUpdater.h>
#include <paradiseo/eo/utils/eoMonitor.h>
/**
* Class calling monitors with a given frequency

2
mo/src/continuator/moCounterStat.h
View file

@ -35,7 +35,7 @@
#ifndef moCounterStat_h
#define moCounterStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives the number of iteration

4
mo/src/continuator/moDistanceStat.h
View file

@ -35,8 +35,8 @@
#ifndef moDistanceStat_h
#define moDistanceStat_h
#include <utils/eoDistance.h>
#include <continuator/moStat.h>
#include <paradiseo/eo/utils/eoDistance.h>
#include "moStat.h"
/**
* The statistic gives the distance to a reference solution

8
mo/src/continuator/moEvalsContinuator.h
View file

@ -30,10 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moEvalsContinuator_h
#define _moEvalsContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eoEvalFuncCounter.h>
#include <eval/moEvalCounter.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include <paradiseo/eo/eoEvalFuncCounter.h>
#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)

4
mo/src/continuator/moFitContinuator.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moFitContinuator_h
#define _moFitContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Continue until a maximum fitness is reached

2
mo/src/continuator/moFitnessStat.h
View file

@ -35,7 +35,7 @@
#ifndef moFitnessStat_h
#define moFitnessStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* Stat given the fitness of the current solution

6
mo/src/continuator/moFullEvalContinuator.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moFullEvalContinuator_h
#define _moFullEvalContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eoEvalFuncCounter.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include <paradiseo/eo/eoEvalFuncCounter.h>
/**
* Continue until a maximum fixed number of full evaluation is reached

4
mo/src/continuator/moIterContinuator.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moIterContinuator_h
#define _moIterContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Continue until a maximum fixed number of iterations is reached

6
mo/src/continuator/moMaxNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moMaxNeighborStat_h
#define moMaxNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the max fitness in the neighborhood

6
mo/src/continuator/moMedianNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moMedianNeighborStat_h
#define moMedianNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat,

6
mo/src/continuator/moMinNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moMinNeighborStat_h
#define moMinNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the min fitness in the neighborhood

2
mo/src/continuator/moMinusOneCounterStat.h
View file

@ -35,7 +35,7 @@
#ifndef moMinusOneCounterStat_h
#define moMinusOneCounterStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives the number of iteration minus 1

6
mo/src/continuator/moNbInfNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moNbInfNeighborStat_h
#define moNbInfNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the number of solutions in the neighborhood

6
mo/src/continuator/moNbSupNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moNbSupNeighborStat_h
#define moNbSupNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the number of solutions in the neighborhood

10
mo/src/continuator/moNeighborBestStat.h
View file

@ -35,12 +35,12 @@
#ifndef moNeighborBestStat_h
#define moNeighborBestStat_h
#include <continuator/moStat.h>
#include "moStat.h"
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <neighborhood/moNeighborhood.h>
#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

6
mo/src/continuator/moNeighborEvalContinuator.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moNeighborEvalContinuator_h
#define _moNeighborEvalContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eval/moEvalCounter.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include "../eval/moEvalCounter.h"
/**
* Continue until a maximum fixed number of neighbor evaluation is reached

6
mo/src/continuator/moNeighborFitnessStat.h
View file

@ -35,9 +35,9 @@
#ifndef moNeighborFitnessStat_h
#define moNeighborFitnessStat_h
#include <continuator/moStat.h>
#include <neighborhood/moNeighborhood.h>
#include <eval/moEval.h>
#include "moStat.h"
#include "../neighborhood/moNeighborhood.h"
#include "../eval/moEval.h"
/**
* Compute the fitness of one random neighbor

11
mo/src/continuator/moNeighborhoodStat.h
View file

@ -35,12 +35,13 @@
#ifndef moNeighborhoodStat_h
#define moNeighborhoodStat_h
#include <continuator/moStat.h>
#include "moStat.h"
#include "../explorer/moNeighborhoodExplorer.h"
#include "../comparator/moNeighborComparator.h"
#include "../comparator/moSolNeighborComparator.h"
#include "../neighborhood/moNeighborhood.h"
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <neighborhood/moNeighborhood.h>
#include <vector>
#include <algorithm> // std::sort

4
mo/src/continuator/moNeutralDegreeNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moNeutralDegreeNeighborStat_h
#define moNeutralDegreeNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the neutral degree of the solution

6
mo/src/continuator/moQ1NeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moQ1NeighborStat_h
#define moQ1NeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat,

6
mo/src/continuator/moQ3NeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moQ3NeighborStat_h
#define moQ3NeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat,

4
mo/src/continuator/moQuartilesNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moQuartilesNeighborStat_h
#define moQuartilesNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat,

4
mo/src/continuator/moSecondMomentNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moSecondMomentNeighborStat_h
#define moSecondMomentNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood

4
mo/src/continuator/moSizeNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moSizeNeighborStat_h
#define moSizeNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the number of solutions in the neighborhood

2
mo/src/continuator/moSolutionStat.h
View file

@ -35,7 +35,7 @@
#ifndef moSolutionStat_h
#define moSolutionStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which only give the current solution.

2
mo/src/continuator/moStat.h
View file

@ -35,7 +35,7 @@
#ifndef moStat_h
#define moStat_h
#include <continuator/moStatBase.h>
#include "moStatBase.h"
/**
* The actual class that will be used as base for all statistics

4
mo/src/continuator/moStatBase.h
View file

@ -35,8 +35,8 @@
#ifndef moStatBase_h
#define moStatBase_h
#include <eoFunctor.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/eoFunctor.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* Base class for all statistics that need to be calculated

2
mo/src/continuator/moStatFromStat.h
View file

@ -35,7 +35,7 @@
#ifndef moStatFromStat_h
#define moStatFromStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which copy another statistic

4
mo/src/continuator/moStdFitnessNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moStdFitnessNeighborStat_h
#define moStdFitnessNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood

2
mo/src/continuator/moTimeContinuator.h
View file

@ -32,7 +32,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <ctime>
#include <continuator/moContinuator.h>
#include "moContinuator.h"
/**
* Termination condition until a running time is reached.

2
mo/src/continuator/moTrueContinuator.h
View file

@ -35,7 +35,7 @@
#ifndef _moTrueContinuator_h
#define _moTrueContinuator_h
#include <continuator/moContinuator.h>
#include "moContinuator.h"
/**
* Continuator always return True

2
mo/src/continuator/moUnsignedStat.h
View file

@ -35,7 +35,7 @@
#ifndef moUnsignedStat_h
#define moUnsignedStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives from a boolean variable

4
mo/src/continuator/moUpdater.h
View file

@ -35,8 +35,8 @@
#ifndef moUpdater_h
#define moUpdater_h
#include <eoFunctor.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/eoFunctor.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* Base class for to update what ever you want

4
mo/src/continuator/moValueParamContinuator.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moValueParamContinuator_h
#define _moValueParamContinuator_h
#include <continuator/moContinuator.h>
#include "moContinuator.h"
//#include <neighborhood/moNeighborhood.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* Continue until a maximum fixed number of full evaluation is reached

4
mo/src/continuator/moValueStat.h
View file

@ -35,8 +35,8 @@
#ifndef moValueStat_h
#define moValueStat_h
#include <continuator/moStat.h>
#include <utils/eoParam.h>
#include "moStat.h"
#include <paradiseo/eo/utils/eoParam.h>
/**
* The statistic gives the number of iteration

4
mo/src/continuator/moVectorMonitor.h
View file

@ -36,8 +36,8 @@
#define moVectorMonitor_h
#include <fstream>
#include <utils/eoMonitor.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/utils/eoMonitor.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* To save the values of the same type (double, unsigned int, or EOT) in a vector