From b7d826fef4d0eb2fed976eae93bc26d5f7d49bdc Mon Sep 17 00:00:00 2001 From: Ronaldd Pinho Date: Sat, 17 Aug 2019 17:39:50 -0300 Subject: [PATCH] Update includes on mo/problems --- mo/src/problems/bitString/moBitFlipNeighborhood.h | 4 ++-- mo/src/problems/bitString/moBitNeighbor.h | 6 +++--- mo/src/problems/bitString/moBitsNeighbor.h | 2 +- mo/src/problems/bitString/moBitsNeighborhood.h | 4 ++-- mo/src/problems/bitString/moBitsWithReplNeighborhood.h | 6 +++--- mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h | 6 +++--- mo/src/problems/eval/moMaxSATincrEval.h | 4 ++-- mo/src/problems/eval/moNKlandscapesBitsIncrEval.h | 4 ++-- mo/src/problems/eval/moNKlandscapesIncrEval.h | 5 +++-- mo/src/problems/eval/moOneMaxBitsIncrEval.h | 2 +- mo/src/problems/eval/moOneMaxIncrEval.h | 2 +- mo/src/problems/eval/moQAPIncrEval.h | 4 ++-- mo/src/problems/eval/moRoyalRoadIncrEval.h | 4 ++-- mo/src/problems/eval/moUBQPBitsIncrEval.h | 4 ++-- mo/src/problems/eval/moUBQPSimpleIncrEval.h | 4 ++-- mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h | 6 +++--- mo/src/problems/permutation/moIndexedSwapNeighbor.h | 4 ++-- mo/src/problems/permutation/moShiftNeighbor.h | 4 ++-- mo/src/problems/permutation/moSwapNeighbor.h | 2 +- mo/src/problems/permutation/moSwapNeighborhood.h | 4 ++-- mo/src/problems/permutation/moTwoOptExNeighbor.h | 2 +- mo/src/problems/permutation/moTwoOptExNeighborhood.h | 7 +++---- 22 files changed, 45 insertions(+), 45 deletions(-) diff --git a/mo/src/problems/bitString/moBitFlipNeighborhood.h b/mo/src/problems/bitString/moBitFlipNeighborhood.h index dbbe05c26..67931fbb9 100644 --- a/mo/src/problems/bitString/moBitFlipNeighborhood.h +++ b/mo/src/problems/bitString/moBitFlipNeighborhood.h @@ -35,8 +35,8 @@ #ifndef _moBitFlipNeighborhood_h #define _moBitFlipNeighborhood_h -#include -#include +#include "../../neighborhood/moNeighborhood.h" +#include #include /** diff --git a/mo/src/problems/bitString/moBitNeighbor.h b/mo/src/problems/bitString/moBitNeighbor.h index 28cda0093..78f0d281e 100644 --- a/mo/src/problems/bitString/moBitNeighbor.h +++ b/mo/src/problems/bitString/moBitNeighbor.h @@ -35,9 +35,9 @@ #ifndef _bitNeighbor_h #define _bitNeighbor_h -#include -#include -#include +#include +#include "../../neighborhood/moBackableNeighbor.h> +#include "../../neighborhood/moIndexNeighbor.h> /** * Neighbor related to a vector of Bit diff --git a/mo/src/problems/bitString/moBitsNeighbor.h b/mo/src/problems/bitString/moBitsNeighbor.h index e0f1363f1..e9930e082 100644 --- a/mo/src/problems/bitString/moBitsNeighbor.h +++ b/mo/src/problems/bitString/moBitsNeighbor.h @@ -35,7 +35,7 @@ #ifndef _moBitsNeighbor_h #define _moBitsNeighbor_h -#include +#include "../../neighborhood/moNeighbor.h" #include /** diff --git a/mo/src/problems/bitString/moBitsNeighborhood.h b/mo/src/problems/bitString/moBitsNeighborhood.h index 2d4557f2f..824b7f83a 100644 --- a/mo/src/problems/bitString/moBitsNeighborhood.h +++ b/mo/src/problems/bitString/moBitsNeighborhood.h @@ -35,8 +35,8 @@ #ifndef _moBitsNeighborhood_h #define _moBitsNeighborhood_h -#include -#include +#include "../../neighborhood/moNeighborhood.h" +#include #include /** diff --git a/mo/src/problems/bitString/moBitsWithReplNeighborhood.h b/mo/src/problems/bitString/moBitsWithReplNeighborhood.h index 8c833f1a2..b7e4dceb1 100644 --- a/mo/src/problems/bitString/moBitsWithReplNeighborhood.h +++ b/mo/src/problems/bitString/moBitsWithReplNeighborhood.h @@ -35,9 +35,9 @@ #ifndef _moBitsWithReplNeighborhood_h #define _moBitsWithReplNeighborhood_h -#include -#include -#include +#include "../../neighborhood/moNeighborhood.h" +#include "moBitsNeighborhood.h" +#include #include /** diff --git a/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h b/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h index 4584a791a..96785996d 100644 --- a/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h +++ b/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h @@ -35,9 +35,9 @@ #ifndef _moBitsWithoutReplNeighborhood_h #define _moBitsWithoutReplNeighborhood_h -#include -#include -#include +#include "../../neighborhood/moNeighborhood.h" +#include "moBitsNeighborhood.h" +#include #include /** diff --git a/mo/src/problems/eval/moMaxSATincrEval.h b/mo/src/problems/eval/moMaxSATincrEval.h index 69dfbdb2e..27bc07528 100644 --- a/mo/src/problems/eval/moMaxSATincrEval.h +++ b/mo/src/problems/eval/moMaxSATincrEval.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moMaxSATincrEval_h #define _moMaxSATincrEval_h -#include -#include +#include "../../eval/moEval.h" +#include "../../../problems/eval/maxSATeval.h" /** * Incremental evaluation Function for the max SAT problem diff --git a/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h b/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h index c9a0ff0f3..5a319538e 100644 --- a/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h +++ b/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h @@ -30,8 +30,8 @@ #ifndef _moNKlandscapesBitsIncrEval_H #define _moNKlandscapesBitsIncrEval_H -#include -#include +#include "../../eval/moEval.h" +#include "../../../problems/eval/nkLandscapesEval.h" #include /** diff --git a/mo/src/problems/eval/moNKlandscapesIncrEval.h b/mo/src/problems/eval/moNKlandscapesIncrEval.h index 6635c0de0..8eef015cd 100644 --- a/mo/src/problems/eval/moNKlandscapesIncrEval.h +++ b/mo/src/problems/eval/moNKlandscapesIncrEval.h @@ -30,8 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moNKlandscapesIncrEval_H #define _moNKlandscapesIncrEval_H -#include -#include +#include "../../eval/moEval.h" +#include "../../../problems/eval/nkLandscapesEval.h" + #include /** diff --git a/mo/src/problems/eval/moOneMaxBitsIncrEval.h b/mo/src/problems/eval/moOneMaxBitsIncrEval.h index 5758d3c29..2f235709d 100644 --- a/mo/src/problems/eval/moOneMaxBitsIncrEval.h +++ b/mo/src/problems/eval/moOneMaxBitsIncrEval.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moOneMaxBitsIncrEval_H #define _moOneMaxBitsIncrEval_H -#include +#include "../../eval/moEval.h" /** * Incremental evaluation Function for the OneMax problem diff --git a/mo/src/problems/eval/moOneMaxIncrEval.h b/mo/src/problems/eval/moOneMaxIncrEval.h index c97b096e2..f42b0b6ab 100644 --- a/mo/src/problems/eval/moOneMaxIncrEval.h +++ b/mo/src/problems/eval/moOneMaxIncrEval.h @@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moOneMaxIncrEval_H #define _moOneMaxIncrEval_H -#include +#include "../../eval/moEval.h" /** * Incremental evaluation Function for the OneMax problem diff --git a/mo/src/problems/eval/moQAPIncrEval.h b/mo/src/problems/eval/moQAPIncrEval.h index 16494e4b0..9a169aa6f 100644 --- a/mo/src/problems/eval/moQAPIncrEval.h +++ b/mo/src/problems/eval/moQAPIncrEval.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moQAPIncrEval_H #define _moQAPIncrEval_H -#include -#include +#include "../../eval/moEval.h" +#include "../../../problems/eval/qapEval.h" /** * Incremental evaluation Function for the QAP problem diff --git a/mo/src/problems/eval/moRoyalRoadIncrEval.h b/mo/src/problems/eval/moRoyalRoadIncrEval.h index 3296ab25f..2763e00c1 100644 --- a/mo/src/problems/eval/moRoyalRoadIncrEval.h +++ b/mo/src/problems/eval/moRoyalRoadIncrEval.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moRoyalRoadIncrEval_H #define _moRoyalRoadIncrEval_H -#include -#include +#include "../../eval/moEval.h" +#include "../../../problems/eval/royalRoadEval.h" /** * Incremental evaluation Function for the Royal Road problem diff --git a/mo/src/problems/eval/moUBQPBitsIncrEval.h b/mo/src/problems/eval/moUBQPBitsIncrEval.h index d6a55c3d7..00d2c1043 100644 --- a/mo/src/problems/eval/moUBQPBitsIncrEval.h +++ b/mo/src/problems/eval/moUBQPBitsIncrEval.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moUBQPBitsIncrEval_H #define _moUBQPBitsIncrEval_H -#include -#include +#include "../../eval/moEval.h" +#include "../../../problems/eval/ubqpEval.h" /** * Incremental evaluation Function for the UBQPSimple problem diff --git a/mo/src/problems/eval/moUBQPSimpleIncrEval.h b/mo/src/problems/eval/moUBQPSimpleIncrEval.h index 78e6be0f5..caf908d9f 100644 --- a/mo/src/problems/eval/moUBQPSimpleIncrEval.h +++ b/mo/src/problems/eval/moUBQPSimpleIncrEval.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moUBQPSimpleIncrEval_H #define _moUBQPSimpleIncrEval_H -#include -#include +#include "../eval/moEval.h" +#include "../../../problems/eval/ubqpEval.h" /** * Incremental evaluation Function for the UBQPSimple problem diff --git a/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h b/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h index d9d149a83..71fd71ff4 100644 --- a/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h +++ b/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h @@ -35,9 +35,9 @@ #ifndef moUBQPdoubleIncrEvaluation_H #define moUBQPdoubleIncrEvaluation_H -#include -#include -#include +#include "../../eval/moDoubleIncrEvaluation.h" +#include "../../explorer/moNeighborhoodExplorer.h" +#include "../../eval/moEval.h" /** * The neighborhood evaluation for the UBQP diff --git a/mo/src/problems/permutation/moIndexedSwapNeighbor.h b/mo/src/problems/permutation/moIndexedSwapNeighbor.h index 4706305f6..825a9d794 100644 --- a/mo/src/problems/permutation/moIndexedSwapNeighbor.h +++ b/mo/src/problems/permutation/moIndexedSwapNeighbor.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moIndexedSwapNeighbor_h #define _moIndexedSwapNeighbor_h -#include -#include +#include "../../neighborhood/moBackableNeighbor.h" +#include "../../neighborhood/moIndexNeighbor.h" /** * Indexed Swap Neighbor: the position of the swap are computed according to the index diff --git a/mo/src/problems/permutation/moShiftNeighbor.h b/mo/src/problems/permutation/moShiftNeighbor.h index 13eba1849..de59170ee 100644 --- a/mo/src/problems/permutation/moShiftNeighbor.h +++ b/mo/src/problems/permutation/moShiftNeighbor.h @@ -30,8 +30,8 @@ #ifndef _moShiftNeighbor_h #define _moShiftNeighbor_h -#include -#include +#include "../neighborhood/moBackableNeighbor.h" +#include "../neighborhood/moIndexNeighbor.h" /** * Indexed Shift Neighbor diff --git a/mo/src/problems/permutation/moSwapNeighbor.h b/mo/src/problems/permutation/moSwapNeighbor.h index 55dfcbe8d..09f1218cd 100644 --- a/mo/src/problems/permutation/moSwapNeighbor.h +++ b/mo/src/problems/permutation/moSwapNeighbor.h @@ -30,7 +30,7 @@ #ifndef _moSwapNeighbor_h #define _moSwapNeighbor_h -#include +#include "../neighborhood/moBackableNeighbor.h" /** * Swap Neighbor diff --git a/mo/src/problems/permutation/moSwapNeighborhood.h b/mo/src/problems/permutation/moSwapNeighborhood.h index 8354337e6..e62ec8687 100644 --- a/mo/src/problems/permutation/moSwapNeighborhood.h +++ b/mo/src/problems/permutation/moSwapNeighborhood.h @@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moSwapNeighborhood_h #define _moSwapNeighborhood_h -#include -#include +#include "moSwapNeighbor.h" +#include "../../neighborhood/moNeighborhood.h" /** * Swap Neighborhood diff --git a/mo/src/problems/permutation/moTwoOptExNeighbor.h b/mo/src/problems/permutation/moTwoOptExNeighbor.h index ae82fd45d..64560f66d 100755 --- a/mo/src/problems/permutation/moTwoOptExNeighbor.h +++ b/mo/src/problems/permutation/moTwoOptExNeighbor.h @@ -30,7 +30,7 @@ #ifndef _moTwoOptExNeighbor_h #define _moTwoOptExNeighbor_h -#include +#include "../../neighborhood/moBackableNeighbor.h" /** * Two-opt exchange neighbor diff --git a/mo/src/problems/permutation/moTwoOptExNeighborhood.h b/mo/src/problems/permutation/moTwoOptExNeighborhood.h index 9723946bb..2b9ea43dd 100755 --- a/mo/src/problems/permutation/moTwoOptExNeighborhood.h +++ b/mo/src/problems/permutation/moTwoOptExNeighborhood.h @@ -30,10 +30,9 @@ #ifndef _moTwoOptExNeighborhood_h #define _moTwoOptExNeighborhood_h -#include -#include - -#include +#include "moTwoOptExNeighbor.h" +#include "../../neighborhood/moNeighborhood.h" +#include "../../neighborhood/moIndexNeighborhood.h" /** * Two-opt exchange neighborhood