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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue