Update includes on mo/continuator

2019-08-17 00:21:46 -03:00 · 2019-08-17 00:21:46 -03:00 · 026b3f9192
commit 026b3f9192
parent a12cce576d
44 changed files with 100 additions and 99 deletions
--- a/mo/src/continuator/moAverageFitnessNeighborStat.h
+++ b/mo/src/continuator/moAverageFitnessNeighborStat.h
@ -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
--- a/mo/src/continuator/moBestFitnessStat.h
+++ b/mo/src/continuator/moBestFitnessStat.h
@ -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
--- a/mo/src/continuator/moBestNoImproveContinuator.h
+++ b/mo/src/continuator/moBestNoImproveContinuator.h
@ -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 
--- a/mo/src/continuator/moBestSoFarStat.h
+++ b/mo/src/continuator/moBestSoFarStat.h
@ -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
--- a/mo/src/continuator/moBooleanStat.h
+++ b/mo/src/continuator/moBooleanStat.h
@ -35,7 +35,7 @@
 #ifndef moBooleanStat_h
 #define moBooleanStat_h

-#include <continuator/moStat.h>
+#include "moStat.h"

 /**
 * The statistic gives from a boolean variable
--- a/mo/src/continuator/moCheckpoint.h
+++ b/mo/src/continuator/moCheckpoint.h
@ -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)
--- 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 <continuator/moContinuator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moContinuator.h"
+#include "../neighborhood/moNeighborhood.h"
 #include <vector>

 /**
--- a/mo/src/continuator/moContinuator.h
+++ b/mo/src/continuator/moContinuator.h
@ -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
--- a/mo/src/continuator/moCounterMonitorSaver.h
+++ b/mo/src/continuator/moCounterMonitorSaver.h
@ -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
--- a/mo/src/continuator/moCounterStat.h
+++ b/mo/src/continuator/moCounterStat.h
@ -35,7 +35,7 @@
 #ifndef moCounterStat_h
 #define moCounterStat_h

-#include <continuator/moStat.h>
+#include "moStat.h"

 /**
 * The statistic gives the number of iteration
--- a/mo/src/continuator/moDistanceStat.h
+++ b/mo/src/continuator/moDistanceStat.h
@ -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
--- 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 <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)
--- 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 <continuator/moContinuator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moContinuator.h"
+#include "../neighborhood/moNeighborhood.h"

 /**
 * Continue until a maximum fitness is reached
--- a/mo/src/continuator/moFitnessStat.h
+++ b/mo/src/continuator/moFitnessStat.h
@ -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
--- 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 <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
--- 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 <continuator/moContinuator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moContinuator.h"
+#include "../neighborhood/moNeighborhood.h"

 /**
 * Continue until a maximum fixed number of iterations is reached
--- a/mo/src/continuator/moMaxNeighborStat.h
+++ b/mo/src/continuator/moMaxNeighborStat.h
@ -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
--- a/mo/src/continuator/moMedianNeighborStat.h
+++ b/mo/src/continuator/moMedianNeighborStat.h
@ -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, 
--- a/mo/src/continuator/moMinNeighborStat.h
+++ b/mo/src/continuator/moMinNeighborStat.h
@ -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
--- a/mo/src/continuator/moMinusOneCounterStat.h
+++ b/mo/src/continuator/moMinusOneCounterStat.h
@ -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
--- a/Show more
+++ b/Show more