nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rafactor includes on mo/algo folder

Browse source
This commit is contained in:
Ronaldd Pinho 2019-08-16 23:48:14 -03:00
commit a12cce576d
15 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mo/src/algo/eoDummyMonOp.h
View file

@ -35,7 +35,7 @@
#ifndef _moDummyMonOp_h
#define _moDummyMonOp_h
#include <eoOp.h>
#include "../../eo/eoOp.h"
/**
* The mutation operator that does nothing at all !

6
mo/src/algo/moDummyLS.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moDummyLS_h
#define _moDummyLS_h
#include <algo/moLocalSearch.h>
#include <explorer/moDummyExplorer.h>
#include <continuator/moTrueContinuator.h>
#include "moLocalSearch.h"
#include "../explorer/moDummyExplorer.h"
#include "../continuator/moTrueContinuator.h"
/**
* Dummy Local Search:

10
mo/src/algo/moFirstImprHC.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moFirstImprHC_h
#define _moFirstImprHC_h
#include <algo/moLocalSearch.h>
#include <explorer/moFirstImprHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moFirstImprHCexplorer.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* First improvement HC:

20
mo/src/algo/moILS.h
View file

@ -30,16 +30,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moILS_h
#define _moILS_h
#include <algo/moLocalSearch.h>
#include <explorer/moILSexplorer.h>
#include <continuator/moIterContinuator.h>
#include <eoOp.h>
#include <neighborhood/moDummyNeighbor.h>
#include <perturb/moMonOpPerturb.h>
#include <perturb/moPerturbation.h>
#include <acceptCrit/moAlwaysAcceptCrit.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moILSexplorer.h"
#include "../continuator/moIterContinuator.h"
#include <paradiseo/eo/eoOp.h>
#include "../neighborhood/moDummyNeighbor.h"
#include "../perturb/moMonOpPerturb.h"
#include "../perturb/moPerturbation.h"
#include "../acceptCrit/moAlwaysAcceptCrit.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**

10
mo/src/algo/moLocalSearch.h
View file

@ -35,11 +35,11 @@
#ifndef _moLocalSearch_h
#define _moLocalSearch_h
#include <explorer/moNeighborhoodExplorer.h>
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eoEvalFunc.h>
#include <eoOp.h>
#include "../explorer/moNeighborhoodExplorer.h"
#include "../continuator/moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include "../../eo/eoEvalFunc.h"
#include "../../eo/eoOp.h"
/**
* the main algorithm of the local search

10
mo/src/algo/moMetropolisHasting.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moMetropolisHasting_h
#define _moMetropolisHasting_h
#include <algo/moLocalSearch.h>
#include <explorer/moMetropolisHastingExplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moMetropolisHastingExplorer.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include "../../eo/eoEvalFunc.h"
/**
* Metropolis-Hasting local search

10
mo/src/algo/moNeutralHC.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moNeutralHC_h
#define _moNeutralHC_h
#include <algo/moLocalSearch.h>
#include <explorer/moNeutralHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moNeutralHCexplorer.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Hill-Climbing local search

10
mo/src/algo/moRandomBestHC.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moRandomBestHC_h
#define _moRandomBestHC_h
#include <algo/moLocalSearch.h>
#include <explorer/moRandomBestHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moRandomBestHCexplorer.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Random Best HC:

10
mo/src/algo/moRandomNeutralWalk.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moRandomNeutralWalk_h
#define _moRandomNeutralWalk_h
#include <algo/moLocalSearch.h>
#include <explorer/moRandomNeutralWalkExplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moRandomNeutralWalkExplorer.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Random Neutral Walk:

10
mo/src/algo/moRandomSearch.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moRandomSearch_h
#define _moRandomSearch_h
#include <algo/moLocalSearch.h>
#include <explorer/moRandomSearchExplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eoInit.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moRandomSearchExplorer.h"
#include "../continuator/moTrueContinuator.h"
#include <paradiseo/eo/eoInit.h>
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Random Search:

10
mo/src/algo/moRandomWalk.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moRandomWalk_h
#define _moRandomWalk_h
#include <algo/moLocalSearch.h>
#include <explorer/moRandomWalkExplorer.h>
#include <continuator/moIterContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moRandomWalkExplorer.h"
#include "../continuator/moIterContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Random Walk:

14
mo/src/algo/moSA.h
View file

@ -30,13 +30,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moSA_h
#define _moSA_h
#include <algo/moLocalSearch.h>
#include <explorer/moSAexplorer.h>
#include <coolingSchedule/moCoolingSchedule.h>
#include <coolingSchedule/moSimpleCoolingSchedule.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moSAexplorer.h"
#include "../coolingSchedule/moCoolingSchedule.h"
#include "../coolingSchedule/moSimpleCoolingSchedule.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Simulated Annealing

10
mo/src/algo/moSimpleHC.h
View file

@ -30,11 +30,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moSimpleHC_h
#define _moSimpleHC_h
#include <algo/moLocalSearch.h>
#include <explorer/moSimpleHCexplorer.h>
#include <continuator/moTrueContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moSimpleHCexplorer.h"
#include "../continuator/moTrueContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Simple HC:

24
mo/src/algo/moTS.h
View file

@ -30,18 +30,18 @@
#ifndef _moTS_h
#define _moTS_h
#include <algo/moLocalSearch.h>
#include <explorer/moTSexplorer.h>
#include <memory/moNeighborVectorTabuList.h>
#include <memory/moIntensification.h>
#include <memory/moDummyIntensification.h>
#include <memory/moDiversification.h>
#include <memory/moDummyDiversification.h>
#include <memory/moAspiration.h>
#include <memory/moBestImprAspiration.h>
#include <continuator/moTimeContinuator.h>
#include <eval/moEval.h>
#include <eoEvalFunc.h>
#include "moLocalSearch.h"
#include "../explorer/moTSexplorer.h"
#include "../memory/moNeighborVectorTabuList.h"
#include "../memory/moIntensification.h"
#include "../memory/moDummyIntensification.h"
#include "../memory/moDiversification.h"
#include "../memory/moDummyDiversification.h"
#include "../memory/moAspiration.h"
#include "../memory/moBestImprAspiration.h"
#include "../continuator/moTimeContinuator.h"
#include "../eval/moEval.h"
#include <paradiseo/eo/eoEvalFunc.h>
/**
* Tabu Search

14
mo/src/algo/moVNS.h
View file

@ -30,14 +30,14 @@
#ifndef _moVNS_h
#define _moVNS_h
#include <algo/moLocalSearch.h>
#include <eoOp.h>
#include <comparator/moSolComparator.h>
#include <continuator/moContinuator.h>
#include "moLocalSearch.h"
#include <paeadiseo/eo/eoOp.h>
#include "../comparator/moSolComparator.h"
#include "../continuator/moContinuator.h"
#include <explorer/moVNSexplorer.h>
#include <neighborhood/moVariableNeighborhoodSelection.h>
#include <acceptCrit/moAcceptanceCriterion.h>
#include "../explorer/moVNSexplorer.h"
#include "../neighborhood/moVariableNeighborhoodSelection.h"
#include "../acceptCrit/moAcceptanceCriterion.h"
/**