From 0c4937453ef90964750975e48af2cd935835439d Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 17:00:12 -0300 Subject: [PATCH] Updated includes on mo/memory --- mo/src/memory/moAspiration.h | 2 +- mo/src/memory/moBestImprAspiration.h | 2 +- mo/src/memory/moCountMoveMemory.h | 2 +- mo/src/memory/moDiversification.h | 4 ++-- mo/src/memory/moDummyDiversification.h | 4 ++-- mo/src/memory/moDummyIntensification.h | 4 ++-- mo/src/memory/moDummyMemory.h | 2 +- mo/src/memory/moIndexedVectorTabuList.h | 4 ++-- mo/src/memory/moIntensification.h | 4 ++-- mo/src/memory/moMonOpDiversification.h | 8 ++++---- mo/src/memory/moNeighborVectorTabuList.h | 2 +- mo/src/memory/moRndIndexedVectorTabuList.h | 4 ++-- mo/src/memory/moSolVectorTabuList.h | 2 +- mo/src/memory/moTabuList.h | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mo/src/memory/moAspiration.h b/mo/src/memory/moAspiration.h index 7a9e338e0..36abe9fa8 100644 --- a/mo/src/memory/moAspiration.h +++ b/mo/src/memory/moAspiration.h @@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moAspiration_h #define _moAspiration_h -#include +#include /** * Abstract class for Aspiration Criteria diff --git a/mo/src/memory/moBestImprAspiration.h b/mo/src/memory/moBestImprAspiration.h index 7187ef666..6ef24441d 100644 --- a/mo/src/memory/moBestImprAspiration.h +++ b/mo/src/memory/moBestImprAspiration.h @@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moBestImprAspiration_h #define _moBestImprAspiration_h -#include +#include "moAspiration.h" /** * Aspiration criteria accepts a solution better than the best so far diff --git a/mo/src/memory/moCountMoveMemory.h b/mo/src/memory/moCountMoveMemory.h index 22cbba5fd..d9a1d330a 100644 --- a/mo/src/memory/moCountMoveMemory.h +++ b/mo/src/memory/moCountMoveMemory.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moCountMoveMemory_h #define _moCountMoveMemory_h -#include +#include "moMemory.h" /** * Count the number of move, no move and the successive stagnation since the last Move diff --git a/mo/src/memory/moDiversification.h b/mo/src/memory/moDiversification.h index 5df67a3fe..15444c506 100644 --- a/mo/src/memory/moDiversification.h +++ b/mo/src/memory/moDiversification.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDiversification_h #define _moDiversification_h -#include -#include +#include "moMemory.h" +#include /** * Abstract class for diversification strategy diff --git a/mo/src/memory/moDummyDiversification.h b/mo/src/memory/moDummyDiversification.h index 72cd1f686..c48a15a14 100644 --- a/mo/src/memory/moDummyDiversification.h +++ b/mo/src/memory/moDummyDiversification.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyDiversification_h #define _moDummyDiversification_h -#include -#include +#include "moDiversification.h" +#include "moDummyMemory.h" /** * Dummy diversification strategy diff --git a/mo/src/memory/moDummyIntensification.h b/mo/src/memory/moDummyIntensification.h index d6fd9ef3d..7ad695f98 100644 --- a/mo/src/memory/moDummyIntensification.h +++ b/mo/src/memory/moDummyIntensification.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyIntensification_h #define _moDummyIntensification_h -#include -#include +#include "moIntensification.h" +#include "moDummyMemory.h" /** * Dummy intensification strategy diff --git a/mo/src/memory/moDummyMemory.h b/mo/src/memory/moDummyMemory.h index c927a30f0..f9866f93d 100644 --- a/mo/src/memory/moDummyMemory.h +++ b/mo/src/memory/moDummyMemory.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moDummyMemory_h #define _moDummyMemory_h -#include +#include "moMemory.h" /** * Dummy memory to make an empty memory diff --git a/mo/src/memory/moIndexedVectorTabuList.h b/mo/src/memory/moIndexedVectorTabuList.h index e1ea94492..d6c76877d 100644 --- a/mo/src/memory/moIndexedVectorTabuList.h +++ b/mo/src/memory/moIndexedVectorTabuList.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moIndexedVectorTabuList_h #define _moIndexedVectorTabuList_h -#include -#include +#include +#include "moTabuList.h" #include #include diff --git a/mo/src/memory/moIntensification.h b/mo/src/memory/moIntensification.h index 44d6c1bc3..8cee94616 100644 --- a/mo/src/memory/moIntensification.h +++ b/mo/src/memory/moIntensification.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moIntensification_h #define _moIntensification_h -#include -#include +#include "moMemory.h" +#include /** * Abstract class for intensification strategy diff --git a/mo/src/memory/moMonOpDiversification.h b/mo/src/memory/moMonOpDiversification.h index 46fa8547b..d9b5f8fd7 100644 --- a/mo/src/memory/moMonOpDiversification.h +++ b/mo/src/memory/moMonOpDiversification.h @@ -31,10 +31,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #define _moMonOpDiversification_h -#include -#include -#include -#include +#include +#include +#include "moDiversification.h" +#include "moDummyMemory.h" /** * Diversification strategy applies a "monOp" operator diff --git a/mo/src/memory/moNeighborVectorTabuList.h b/mo/src/memory/moNeighborVectorTabuList.h index dbf8edb0f..9a6d0c7de 100644 --- a/mo/src/memory/moNeighborVectorTabuList.h +++ b/mo/src/memory/moNeighborVectorTabuList.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moNeighborVectorTabuList_h #define _moNeighborVectorTabuList_h -#include +#include "moTabuList.h" #include #include diff --git a/mo/src/memory/moRndIndexedVectorTabuList.h b/mo/src/memory/moRndIndexedVectorTabuList.h index 82ffc0e04..4e9deacea 100644 --- a/mo/src/memory/moRndIndexedVectorTabuList.h +++ b/mo/src/memory/moRndIndexedVectorTabuList.h @@ -30,8 +30,8 @@ #ifndef _moRndIndexedVectorTabuList_h #define _moRndIndexedVectorTabuList_h -#include -#include +#include "moIndexedVectorTabuList.h" +#include /** diff --git a/mo/src/memory/moSolVectorTabuList.h b/mo/src/memory/moSolVectorTabuList.h index ba72ccc43..1e6a0694d 100644 --- a/mo/src/memory/moSolVectorTabuList.h +++ b/mo/src/memory/moSolVectorTabuList.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moSolVectorTabuList_h #define _moSolVectorTabuList_h -#include +#include "moTabuList.h" #include #include diff --git a/mo/src/memory/moTabuList.h b/mo/src/memory/moTabuList.h index 018996e8a..a7b36a972 100644 --- a/mo/src/memory/moTabuList.h +++ b/mo/src/memory/moTabuList.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moTabuList_h #define _moTabuList_h -#include +#include "moMemory.h" /** * Abstract class for the Tabu List