Update includes on mo/problems
This commit is contained in:
parent
ea8510ce32
commit
b7d826fef4
22 changed files with 45 additions and 45 deletions
|
|
@ -35,8 +35,8 @@
|
|||
#ifndef _moBitFlipNeighborhood_h
|
||||
#define _moBitFlipNeighborhood_h
|
||||
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <utils/eoRNG.h>
|
||||
#include "../../neighborhood/moNeighborhood.h"
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#ifndef _bitNeighbor_h
|
||||
#define _bitNeighbor_h
|
||||
|
||||
#include <ga/eoBit.h>
|
||||
#include <neighborhood/moBackableNeighbor.h>
|
||||
#include <neighborhood/moIndexNeighbor.h>
|
||||
#include <paradiseo/eo/ga/eoBit.h>
|
||||
#include "../../neighborhood/moBackableNeighbor.h>
|
||||
#include "../../neighborhood/moIndexNeighbor.h>
|
||||
|
||||
/**
|
||||
* Neighbor related to a vector of Bit
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef _moBitsNeighbor_h
|
||||
#define _moBitsNeighbor_h
|
||||
|
||||
#include <neighborhood/moNeighbor.h>
|
||||
#include "../../neighborhood/moNeighbor.h"
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
#ifndef _moBitsNeighborhood_h
|
||||
#define _moBitsNeighborhood_h
|
||||
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <utils/eoRNG.h>
|
||||
#include "../../neighborhood/moNeighborhood.h"
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#ifndef _moBitsWithReplNeighborhood_h
|
||||
#define _moBitsWithReplNeighborhood_h
|
||||
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <problems/bitString/moBitsNeighborhood.h>
|
||||
#include <utils/eoRNG.h>
|
||||
#include "../../neighborhood/moNeighborhood.h"
|
||||
#include "moBitsNeighborhood.h"
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#ifndef _moBitsWithoutReplNeighborhood_h
|
||||
#define _moBitsWithoutReplNeighborhood_h
|
||||
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <problems/bitString/moBitsNeighborhood.h>
|
||||
#include <utils/eoRNG.h>
|
||||
#include "../../neighborhood/moNeighborhood.h"
|
||||
#include "moBitsNeighborhood.h"
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moMaxSATincrEval_h
|
||||
#define _moMaxSATincrEval_h
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/maxSATeval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
#include "../../../problems/eval/maxSATeval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the max SAT problem
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
#ifndef _moNKlandscapesBitsIncrEval_H
|
||||
#define _moNKlandscapesBitsIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/nkLandscapesEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
#include "../../../problems/eval/nkLandscapesEval.h"
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -30,8 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moNKlandscapesIncrEval_H
|
||||
#define _moNKlandscapesIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/nkLandscapesEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
#include "../../../problems/eval/nkLandscapesEval.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moOneMaxBitsIncrEval_H
|
||||
#define _moOneMaxBitsIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the OneMax problem
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moOneMaxIncrEval_H
|
||||
#define _moOneMaxIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the OneMax problem
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moQAPIncrEval_H
|
||||
#define _moQAPIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/qapEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
#include "../../../problems/eval/qapEval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the QAP problem
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moRoyalRoadIncrEval_H
|
||||
#define _moRoyalRoadIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/royalRoadEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
#include "../../../problems/eval/royalRoadEval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the Royal Road problem
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moUBQPBitsIncrEval_H
|
||||
#define _moUBQPBitsIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/ubqpEval.h>
|
||||
#include "../../eval/moEval.h"
|
||||
#include "../../../problems/eval/ubqpEval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the UBQPSimple problem
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moUBQPSimpleIncrEval_H
|
||||
#define _moUBQPSimpleIncrEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/ubqpEval.h>
|
||||
#include "../eval/moEval.h"
|
||||
#include "../../../problems/eval/ubqpEval.h"
|
||||
|
||||
/**
|
||||
* Incremental evaluation Function for the UBQPSimple problem
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#ifndef moUBQPdoubleIncrEvaluation_H
|
||||
#define moUBQPdoubleIncrEvaluation_H
|
||||
|
||||
#include <eval/moDoubleIncrEvaluation.h>
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <eval/moEval.h>
|
||||
#include "../../eval/moDoubleIncrEvaluation.h"
|
||||
#include "../../explorer/moNeighborhoodExplorer.h"
|
||||
#include "../../eval/moEval.h"
|
||||
|
||||
/**
|
||||
* The neighborhood evaluation for the UBQP
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moIndexedSwapNeighbor_h
|
||||
#define _moIndexedSwapNeighbor_h
|
||||
|
||||
#include <neighborhood/moBackableNeighbor.h>
|
||||
#include <neighborhood/moIndexNeighbor.h>
|
||||
#include "../../neighborhood/moBackableNeighbor.h"
|
||||
#include "../../neighborhood/moIndexNeighbor.h"
|
||||
|
||||
/**
|
||||
* Indexed Swap Neighbor: the position of the swap are computed according to the index
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
#ifndef _moShiftNeighbor_h
|
||||
#define _moShiftNeighbor_h
|
||||
|
||||
#include <neighborhood/moBackableNeighbor.h>
|
||||
#include <neighborhood/moIndexNeighbor.h>
|
||||
#include "../neighborhood/moBackableNeighbor.h"
|
||||
#include "../neighborhood/moIndexNeighbor.h"
|
||||
|
||||
/**
|
||||
* Indexed Shift Neighbor
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#ifndef _moSwapNeighbor_h
|
||||
#define _moSwapNeighbor_h
|
||||
|
||||
#include <neighborhood/moBackableNeighbor.h>
|
||||
#include "../neighborhood/moBackableNeighbor.h"
|
||||
|
||||
/**
|
||||
* Swap Neighbor
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moSwapNeighborhood_h
|
||||
#define _moSwapNeighborhood_h
|
||||
|
||||
#include <problems/permutation/moSwapNeighbor.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moSwapNeighbor.h"
|
||||
#include "../../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Swap Neighborhood
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#ifndef _moTwoOptExNeighbor_h
|
||||
#define _moTwoOptExNeighbor_h
|
||||
|
||||
#include <neighborhood/moBackableNeighbor.h>
|
||||
#include "../../neighborhood/moBackableNeighbor.h"
|
||||
|
||||
/**
|
||||
* Two-opt exchange neighbor
|
||||
|
|
|
|||
|
|
@ -30,10 +30,9 @@
|
|||
#ifndef _moTwoOptExNeighborhood_h
|
||||
#define _moTwoOptExNeighborhood_h
|
||||
|
||||
#include <problems/permutation/moTwoOptExNeighbor.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
|
||||
#include <neighborhood/moIndexNeighborhood.h>
|
||||
#include "moTwoOptExNeighbor.h"
|
||||
#include "../../neighborhood/moNeighborhood.h"
|
||||
#include "../../neighborhood/moIndexNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Two-opt exchange neighborhood
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue