Update includes on mo/continuator

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -30,10 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moEvalsContinuator_h #ifndef _moEvalsContinuator_h
#define _moEvalsContinuator_h #define _moEvalsContinuator_h
#include <continuator/moContinuator.h> #include "moContinuator.h"
#include <neighborhood/moNeighborhood.h> #include "../neighborhood/moNeighborhood.h"
#include <eoEvalFuncCounter.h> #include <paradiseo/eo/eoEvalFuncCounter.h>
#include <eval/moEvalCounter.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) * Continue until a maximum fixed number of full evaluation and neighbor evaluation is reached (total number of evaluation = full evaluation + incremental evaluation)

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

Some files were not shown because too many files have changed in this diff Show more