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

Updated includes on mo/explorer

Browse source
This commit is contained in:
Ronaldd Pinho 2019-08-17 16:56:52 -03:00
commit 8329642e92
14 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mo/src/explorer/moDummyExplorer.h
View file

@ -35,7 +35,7 @@
#ifndef _moDummyExplorer_h
#define _moDummyExplorer_h
#include <explorer/moNeighborhoodExplorer.h>
#include "moNeighborhoodExplorer.h"
/**
* Dummy Explorer the neighborhood: nothing is explored

8
mo/src/explorer/moFirstImprHCexplorer.h
View file

@ -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

12
mo/src/explorer/moILSexplorer.h
View file

@ -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>

10
mo/src/explorer/moMetropolisHastingExplorer.h
View file

@ -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.

10
mo/src/explorer/moNeighborhoodExplorer.h
View file

@ -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

8
mo/src/explorer/moNeutralHCexplorer.h
View file

@ -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

10
mo/src/explorer/moRandomBestHCexplorer.h
View file

@ -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

6
mo/src/explorer/moRandomNeutralWalkExplorer.h
View file

@ -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

8
mo/src/explorer/moRandomSearchExplorer.h
View file

@ -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:

8
mo/src/explorer/moRandomWalkExplorer.h
View file

@ -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

10
mo/src/explorer/moSAexplorer.h
View file

@ -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

8
mo/src/explorer/moSimpleHCexplorer.h
View file

@ -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

16
mo/src/explorer/moTSexplorer.h
View file

@ -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

8
mo/src/explorer/moVNSexplorer.h
View file

@ -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