After refactor all MO directories
This commit is contained in:
commit
c0155eaa47
74 changed files with 424 additions and 418 deletions
|
|
@ -35,8 +35,8 @@
|
|||
#ifndef moDoubleIncrEvaluation_H
|
||||
#define moDoubleIncrEvaluation_H
|
||||
|
||||
#include <eval/moNeighborhoodEvaluation.h>
|
||||
#include <continuator/moUpdater.h>
|
||||
#include "moNeighborhoodEvaluation.h"
|
||||
#include "../continuator/moUpdater.h"
|
||||
|
||||
/**
|
||||
* Base class for the double incremental evaluation of the neighborhood
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
#ifndef moDoubleIncrNeighborhoodEval_H
|
||||
#define moDoubleIncrNeighborhoodEval_H
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/moDoubleIncrEvaluation.h>
|
||||
#include "moEval.h"
|
||||
#include "moDoubleIncrEvaluation.h"
|
||||
|
||||
/**
|
||||
* Evaluation of a neighbor from the full evaluation f the neighborhood
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moDummyEval_h
|
||||
#define _moDummyEval_h
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include "moEval.h"
|
||||
|
||||
/**
|
||||
* Dummy Evaluation function
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef moEval_H
|
||||
#define moEval_H
|
||||
|
||||
#include <eoFunctor.h>
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
|
||||
/**
|
||||
* Abstract class for the evaluation
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moEvalCounter_h
|
||||
#define _moEvalCounter_h
|
||||
|
||||
#include <eval/moEval.h>
|
||||
#include <utils/eoParam.h>
|
||||
#include "moEval.h"
|
||||
#include <paradiseo/eo/utils/eoParam.h>
|
||||
|
||||
/**
|
||||
Counts the number of neighbor evaluations actually performed,
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
#ifndef moFullEvalByCopy_H
|
||||
#define moFullEvalByCopy_H
|
||||
|
||||
#include <eoEvalFunc.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "moEval.h"
|
||||
|
||||
/**
|
||||
* Evaluation by copy
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
#ifndef moFullEvalByModif_H
|
||||
#define moFullEvalByModif_H
|
||||
|
||||
#include <eoEvalFunc.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "moEval.h"
|
||||
|
||||
/**
|
||||
* Full evaluation to use with a moBackableNeighbor
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef moNeighborhoodEvaluation_H
|
||||
#define moNeighborhoodEvaluation_H
|
||||
|
||||
#include <eoFunctor.h>
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
|
||||
/**
|
||||
* Abstract class for the evaluation
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef _moDummyExplorer_h
|
||||
#define _moDummyExplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
|
||||
/**
|
||||
* Dummy Explorer the neighborhood: nothing is explored
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
#ifndef _moFirstImprHCexplorer_h
|
||||
#define _moFirstImprHCexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Explorer for a first improvement heuristic
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
#ifndef _moILSexplorer_h
|
||||
#define _moILSexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <algo/moLocalSearch.h>
|
||||
#include <perturb/moPerturbation.h>
|
||||
#include <acceptCrit/moAcceptanceCriterion.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../algo/moLocalSearch.h"
|
||||
#include "../perturb/moPerturbation.h"
|
||||
#include "../acceptCrit/moAcceptanceCriterion.h"
|
||||
//#include <neighborhood/moDummyNeighborhood.h>
|
||||
//#include <neighborhood/moDummyNeighbor.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -37,12 +37,12 @@
|
|||
|
||||
#include <cstdlib>
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "comparator/moNeighborComparator.h"
|
||||
#include "comparator/moSolNeighborComparator.h"
|
||||
#include "neighborhood/moNeighborhood.h"
|
||||
|
||||
#include <utils/eoRNG.h>
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
|
||||
/**
|
||||
* Explorer for the Metropolis-Hasting Sampling.
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@
|
|||
#define _neighborhoodExplorer_h
|
||||
|
||||
//EO inclusion
|
||||
#include <eoFunctor.h>
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <neighborhood/moDummyNeighborhood.h>
|
||||
#include <eval/moDummyEval.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include "../neighborhood/moDummyNeighborhood.h"
|
||||
#include "../eval/moDummyEval.h"
|
||||
|
||||
/**
|
||||
* Explore the neighborhood according to the local search algorithm
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
#ifndef _moNeutralHCexplorer_h
|
||||
#define _moNeutralHCexplorer_h
|
||||
|
||||
#include <explorer/moRandomBestHCexplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moRandomBestHCexplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Explorer for a neutral Hill-climbing
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
#ifndef _moRandomBestHCexplorer_h
|
||||
#define _moRandomBestHCexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include <vector>
|
||||
#include <utils/eoRNG.h>
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
|
||||
/**
|
||||
* Explorer for Hill-Climbing
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#ifndef _moRandomNeutralWalkexplorer_h
|
||||
#define _moRandomNeutralWalkexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Explorer for a random neutral walk
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
#ifndef _moRandomSearchexplorer_h
|
||||
#define _moRandomSearchexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <eoInit.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
|
||||
/**
|
||||
* Explorer for a pure random search:
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
#ifndef _moRandomWalkexplorer_h
|
||||
#define _moRandomWalkexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Explorer for a random walk
|
||||
|
|
|
|||
|
|
@ -37,12 +37,12 @@
|
|||
|
||||
#include <cstdlib>
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <coolingSchedule/moCoolingSchedule.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../coolingSchedule/moCoolingSchedule.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
#include <utils/eoRNG.h>
|
||||
#include <paradiseo/eo/utils/eoRNG.h>
|
||||
|
||||
/**
|
||||
* Explorer for the Simulated Annealing
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
#ifndef _moSimpleHCexplorer_h
|
||||
#define _moSimpleHCexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Explorer for a simple Hill-climbing
|
||||
|
|
|
|||
|
|
@ -34,14 +34,14 @@
|
|||
#ifndef _moTSexplorer_h
|
||||
#define _moTSexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include <memory/moAspiration.h>
|
||||
#include <memory/moTabuList.h>
|
||||
#include <memory/moIntensification.h>
|
||||
#include <memory/moDiversification.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../comparator/moNeighborComparator.h"
|
||||
#include "../comparator/moSolNeighborComparator.h"
|
||||
#include "../memory/moAspiration.h"
|
||||
#include "../memory/moTabuList.h"
|
||||
#include "../memory/moIntensification.h"
|
||||
#include "../memory/moDiversification.h"
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
|
||||
/**
|
||||
* Explorer for a Tabu Search
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@
|
|||
#ifndef _moVNSexplorer_h
|
||||
#define _moVNSexplorer_h
|
||||
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <neighborhood/moVariableNeighborhoodSelection.h>
|
||||
#include <eoOp.h>
|
||||
#include <acceptCrit/moAcceptanceCriterion.h>
|
||||
#include "moNeighborhoodExplorer.h"
|
||||
#include "../neighborhood/moVariableNeighborhoodSelection.h"
|
||||
#include <paradiseo/eo/eoOp.h>
|
||||
#include "../acceptCrit/moAcceptanceCriterion.h"
|
||||
|
||||
/**
|
||||
* Explorer for the "Variable Neighborhood Search" metaheuristic
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moAspiration_h
|
||||
#define _moAspiration_h
|
||||
|
||||
#include <eoFunctor.h>
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
|
||||
/**
|
||||
* Abstract class for Aspiration Criteria
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moBestImprAspiration_h
|
||||
#define _moBestImprAspiration_h
|
||||
|
||||
#include <memory/moAspiration.h>
|
||||
#include "moAspiration.h"
|
||||
|
||||
/**
|
||||
* Aspiration criteria accepts a solution better than the best so far
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moCountMoveMemory_h
|
||||
#define _moCountMoveMemory_h
|
||||
|
||||
#include <memory/moMemory.h>
|
||||
#include "moMemory.h"
|
||||
|
||||
/**
|
||||
* Count the number of move, no move and the successive stagnation since the last Move
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moDiversification_h
|
||||
#define _moDiversification_h
|
||||
|
||||
#include <memory/moMemory.h>
|
||||
#include <eoFunctor.h>
|
||||
#include "moMemory.h"
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
|
||||
/**
|
||||
* Abstract class for diversification strategy
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moDummyDiversification_h
|
||||
#define _moDummyDiversification_h
|
||||
|
||||
#include <memory/moDiversification.h>
|
||||
#include <memory/moDummyMemory.h>
|
||||
#include "moDiversification.h"
|
||||
#include "moDummyMemory.h"
|
||||
|
||||
/**
|
||||
* Dummy diversification strategy
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moDummyIntensification_h
|
||||
#define _moDummyIntensification_h
|
||||
|
||||
#include <memory/moIntensification.h>
|
||||
#include <memory/moDummyMemory.h>
|
||||
#include "moIntensification.h"
|
||||
#include "moDummyMemory.h"
|
||||
|
||||
/**
|
||||
* Dummy intensification strategy
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moDummyMemory_h
|
||||
#define _moDummyMemory_h
|
||||
|
||||
#include <memory/moMemory.h>
|
||||
#include "moMemory.h"
|
||||
|
||||
/**
|
||||
* Dummy memory to make an empty memory
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moIndexedVectorTabuList_h
|
||||
#define _moIndexedVectorTabuList_h
|
||||
|
||||
#include <utils/eoRndGenerators.h>
|
||||
#include <memory/moTabuList.h>
|
||||
#include <paradiseo/eo/utils/eoRndGenerators.h>
|
||||
#include "moTabuList.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moIntensification_h
|
||||
#define _moIntensification_h
|
||||
|
||||
#include <memory/moMemory.h>
|
||||
#include <eoFunctor.h>
|
||||
#include "moMemory.h"
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
|
||||
/**
|
||||
* Abstract class for intensification strategy
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#define _moMonOpDiversification_h
|
||||
|
||||
|
||||
#include <eoEvalFunc.h>
|
||||
#include <eoOp.h>
|
||||
#include <memory/moDiversification.h>
|
||||
#include <memory/moDummyMemory.h>
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include <paradiseo/eo/eoOp.h>
|
||||
#include "moDiversification.h"
|
||||
#include "moDummyMemory.h"
|
||||
|
||||
/**
|
||||
* Diversification strategy applies a "monOp" operator
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moNeighborVectorTabuList_h
|
||||
#define _moNeighborVectorTabuList_h
|
||||
|
||||
#include <memory/moTabuList.h>
|
||||
#include "moTabuList.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
#ifndef _moRndIndexedVectorTabuList_h
|
||||
#define _moRndIndexedVectorTabuList_h
|
||||
|
||||
#include <memory/moIndexedVectorTabuList.h>
|
||||
#include <utils/eoRndGenerators.h>
|
||||
#include "moIndexedVectorTabuList.h"
|
||||
#include <paradiseo/eo/utils/eoRndGenerators.h>
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moSolVectorTabuList_h
|
||||
#define _moSolVectorTabuList_h
|
||||
|
||||
#include <memory/moTabuList.h>
|
||||
#include "moTabuList.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moTabuList_h
|
||||
#define _moTabuList_h
|
||||
|
||||
#include <memory/moMemory.h>
|
||||
#include "moMemory.h"
|
||||
|
||||
/**
|
||||
* Abstract class for the Tabu List
|
||||
|
|
|
|||
288
mo/src/mo.h
288
mo/src/mo.h
|
|
@ -35,162 +35,162 @@
|
|||
#ifndef _newmo_h
|
||||
#define _newmo_h
|
||||
|
||||
#include <acceptCrit/moAcceptanceCriterion.h>
|
||||
#include <acceptCrit/moAlwaysAcceptCrit.h>
|
||||
#include <acceptCrit/moBetterAcceptCrit.h>
|
||||
#include "acceptCrit/moAcceptanceCriterion.h"
|
||||
#include "acceptCrit/moAlwaysAcceptCrit.h"
|
||||
#include "acceptCrit/moBetterAcceptCrit.h"
|
||||
|
||||
#include <algo/moDummyLS.h>
|
||||
#include <algo/moFirstImprHC.h>
|
||||
#include <algo/moILS.h>
|
||||
#include <algo/moLocalSearch.h>
|
||||
#include <algo/moMetropolisHasting.h>
|
||||
#include <algo/moNeutralHC.h>
|
||||
#include <algo/moRandomBestHC.h>
|
||||
#include <algo/moRandomNeutralWalk.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <algo/moRandomWalk.h>
|
||||
#include <algo/moSA.h>
|
||||
#include <algo/moSimpleHC.h>
|
||||
#include <algo/moTS.h>
|
||||
#include <algo/moVNS.h>
|
||||
#include <algo/eoDummyMonOp.h>
|
||||
#include "algo/moDummyLS.h"
|
||||
#include "algo/moFirstImprHC.h"
|
||||
#include "algo/moILS.h"
|
||||
#include "algo/moLocalSearch.h"
|
||||
#include "algo/moMetropolisHasting.h"
|
||||
#include "algo/moNeutralHC.h"
|
||||
#include "algo/moRandomBestHC.h"
|
||||
#include "algo/moRandomNeutralWalk.h"
|
||||
#include "algo/moRandomSearch.h"
|
||||
#include "algo/moRandomWalk.h"
|
||||
#include "algo/moSA.h"
|
||||
#include "algo/moSimpleHC.h"
|
||||
#include "algo/moTS.h"
|
||||
#include "algo/moVNS.h"
|
||||
#include "algo/eoDummyMonOp.h"
|
||||
|
||||
#include <comparator/moComparator.h>
|
||||
#include <comparator/moNeighborComparator.h>
|
||||
#include <comparator/moEqualNeighborComparator.h>
|
||||
#include <comparator/moEqualSolNeighborComparator.h>
|
||||
#include <comparator/moSolComparator.h>
|
||||
#include <comparator/moEqualSolComparator.h>
|
||||
#include <comparator/moSolNeighborComparator.h>
|
||||
#include "comparator/moComparator.h"
|
||||
#include "comparator/moNeighborComparator.h"
|
||||
#include "comparator/moEqualNeighborComparator.h"
|
||||
#include "comparator/moEqualSolNeighborComparator.h"
|
||||
#include "comparator/moSolComparator.h"
|
||||
#include "comparator/moEqualSolComparator.h"
|
||||
#include "comparator/moSolNeighborComparator.h"
|
||||
|
||||
#include <continuator/moAverageFitnessNeighborStat.h>
|
||||
#include <continuator/moBestSoFarStat.h>
|
||||
#include <continuator/moBestFitnessStat.h>
|
||||
#include <continuator/moUnsignedStat.h>
|
||||
#include <continuator/moValueStat.h>
|
||||
#include <continuator/moBooleanStat.h>
|
||||
#include <continuator/moCheckpoint.h>
|
||||
#include <continuator/moCombinedContinuator.h>
|
||||
#include <continuator/moContinuator.h>
|
||||
#include <continuator/moCounterMonitorSaver.h>
|
||||
#include <continuator/moCounterStat.h>
|
||||
#include <continuator/moDistanceStat.h>
|
||||
#include <continuator/moFitContinuator.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <continuator/moFullEvalContinuator.h>
|
||||
#include <continuator/moEvalsContinuator.h>
|
||||
#include <continuator/moIterContinuator.h>
|
||||
#include <continuator/moMaxNeighborStat.h>
|
||||
#include <continuator/moMinNeighborStat.h>
|
||||
#include <continuator/moMinusOneCounterStat.h>
|
||||
#include <continuator/moNbInfNeighborStat.h>
|
||||
#include <continuator/moNbSupNeighborStat.h>
|
||||
#include <continuator/moNeighborBestStat.h>
|
||||
#include <continuator/moNeighborEvalContinuator.h>
|
||||
#include <continuator/moNeighborFitnessStat.h>
|
||||
#include <continuator/moNeighborhoodStat.h>
|
||||
#include <continuator/moNeutralDegreeNeighborStat.h>
|
||||
#include <continuator/moSecondMomentNeighborStat.h>
|
||||
#include <continuator/moSizeNeighborStat.h>
|
||||
#include <continuator/moSolutionStat.h>
|
||||
#include <continuator/moStat.h>
|
||||
#include <continuator/moStatBase.h>
|
||||
#include <continuator/moStatFromStat.h>
|
||||
#include <continuator/moStdFitnessNeighborStat.h>
|
||||
#include <continuator/moTimeContinuator.h>
|
||||
#include <continuator/moTrueContinuator.h>
|
||||
#include <continuator/moVectorMonitor.h>
|
||||
#include "continuator/moAverageFitnessNeighborStat.h"
|
||||
#include "continuator/moBestSoFarStat.h"
|
||||
#include "continuator/moBestFitnessStat.h"
|
||||
#include "continuator/moUnsignedStat.h"
|
||||
#include "continuator/moValueStat.h"
|
||||
#include "continuator/moBooleanStat.h"
|
||||
#include "continuator/moCheckpoint.h"
|
||||
#include "continuator/moCombinedContinuator.h"
|
||||
#include "continuator/moContinuator.h"
|
||||
#include "continuator/moCounterMonitorSaver.h"
|
||||
#include "continuator/moCounterStat.h"
|
||||
#include "continuator/moDistanceStat.h"
|
||||
#include "continuator/moFitContinuator.h"
|
||||
#include "continuator/moFitnessStat.h"
|
||||
#include "continuator/moFullEvalContinuator.h"
|
||||
#include "continuator/moEvalsContinuator.h"
|
||||
#include "continuator/moIterContinuator.h"
|
||||
#include "continuator/moMaxNeighborStat.h"
|
||||
#include "continuator/moMinNeighborStat.h"
|
||||
#include "continuator/moMinusOneCounterStat.h"
|
||||
#include "continuator/moNbInfNeighborStat.h"
|
||||
#include "continuator/moNbSupNeighborStat.h"
|
||||
#include "continuator/moNeighborBestStat.h"
|
||||
#include "continuator/moNeighborEvalContinuator.h"
|
||||
#include "continuator/moNeighborFitnessStat.h"
|
||||
#include "continuator/moNeighborhoodStat.h"
|
||||
#include "continuator/moNeutralDegreeNeighborStat.h"
|
||||
#include "continuator/moSecondMomentNeighborStat.h"
|
||||
#include "continuator/moSizeNeighborStat.h"
|
||||
#include "continuator/moSolutionStat.h"
|
||||
#include "continuator/moStat.h"
|
||||
#include "continuator/moStatBase.h"
|
||||
#include "continuator/moStatFromStat.h"
|
||||
#include "continuator/moStdFitnessNeighborStat.h"
|
||||
#include "continuator/moTimeContinuator.h"
|
||||
#include "continuator/moTrueContinuator.h"
|
||||
#include "continuator/moVectorMonitor.h"
|
||||
|
||||
#include <coolingSchedule/moCoolingSchedule.h>
|
||||
#include <coolingSchedule/moDynSpanCoolingSchedule.h>
|
||||
#include <coolingSchedule/moSimpleCoolingSchedule.h>
|
||||
#include <coolingSchedule/moDynSpanCoolingSchedule.h>
|
||||
#include "coolingSchedule/moCoolingSchedule.h"
|
||||
#include "coolingSchedule/moDynSpanCoolingSchedule.h"
|
||||
#include "coolingSchedule/moSimpleCoolingSchedule.h"
|
||||
#include "coolingSchedule/moDynSpanCoolingSchedule.h"
|
||||
|
||||
#include <eval/moDummyEval.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eval/moEvalCounter.h>
|
||||
#include <eval/moFullEvalByCopy.h>
|
||||
#include <eval/moFullEvalByModif.h>
|
||||
#include <eval/moDoubleIncrNeighborhoodEval.h>
|
||||
#include "eval/moDummyEval.h"
|
||||
#include "eval/moEval.h"
|
||||
#include "eval/moEvalCounter.h"
|
||||
#include "eval/moFullEvalByCopy.h"
|
||||
#include "eval/moFullEvalByModif.h"
|
||||
#include "eval/moDoubleIncrNeighborhoodEval.h"
|
||||
|
||||
#include <explorer/moDummyExplorer.h>
|
||||
#include <explorer/moFirstImprHCexplorer.h>
|
||||
#include <explorer/moILSexplorer.h>
|
||||
#include <explorer/moMetropolisHastingExplorer.h>
|
||||
#include <explorer/moNeighborhoodExplorer.h>
|
||||
#include <explorer/moNeutralHCexplorer.h>
|
||||
#include <explorer/moRandomBestHCexplorer.h>
|
||||
#include <explorer/moRandomNeutralWalkExplorer.h>
|
||||
#include <explorer/moRandomSearchExplorer.h>
|
||||
#include <explorer/moRandomWalkExplorer.h>
|
||||
#include <explorer/moSAexplorer.h>
|
||||
#include <explorer/moSimpleHCexplorer.h>
|
||||
#include <explorer/moTSexplorer.h>
|
||||
#include <explorer/moVNSexplorer.h>
|
||||
#include "explorer/moDummyExplorer.h"
|
||||
#include "explorer/moFirstImprHCexplorer.h"
|
||||
#include "explorer/moILSexplorer.h"
|
||||
#include "explorer/moMetropolisHastingExplorer.h"
|
||||
#include "explorer/moNeighborhoodExplorer.h"
|
||||
#include "explorer/moNeutralHCexplorer.h"
|
||||
#include "explorer/moRandomBestHCexplorer.h"
|
||||
#include "explorer/moRandomNeutralWalkExplorer.h"
|
||||
#include "explorer/moRandomSearchExplorer.h"
|
||||
#include "explorer/moRandomWalkExplorer.h"
|
||||
#include "explorer/moSAexplorer.h"
|
||||
#include "explorer/moSimpleHCexplorer.h"
|
||||
#include "explorer/moTSexplorer.h"
|
||||
#include "explorer/moVNSexplorer.h"
|
||||
|
||||
#include <memory/moAspiration.h>
|
||||
#include <memory/moBestImprAspiration.h>
|
||||
#include <memory/moCountMoveMemory.h>
|
||||
#include <memory/moDiversification.h>
|
||||
#include <memory/moDummyDiversification.h>
|
||||
#include <memory/moDummyIntensification.h>
|
||||
#include <memory/moDummyMemory.h>
|
||||
#include <memory/moIndexedVectorTabuList.h>
|
||||
#include <memory/moIntensification.h>
|
||||
#include <memory/moMemory.h>
|
||||
#include <memory/moMonOpDiversification.h>
|
||||
#include <memory/moNeighborVectorTabuList.h>
|
||||
#include <memory/moRndIndexedVectorTabuList.h>
|
||||
#include <memory/moSolVectorTabuList.h>
|
||||
#include <memory/moRndIndexedVectorTabuList.h>
|
||||
#include <memory/moTabuList.h>
|
||||
#include "memory/moAspiration.h"
|
||||
#include "memory/moBestImprAspiration.h"
|
||||
#include "memory/moCountMoveMemory.h"
|
||||
#include "memory/moDiversification.h"
|
||||
#include "memory/moDummyDiversification.h"
|
||||
#include "memory/moDummyIntensification.h"
|
||||
#include "memory/moDummyMemory.h"
|
||||
#include "memory/moIndexedVectorTabuList.h"
|
||||
#include "memory/moIntensification.h"
|
||||
#include "memory/moMemory.h"
|
||||
#include "memory/moMonOpDiversification.h"
|
||||
#include "memory/moNeighborVectorTabuList.h"
|
||||
#include "memory/moRndIndexedVectorTabuList.h"
|
||||
#include "memory/moSolVectorTabuList.h"
|
||||
#include "memory/moRndIndexedVectorTabuList.h"
|
||||
#include "memory/moTabuList.h"
|
||||
|
||||
#include <neighborhood/moBackableNeighbor.h>
|
||||
#include <neighborhood/moBackwardVectorVNSelection.h>
|
||||
#include <neighborhood/moDummyNeighbor.h>
|
||||
#include <neighborhood/moDummyNeighborhood.h>
|
||||
#include <neighborhood/moForwardVectorVNSelection.h>
|
||||
#include <neighborhood/moIndexNeighbor.h>
|
||||
#include <neighborhood/moIndexNeighborhood.h>
|
||||
#include <neighborhood/moNeighbor.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <neighborhood/moOrderNeighborhood.h>
|
||||
#include <neighborhood/moRndNeighborhood.h>
|
||||
#include <neighborhood/moRndVectorVNSelection.h>
|
||||
#include <neighborhood/moRndWithoutReplNeighborhood.h>
|
||||
#include <neighborhood/moRndWithReplNeighborhood.h>
|
||||
#include <neighborhood/moVariableNeighborhoodSelection.h>
|
||||
#include <neighborhood/moVectorVNSelection.h>
|
||||
#include <neighborhood/moEvaluatedNeighborhood.h>
|
||||
#include "neighborhood/moBackableNeighbor.h"
|
||||
#include "neighborhood/moBackwardVectorVNSelection.h"
|
||||
#include "neighborhood/moDummyNeighbor.h"
|
||||
#include "neighborhood/moDummyNeighborhood.h"
|
||||
#include "neighborhood/moForwardVectorVNSelection.h"
|
||||
#include "neighborhood/moIndexNeighbor.h"
|
||||
#include "neighborhood/moIndexNeighborhood.h"
|
||||
#include "neighborhood/moNeighbor.h"
|
||||
#include "neighborhood/moNeighborhood.h"
|
||||
#include "neighborhood/moOrderNeighborhood.h"
|
||||
#include "neighborhood/moRndNeighborhood.h"
|
||||
#include "neighborhood/moRndVectorVNSelection.h"
|
||||
#include "neighborhood/moRndWithoutReplNeighborhood.h"
|
||||
#include "neighborhood/moRndWithReplNeighborhood.h"
|
||||
#include "neighborhood/moVariableNeighborhoodSelection.h"
|
||||
#include "neighborhood/moVectorVNSelection.h"
|
||||
#include "neighborhood/moEvaluatedNeighborhood.h"
|
||||
|
||||
#include <perturb/moLocalSearchInit.h>
|
||||
#include <perturb/moMonOpPerturb.h>
|
||||
#include <perturb/moNeighborhoodPerturb.h>
|
||||
#include <perturb/moPerturbation.h>
|
||||
#include <perturb/moRestartPerturb.h>
|
||||
#include <perturb/moSolInit.h>
|
||||
#include "perturb/moLocalSearchInit.h"
|
||||
#include "perturb/moMonOpPerturb.h"
|
||||
#include "perturb/moNeighborhoodPerturb.h"
|
||||
#include "perturb/moPerturbation.h"
|
||||
#include "perturb/moRestartPerturb.h"
|
||||
#include "perturb/moSolInit.h"
|
||||
|
||||
#include <problems/bitString/moBitNeighbor.h>
|
||||
#include <problems/bitString/moBitsNeighbor.h>
|
||||
#include <problems/bitString/moBitsNeighborhood.h>
|
||||
#include <problems/bitString/moBitsWithoutReplNeighborhood.h>
|
||||
#include <problems/bitString/moBitsWithReplNeighborhood.h>
|
||||
#include "problems/bitString/moBitNeighbor.h"
|
||||
#include "problems/bitString/moBitsNeighbor.h"
|
||||
#include "problems/bitString/moBitsNeighborhood.h"
|
||||
#include "problems/bitString/moBitsWithoutReplNeighborhood.h"
|
||||
#include "problems/bitString/moBitsWithReplNeighborhood.h"
|
||||
|
||||
#include <problems/permutation/moIndexedSwapNeighbor.h>
|
||||
#include <problems/permutation/moShiftNeighbor.h>
|
||||
#include <problems/permutation/moSwapNeighbor.h>
|
||||
#include <problems/permutation/moSwapNeighborhood.h>
|
||||
#include <problems/permutation/moTwoOptExNeighbor.h>
|
||||
#include <problems/permutation/moTwoOptExNeighborhood.h>
|
||||
#include "problems/permutation/moIndexedSwapNeighbor.h"
|
||||
#include "problems/permutation/moShiftNeighbor.h"
|
||||
#include "problems/permutation/moSwapNeighbor.h"
|
||||
#include "problems/permutation/moSwapNeighborhood.h"
|
||||
#include "problems/permutation/moTwoOptExNeighbor.h"
|
||||
#include "problems/permutation/moTwoOptExNeighborhood.h"
|
||||
|
||||
//#include <problems/eval/moMaxSATincrEval.h>
|
||||
//#include <problems/eval/moOneMaxIncrEval.h>
|
||||
//#include <problems/eval/moQAPIncrEval.h>
|
||||
//#include <problems/eval/moRoyalRoadIncrEval.h>
|
||||
//#include <problems/eval/moUBQPSimpleIncrEval.h>
|
||||
//#include <problems/eval/moUBQPdoubleIncrEvaluation.h>
|
||||
//#include <problems/eval/moUBQPBitsIncrEval.h>
|
||||
//#include <problems/eval/moNKlandscapesIncrEval.h>
|
||||
//#include "problems/eval/moMaxSATincrEval.h"
|
||||
//#include "problems/eval/moOneMaxIncrEval.h"
|
||||
//#include "problems/eval/moQAPIncrEval.h"
|
||||
//#include "problems/eval/moRoyalRoadIncrEval.h"
|
||||
//#include "problems/eval/moUBQPSimpleIncrEval.h"
|
||||
//#include "problems/eval/moUBQPdoubleIncrEvaluation.h"
|
||||
//#include "problems/eval/moUBQPBitsIncrEval.h"
|
||||
//#include "problems/eval/moNKlandscapesIncrEval.h"
|
||||
|
||||
|
||||
#include <sampling/moAdaptiveWalkSampling.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
|||
#ifndef _moLocalSearchInit_h
|
||||
#define _moLocalSearchInit_h
|
||||
|
||||
#include "../../eo/eoInit.h"
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../algo/moLocalSearch.h"
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -35,20 +35,20 @@
|
|||
#ifndef moAdaptiveWalkSampling_h
|
||||
#define moAdaptiveWalkSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <continuator/moCheckpoint.h>
|
||||
#include <perturb/moLocalSearchInit.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <algo/moFirstImprHC.h>
|
||||
#include <continuator/moSolutionStat.h>
|
||||
#include <continuator/moMinusOneCounterStat.h>
|
||||
#include <continuator/moStatFromStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <eval/moEvalCounter.h>
|
||||
#include <eoEvalFuncCounter.h>
|
||||
#include <continuator/moValueStat.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../continuator/moCheckpoint.h"
|
||||
#include "../perturb/moLocalSearchInit.h"
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../algo/moFirstImprHC.h"
|
||||
#include "../continuator/moSolutionStat.h"
|
||||
#include "../continuator/moMinusOneCounterStat.h"
|
||||
#include "../continuator/moStatFromStat.h"
|
||||
#include "moSampling.h"
|
||||
#include "../eval/moEvalCounter.h"
|
||||
#include <paradiseo/eo/eoEvalFuncCounter.h>
|
||||
#include "../continuator/moValueStat.h"
|
||||
|
||||
/**
|
||||
* To compute the length and final solution of an adaptive walk:
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
#ifndef moAutocorrelationSampling_h
|
||||
#define moAutocorrelationSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomWalk.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moRandomWalk.h"
|
||||
#include "../continuator/moFitnessStat.h"
|
||||
#include "moSampling.h"
|
||||
|
||||
/**
|
||||
* To compute the autocorrelation function:
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@
|
|||
#ifndef moDensityOfStatesSampling_h
|
||||
#define moDensityOfStatesSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../continuator/moFitnessStat.h"
|
||||
#include "moSampling.h"
|
||||
|
||||
/**
|
||||
* To compute the density of states:
|
||||
|
|
|
|||
|
|
@ -35,14 +35,14 @@
|
|||
#ifndef moFDCsampling_h
|
||||
#define moFDCsampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <utils/eoDistance.h>
|
||||
#include <continuator/moDistanceStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../continuator/moFitnessStat.h"
|
||||
#include <paradiseo/eo/utils/eoDistance.h>
|
||||
#include "../continuator/moDistanceStat.h"
|
||||
#include "moSampling.h"
|
||||
|
||||
/**
|
||||
* To compute the fitness distance correlation:
|
||||
|
|
|
|||
|
|
@ -35,14 +35,14 @@
|
|||
#ifndef moFitnessCloudSampling_h
|
||||
#define moFitnessCloudSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moDummyLS.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <continuator/moNeighborFitnessStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moDummyLS.h"
|
||||
#include "../continuator/moFitnessStat.h"
|
||||
#include "../continuator/moNeighborFitnessStat.h"
|
||||
#include "moSampling.h"
|
||||
|
||||
/**
|
||||
* To compute an estimation of the fitness cloud,
|
||||
|
|
|
|||
|
|
@ -35,17 +35,17 @@
|
|||
#ifndef moHillClimberSampling_h
|
||||
#define moHillClimberSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <continuator/moCheckpoint.h>
|
||||
#include <perturb/moLocalSearchInit.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <algo/moSimpleHC.h>
|
||||
#include <continuator/moSolutionStat.h>
|
||||
#include <continuator/moMinusOneCounterStat.h>
|
||||
#include <continuator/moStatFromStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../continuator/moCheckpoint.h"
|
||||
#include "../perturb/moLocalSearchInit.h"
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../algo/moSimpleHC.h"
|
||||
#include "../continuator/moSolutionStat.h"
|
||||
#include "../continuator/moMinusOneCounterStat.h"
|
||||
#include "../continuator/moStatFromStat.h"
|
||||
#include "moSampling.h"
|
||||
|
||||
/**
|
||||
* To compute the length and final solution of an adaptive walk:
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
#ifndef moMHBestFitnessCloudSampling_h
|
||||
#define moMHBestFitnessCloudSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moMetropolisHasting.h>
|
||||
#include <continuator/moNeighborBestStat.h>
|
||||
#include <sampling/moFitnessCloudSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moMetropolisHasting.h"
|
||||
#include"../continuator/moNeighborBestStat.h"
|
||||
#include "moFitnessCloudSampling.h"
|
||||
|
||||
/**
|
||||
* To compute an estimation of the fitness cloud,
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
#ifndef moMHRndFitnessCloudSampling_h
|
||||
#define moMHRndFitnessCloudSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moMetropolisHasting.h>
|
||||
#include <continuator/moNeighborFitnessStat.h>
|
||||
#include <sampling/moFitnessCloudSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moMetropolisHasting.h"
|
||||
#include "../continuator/moNeighborFitnessStat.h"
|
||||
#include "moFitnessCloudSampling.h"
|
||||
|
||||
/**
|
||||
* To compute an estimation of the fitness cloud,
|
||||
|
|
|
|||
|
|
@ -35,15 +35,15 @@
|
|||
#ifndef moNeutralDegreeSampling_h
|
||||
#define moNeutralDegreeSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <continuator/moFitnessStat.h>
|
||||
#include <continuator/moNeighborhoodStat.h>
|
||||
#include <continuator/moNeutralDegreeNeighborStat.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../continuator/moFitnessStat.h"
|
||||
#include "../continuator/moNeighborhoodStat.h"
|
||||
#include "../continuator/moNeutralDegreeNeighborStat.h"
|
||||
#include "moSampling.h"
|
||||
|
||||
/**
|
||||
* To compute the neutral degree:
|
||||
|
|
|
|||
|
|
@ -35,27 +35,30 @@
|
|||
#ifndef moNeutralWalkSampling_h
|
||||
#define moNeutralWalkSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomNeutralWalk.h>
|
||||
#include <sampling/moSampling.h>
|
||||
#include <perturb/moSolInit.h>
|
||||
#include <continuator/moSolutionStat.h>
|
||||
#include <utils/eoDistance.h>
|
||||
#include <continuator/moDistanceStat.h>
|
||||
#include <continuator/moNeighborhoodStat.h>
|
||||
#include <continuator/moMaxNeighborStat.h>
|
||||
#include <continuator/moMinNeighborStat.h>
|
||||
#include <continuator/moQ1NeighborStat.h>
|
||||
#include <continuator/moQ3NeighborStat.h>
|
||||
#include <continuator/moMedianNeighborStat.h>
|
||||
#include <continuator/moAverageFitnessNeighborStat.h>
|
||||
#include <continuator/moStdFitnessNeighborStat.h>
|
||||
#include <continuator/moSizeNeighborStat.h>
|
||||
#include <continuator/moNbInfNeighborStat.h>
|
||||
#include <continuator/moNbSupNeighborStat.h>
|
||||
#include <continuator/moNeutralDegreeNeighborStat.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
|
||||
#include "../algo/moRandomNeutralWalk.h"
|
||||
#include "moSampling.h"
|
||||
#include "../perturb/moSolInit.h"
|
||||
#include "../continuator/moSolutionStat.h"
|
||||
|
||||
#include <paradiseo/eo/utils/eoDistance.h>
|
||||
|
||||
#include "../continuator/moDistanceStat.h"
|
||||
#include "../continuator/moNeighborhoodStat.h"
|
||||
#include "../continuator/moMaxNeighborStat.h"
|
||||
#include "../continuator/moMinNeighborStat.h"
|
||||
#include "../continuator/moQ1NeighborStat.h"
|
||||
#include "../continuator/moQ3NeighborStat.h"
|
||||
#include "../continuator/moMedianNeighborStat.h"
|
||||
#include "../continuator/moAverageFitnessNeighborStat.h"
|
||||
#include "../continuator/moStdFitnessNeighborStat.h"
|
||||
#include "../continuator/moSizeNeighborStat.h"
|
||||
#include "../continuator/moNbInfNeighborStat.h"
|
||||
#include "../continuator/moNbSupNeighborStat.h"
|
||||
#include "../continuator/moNeutralDegreeNeighborStat.h"
|
||||
|
||||
/**
|
||||
* To explore the evolvability of solutions in a neutral networks:
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
#ifndef moRndBestFitnessCloudSampling_h
|
||||
#define moRndBestFitnessCloudSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <continuator/moNeighborBestStat.h>
|
||||
#include <sampling/moFitnessCloudSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../continuator/moNeighborBestStat.h"
|
||||
#include "moFitnessCloudSampling.h"
|
||||
|
||||
/**
|
||||
* To compute an estimation of the fitness cloud,
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
#ifndef moRndRndFitnessCloudSampling_h
|
||||
#define moRndRndFitnessCloudSampling_h
|
||||
|
||||
#include <eoInit.h>
|
||||
#include <neighborhood/moNeighborhood.h>
|
||||
#include <eval/moEval.h>
|
||||
#include <eoEvalFunc.h>
|
||||
#include <algo/moRandomSearch.h>
|
||||
#include <continuator/moNeighborFitnessStat.h>
|
||||
#include <sampling/moFitnessCloudSampling.h>
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
#include "../neighborhood/moNeighborhood.h"
|
||||
#include "../eval/moEval.h"
|
||||
#include <paradiseo/eo/eoEvalFunc.h>
|
||||
#include "../algo/moRandomSearch.h"
|
||||
#include "../continuator/moNeighborFitnessStat.h"
|
||||
#include "moFitnessCloudSampling.h"
|
||||
|
||||
/**
|
||||
* To compute an estimation of the fitness cloud,
|
||||
|
|
|
|||
|
|
@ -40,13 +40,16 @@
|
|||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <cstdlib>
|
||||
#include <eoFunctor.h>
|
||||
#include <utils/eoMonitor.h>
|
||||
#include <continuator/moStat.h>
|
||||
#include <continuator/moCheckpoint.h>
|
||||
#include <continuator/moVectorMonitor.h>
|
||||
#include <algo/moLocalSearch.h>
|
||||
#include <eoInit.h>
|
||||
|
||||
#include <paradiseo/eo/eoFunctor.h>
|
||||
#include <paradiseo/eo/utils/eoMonitor.h>
|
||||
|
||||
#include "../continuator/moStat.h"
|
||||
#include "../continuator/moCheckpoint.h"
|
||||
#include "../continuator/moVectorMonitor.h"
|
||||
#include "../algo/moLocalSearch.h"
|
||||
|
||||
#include <paradiseo/eo/eoInit.h>
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include <utils/eoDistance.h>
|
||||
#include <paradiseo/eo/utils/eoDistance.h>
|
||||
|
||||
/**
|
||||
* Tools to compute some basic statistics
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue