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