From fe44948a586180de61bb3c17a5f65d209f81ee3b Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 16:56:41 -0300 Subject: [PATCH] Updated includes on mo/eval --- mo/src/eval/moDoubleIncrEvaluation.h | 4 ++-- mo/src/eval/moDoubleIncrNeighborhoodEval.h | 4 ++-- mo/src/eval/moDummyEval.h | 2 +- mo/src/eval/moEval.h | 2 +- mo/src/eval/moEvalCounter.h | 4 ++-- mo/src/eval/moFullEvalByCopy.h | 4 ++-- mo/src/eval/moFullEvalByModif.h | 4 ++-- mo/src/eval/moNeighborhoodEvaluation.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mo/src/eval/moDoubleIncrEvaluation.h b/mo/src/eval/moDoubleIncrEvaluation.h index c7027e2b8..cf6ec57be 100644 --- a/mo/src/eval/moDoubleIncrEvaluation.h +++ b/mo/src/eval/moDoubleIncrEvaluation.h @@ -35,8 +35,8 @@ #ifndef moDoubleIncrEvaluation_H #define moDoubleIncrEvaluation_H -#include -#include +#include "moNeighborhoodEvaluation.h" +#include "../continuator/moUpdater.h" /** * Base class for the double incremental evaluation of the neighborhood diff --git a/mo/src/eval/moDoubleIncrNeighborhoodEval.h b/mo/src/eval/moDoubleIncrNeighborhoodEval.h index 61ef09176..3cb11c684 100644 --- a/mo/src/eval/moDoubleIncrNeighborhoodEval.h +++ b/mo/src/eval/moDoubleIncrNeighborhoodEval.h @@ -35,8 +35,8 @@ #ifndef moDoubleIncrNeighborhoodEval_H #define moDoubleIncrNeighborhoodEval_H -#include -#include +#include "moEval.h" +#include "moDoubleIncrEvaluation.h" /** * Evaluation of a neighbor from the full evaluation f the neighborhood diff --git a/mo/src/eval/moDummyEval.h b/mo/src/eval/moDummyEval.h index 2809f12a3..424407046 100644 --- a/mo/src/eval/moDummyEval.h +++ b/mo/src/eval/moDummyEval.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyEval_h #define _moDummyEval_h -#include +#include "moEval.h" /** * Dummy Evaluation function diff --git a/mo/src/eval/moEval.h b/mo/src/eval/moEval.h index 835a8ae8e..e153be971 100644 --- a/mo/src/eval/moEval.h +++ b/mo/src/eval/moEval.h @@ -35,7 +35,7 @@ #ifndef moEval_H #define moEval_H -#include +#include /** * Abstract class for the evaluation diff --git a/mo/src/eval/moEvalCounter.h b/mo/src/eval/moEvalCounter.h index e12949b1f..e47520dd1 100644 --- a/mo/src/eval/moEvalCounter.h +++ b/mo/src/eval/moEvalCounter.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moEvalCounter_h #define _moEvalCounter_h -#include -#include +#include "moEval.h" +#include /** Counts the number of neighbor evaluations actually performed, diff --git a/mo/src/eval/moFullEvalByCopy.h b/mo/src/eval/moFullEvalByCopy.h index 701a7b951..501f9449b 100644 --- a/mo/src/eval/moFullEvalByCopy.h +++ b/mo/src/eval/moFullEvalByCopy.h @@ -35,8 +35,8 @@ #ifndef moFullEvalByCopy_H #define moFullEvalByCopy_H -#include -#include +#include +#include "moEval.h" /** * Evaluation by copy diff --git a/mo/src/eval/moFullEvalByModif.h b/mo/src/eval/moFullEvalByModif.h index 80ee94d1c..b7efa3cea 100644 --- a/mo/src/eval/moFullEvalByModif.h +++ b/mo/src/eval/moFullEvalByModif.h @@ -35,8 +35,8 @@ #ifndef moFullEvalByModif_H #define moFullEvalByModif_H -#include -#include +#include +#include "moEval.h" /** * Full evaluation to use with a moBackableNeighbor diff --git a/mo/src/eval/moNeighborhoodEvaluation.h b/mo/src/eval/moNeighborhoodEvaluation.h index 92274c133..01cc67c76 100644 --- a/mo/src/eval/moNeighborhoodEvaluation.h +++ b/mo/src/eval/moNeighborhoodEvaluation.h @@ -35,7 +35,7 @@ #ifndef moNeighborhoodEvaluation_H #define moNeighborhoodEvaluation_H -#include +#include /** * Abstract class for the evaluation