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

Merge branch 'mo-module-includes'

Browse source
This commit is contained in:
Ronaldd Pinho 2019-08-17 16:14:00 -03:00
commit 44b04879fc
95 changed files with 255 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mo/src/acceptCrit/moAcceptanceCriterion.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moAcceptanceCriterion_h
#define _moAcceptanceCriterion_h
#include <eoFunctor.h>
#include <memory/moMemory.h>
#include "../../eo/eoFunctor.h"
#include "../memory/moMemory.h"
/**
* Abstract class for Acceptance criteria

4
mo/src/acceptCrit/moAlwaysAcceptCrit.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moAlwaysAcceptCrit_h
#define _moAlwaysAcceptCrit_h
#include <acceptCrit/moAcceptanceCriterion.h>
#include <memory/moDummyMemory.h>
#include "moAcceptanceCriterion.h"
#include "../memory/moDummyMemory.h"
/**
* Acceptance Criterion for extreme diversification : always accept new solution

6
mo/src/acceptCrit/moBetterAcceptCrit.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moBetterAcceptCrit_h
#define _moBetterAcceptCrit_h
#include <acceptCrit/moAcceptanceCriterion.h>
#include <memory/moDummyMemory.h>
#include <comparator/moSolComparator.h>
#include "moAcceptanceCriterion.h"
#include "../memory/moDummyMemory.h"
#include "../comparator/moSolComparator.h"
/**
* Acceptance Criterion for extreme intensification : accept if the new solution is better than previous one

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"
/**

4
mo/src/comparator/moComparator.h
View file

@ -35,8 +35,8 @@
#ifndef _moComparator_h
#define _moComparator_h
#include <EO.h>
#include <eoFunctor.h>
#include <paradiseo/eo/EO.h>
#include <paradiseo/eo/eoFunctor.h>
/**

4
mo/src/comparator/moEqualNeighborComparator.h
View file

@ -35,8 +35,8 @@
#ifndef _moEqualNeighborComparator_h
#define _moEqualNeighborComparator_h
#include <neighborhood/moNeighbor.h>
#include <comparator/moNeighborComparator.h>
#include "../neighborhood/moNeighbor.h"
#include "moNeighborComparator.h"
/**
* Comparator of two neighbors : a neighbor is better if the fitness is higher or equal

2
mo/src/comparator/moEqualSolComparator.h
View file

@ -35,7 +35,7 @@
#ifndef _moEqualSolComparator_h
#define _moEqualSolComparator_h
#include <comparator/moSolComparator.h>
#include "moSolComparator.h"
/**
* Comparator of two solutions : a neighbor is better if the fitness is higher or equal

8
mo/src/comparator/moEqualSolNeighborComparator.h
View file

@ -35,11 +35,11 @@
#ifndef _moEqualSolNeighborComparator_h
#define _moEqualSolNeighborComparator_h
#include <EO.h>
#include <eoFunctor.h>
#include <paradiseo/eo/EO.h>
#include <paradiseo/eo/eoFunctor.h>
#include <neighborhood/moNeighbor.h>
#include <comparator/moSolNeighborComparator.h>
#include "../neighborhood/moNeighbor.h"
#include "../comparator/moSolNeighborComparator.h"
/**

4
mo/src/comparator/moNeighborComparator.h
View file

@ -35,8 +35,8 @@
#ifndef _moNeighborComparator_h
#define _moNeighborComparator_h
#include <neighborhood/moNeighbor.h>
#include <comparator/moComparator.h>
#include "../neighborhood/moNeighbor.h"
#include "moComparator.h"
/**
* Comparator of two neighbors

2
mo/src/comparator/moSolComparator.h
View file

@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moSolComparator_h
#define _moSolComparator_h
#include <comparator/moComparator.h>
#include "moComparator.h"
/**
* Comparator of two solutions

8
mo/src/comparator/moSolNeighborComparator.h
View file

@ -35,11 +35,11 @@
#ifndef _moSolNeighborComparator_h
#define _moSolNeighborComparator_h
#include <EO.h>
#include <eoFunctor.h>
#include <paradiseo/eo/EO.h>
#include <paradiseo/eo/eoFunctor.h>
#include <neighborhood/moNeighbor.h>
#include <comparator/moComparator.h>
#include "../neighborhood/moNeighbor.h"
#include "moComparator.h"
/**

4
mo/src/continuator/moAverageFitnessNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moAverageFitnessNeighborStat_h
#define moAverageFitnessNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the average of fitness in the neighborhood

2
mo/src/continuator/moBestFitnessStat.h
View file

@ -35,7 +35,7 @@
#ifndef moBestFitnessStat_h
#define moBestFitnessStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which save the best solution found during the search

6
mo/src/continuator/moBestNoImproveContinuator.h
View file

@ -30,9 +30,9 @@
#ifndef _moBestNoImproveContinuator_h
#define _moBestNoImproveContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <comparator/moSolComparator.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include "../comparator/moSolComparator.h"
/**
* Stop when the best solution cannot be improved

2
mo/src/continuator/moBestSoFarStat.h
View file

@ -35,7 +35,7 @@
#ifndef moBestSoFarStat_h
#define moBestSoFarStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which save the best solution found during the search

2
mo/src/continuator/moBooleanStat.h
View file

@ -35,7 +35,7 @@
#ifndef moBooleanStat_h
#define moBooleanStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives from a boolean variable

12
mo/src/continuator/moCheckpoint.h
View file

@ -35,12 +35,12 @@
#ifndef moCheckpoint_h
#define moCheckpoint_h
#include <continuator/moContinuator.h>
#include <utils/eoMonitor.h>
#include <continuator/moStatBase.h>
#include <utils/eoUpdater.h>
#include <continuator/moUpdater.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include <paradiseo/eo/utils/eoMonitor.h>
#include "moStatBase.h"
#include <paradiseo/eo/utils/eoUpdater.h>
#include "moUpdater.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Continuator allowing to add others (continuators, stats, monitors or updaters)

4
mo/src/continuator/moCombinedContinuator.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moCombinedContinuator_h
#define _moCombinedContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include <vector>
/**

4
mo/src/continuator/moContinuator.h
View file

@ -35,8 +35,8 @@
#ifndef _moContinuator_h
#define _moContinuator_h
#include <eoFunctor.h>
#include <neighborhood/moNeighborhood.h>
#include <paradiseo/eo/eoFunctor.h>
#include "../neighborhood/moNeighborhood.h"
/**
* To make specific continuator from a solution

4
mo/src/continuator/moCounterMonitorSaver.h
View file

@ -35,8 +35,8 @@
#ifndef moCounterMonitorSaver_h
#define moCounterMonitorSaver_h
#include <utils/eoUpdater.h>
#include <utils/eoMonitor.h>
#include <paradiseo/eo/utils/eoUpdater.h>
#include <paradiseo/eo/utils/eoMonitor.h>
/**
* Class calling monitors with a given frequency

2
mo/src/continuator/moCounterStat.h
View file

@ -35,7 +35,7 @@
#ifndef moCounterStat_h
#define moCounterStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives the number of iteration

4
mo/src/continuator/moDistanceStat.h
View file

@ -35,8 +35,8 @@
#ifndef moDistanceStat_h
#define moDistanceStat_h
#include <utils/eoDistance.h>
#include <continuator/moStat.h>
#include <paradiseo/eo/utils/eoDistance.h>
#include "moStat.h"
/**
* The statistic gives the distance to a reference solution

8
mo/src/continuator/moEvalsContinuator.h
View file

@ -30,10 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moEvalsContinuator_h
#define _moEvalsContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eoEvalFuncCounter.h>
#include <eval/moEvalCounter.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include <paradiseo/eo/eoEvalFuncCounter.h>
#include "../eval/moEvalCounter.h"
/**
* Continue until a maximum fixed number of full evaluation and neighbor evaluation is reached (total number of evaluation = full evaluation + incremental evaluation)

4
mo/src/continuator/moFitContinuator.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moFitContinuator_h
#define _moFitContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Continue until a maximum fitness is reached

2
mo/src/continuator/moFitnessStat.h
View file

@ -35,7 +35,7 @@
#ifndef moFitnessStat_h
#define moFitnessStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* Stat given the fitness of the current solution

6
mo/src/continuator/moFullEvalContinuator.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moFullEvalContinuator_h
#define _moFullEvalContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eoEvalFuncCounter.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include <paradiseo/eo/eoEvalFuncCounter.h>
/**
* Continue until a maximum fixed number of full evaluation is reached

4
mo/src/continuator/moIterContinuator.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moIterContinuator_h
#define _moIterContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Continue until a maximum fixed number of iterations is reached

6
mo/src/continuator/moMaxNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moMaxNeighborStat_h
#define moMaxNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the max fitness in the neighborhood

6
mo/src/continuator/moMedianNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moMedianNeighborStat_h
#define moMedianNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat,

6
mo/src/continuator/moMinNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moMinNeighborStat_h
#define moMinNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the min fitness in the neighborhood

2
mo/src/continuator/moMinusOneCounterStat.h
View file

@ -35,7 +35,7 @@
#ifndef moMinusOneCounterStat_h
#define moMinusOneCounterStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives the number of iteration minus 1

6
mo/src/continuator/moNbInfNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moNbInfNeighborStat_h
#define moNbInfNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the number of solutions in the neighborhood

6
mo/src/continuator/moNbSupNeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moNbSupNeighborStat_h
#define moNbSupNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat, to compute the number of solutions in the neighborhood

10
mo/src/continuator/moNeighborBestStat.h
View file

@ -35,12 +35,12 @@
#ifndef moNeighborBestStat_h
#define moNeighborBestStat_h
#include <continuator/moStat.h>
#include "moStat.h"
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <neighborhood/moNeighborhood.h>
#include "../explorer/moNeighborhoodExplorer.h"
#include "../comparator/moNeighborComparator.h"
#include "../comparator/moSolNeighborComparator.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Compute the fitness of the best solution among k neighbor or all neighbors

6
mo/src/continuator/moNeighborEvalContinuator.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moNeighborEvalContinuator_h
#define _moNeighborEvalContinuator_h
#include <continuator/moContinuator.h>
#include <neighborhood/moNeighborhood.h>
#include <eval/moEvalCounter.h>
#include "moContinuator.h"
#include "../neighborhood/moNeighborhood.h"
#include "../eval/moEvalCounter.h"
/**
* Continue until a maximum fixed number of neighbor evaluation is reached

6
mo/src/continuator/moNeighborFitnessStat.h
View file

@ -35,9 +35,9 @@
#ifndef moNeighborFitnessStat_h
#define moNeighborFitnessStat_h
#include <continuator/moStat.h>
#include <neighborhood/moNeighborhood.h>
#include <eval/moEval.h>
#include "moStat.h"
#include "../neighborhood/moNeighborhood.h"
#include "../eval/moEval.h"
/**
* Compute the fitness of one random neighbor

11
mo/src/continuator/moNeighborhoodStat.h
View file

@ -35,12 +35,13 @@
#ifndef moNeighborhoodStat_h
#define moNeighborhoodStat_h
#include <continuator/moStat.h>
#include "moStat.h"
#include "../explorer/moNeighborhoodExplorer.h"
#include "../comparator/moNeighborComparator.h"
#include "../comparator/moSolNeighborComparator.h"
#include "../neighborhood/moNeighborhood.h"
#include <explorer/moNeighborhoodExplorer.h>
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
#include <neighborhood/moNeighborhood.h>
#include <vector>
#include <algorithm> // std::sort

4
mo/src/continuator/moNeutralDegreeNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moNeutralDegreeNeighborStat_h
#define moNeutralDegreeNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the neutral degree of the solution

6
mo/src/continuator/moQ1NeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moQ1NeighborStat_h
#define moQ1NeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat,

6
mo/src/continuator/moQ3NeighborStat.h
View file

@ -35,9 +35,9 @@
#ifndef moQ3NeighborStat_h
#define moQ3NeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include <neighborhood/moNeighborhood.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
#include "../neighborhood/moNeighborhood.h"
/**
* From moNeighborhoodStat,

4
mo/src/continuator/moQuartilesNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moQuartilesNeighborStat_h
#define moQuartilesNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat,

4
mo/src/continuator/moSecondMomentNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moSecondMomentNeighborStat_h
#define moSecondMomentNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood

4
mo/src/continuator/moSizeNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moSizeNeighborStat_h
#define moSizeNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the number of solutions in the neighborhood

2
mo/src/continuator/moSolutionStat.h
View file

@ -35,7 +35,7 @@
#ifndef moSolutionStat_h
#define moSolutionStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which only give the current solution.

2
mo/src/continuator/moStat.h
View file

@ -35,7 +35,7 @@
#ifndef moStat_h
#define moStat_h
#include <continuator/moStatBase.h>
#include "moStatBase.h"
/**
* The actual class that will be used as base for all statistics

4
mo/src/continuator/moStatBase.h
View file

@ -35,8 +35,8 @@
#ifndef moStatBase_h
#define moStatBase_h
#include <eoFunctor.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/eoFunctor.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* Base class for all statistics that need to be calculated

2
mo/src/continuator/moStatFromStat.h
View file

@ -35,7 +35,7 @@
#ifndef moStatFromStat_h
#define moStatFromStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic which copy another statistic

4
mo/src/continuator/moStdFitnessNeighborStat.h
View file

@ -35,8 +35,8 @@
#ifndef moStdFitnessNeighborStat_h
#define moStdFitnessNeighborStat_h
#include <continuator/moStat.h>
#include <continuator/moNeighborhoodStat.h>
#include "moStat.h"
#include "moNeighborhoodStat.h"
/**
* From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood

2
mo/src/continuator/moTimeContinuator.h
View file

@ -32,7 +32,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <ctime>
#include <continuator/moContinuator.h>
#include "moContinuator.h"
/**
* Termination condition until a running time is reached.

2
mo/src/continuator/moTrueContinuator.h
View file

@ -35,7 +35,7 @@
#ifndef _moTrueContinuator_h
#define _moTrueContinuator_h
#include <continuator/moContinuator.h>
#include "moContinuator.h"
/**
* Continuator always return True

2
mo/src/continuator/moUnsignedStat.h
View file

@ -35,7 +35,7 @@
#ifndef moUnsignedStat_h
#define moUnsignedStat_h
#include <continuator/moStat.h>
#include "moStat.h"
/**
* The statistic gives from a boolean variable

4
mo/src/continuator/moUpdater.h
View file

@ -35,8 +35,8 @@
#ifndef moUpdater_h
#define moUpdater_h
#include <eoFunctor.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/eoFunctor.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* Base class for to update what ever you want

4
mo/src/continuator/moValueParamContinuator.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moValueParamContinuator_h
#define _moValueParamContinuator_h
#include <continuator/moContinuator.h>
#include "moContinuator.h"
//#include <neighborhood/moNeighborhood.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* Continue until a maximum fixed number of full evaluation is reached

4
mo/src/continuator/moValueStat.h
View file

@ -35,8 +35,8 @@
#ifndef moValueStat_h
#define moValueStat_h
#include <continuator/moStat.h>
#include <utils/eoParam.h>
#include "moStat.h"
#include <paradiseo/eo/utils/eoParam.h>
/**
* The statistic gives the number of iteration

4
mo/src/continuator/moVectorMonitor.h
View file

@ -36,8 +36,8 @@
#define moVectorMonitor_h
#include <fstream>
#include <utils/eoMonitor.h>
#include <utils/eoParam.h>
#include <paradiseo/eo/utils/eoMonitor.h>
#include <paradiseo/eo/utils/eoParam.h>
/**
* To save the values of the same type (double, unsigned int, or EOT) in a vector

2
mo/src/coolingSchedule/moCoolingSchedule.h
View file

@ -35,7 +35,7 @@
#ifndef _moCoolingSchedule_h
#define _moCoolingSchedule_h
#include <eoFunctor.h>
#include <paradiseo/eo/eoFunctor.h>
/**
* Cooling Schedule of the temperature in the simulated algorithm

2
mo/src/coolingSchedule/moDynSpanCoolingSchedule.h
View file

@ -35,7 +35,7 @@
#ifndef _moDynSpanCoolingSchedule_h
#define _moDynSpanCoolingSchedule_h
#include <coolingSchedule/moCoolingSchedule.h>
#include "moCoolingSchedule.h"
/**
* Cooling Schedule of the temperature in the simulated algorithm

2
mo/src/coolingSchedule/moSimpleCoolingSchedule.h
View file

@ -35,7 +35,7 @@
#ifndef _moSimpleCoolingSchedule_h
#define _moSimpleCoolingSchedule_h
#include <coolingSchedule/moCoolingSchedule.h>
#include "moCoolingSchedule.h"
/**
* Classical cooling Schedule of the temperature in the simulated algorithm with initial and final temperature and a factor of decrease

2
mo/src/neighborhood/moBackableNeighbor.h
View file

@ -35,7 +35,7 @@
#ifndef _BackableNeighbor_h
#define _BackableNeighbor_h
#include <neighborhood/moNeighbor.h>
#include "moNeighbor.h"
/**
* Neighbor with a move back function to use in a moFullEvalByModif

2
mo/src/neighborhood/moBackwardVectorVNSelection.h
View file

@ -30,7 +30,7 @@
#ifndef _moBackwardVectorVNSelection_h
#define _moBackwardVectorVNSelection_h
#include <neighborhood/moVectorVNSelection.h>
#include "moVectorVNSelection.h"
/**
* This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection

2
mo/src/neighborhood/moDummyNeighbor.h
View file

@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moDummyNeighbor_h
#define _moDummyNeighbor_h
#include <neighborhood/moNeighbor.h>
#include "moNeighbor.h"
/**
* Dummy Neighborhood

4
mo/src/neighborhood/moDummyNeighborhood.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moDummyNeighborhood_h
#define _moDummyNeighborhood_h
#include <neighborhood/moDummyNeighbor.h>
#include <neighborhood/moNeighborhood.h>
#include "moDummyNeighbor.h"
#include "moNeighborhood.h"
/**
* Dummy Neighborhood

4
mo/src/neighborhood/moEvaluatedNeighborhood.h
View file

@ -35,8 +35,8 @@
#ifndef _moEvaluatedNeighborhood_h
#define _moEvaluatedNeighborhood_h
#include <neighborhood/moNeighborhood.h>
#include <eval/moNeighborhoodEvaluation.h>
#include "moNeighborhood.h"
#include "../eval/moNeighborhoodEvaluation.h"
/**
* A Neighborhood for the evaluation of all neighbors

2
mo/src/neighborhood/moForwardVectorVNSelection.h
View file

@ -30,7 +30,7 @@
#ifndef _moForwardVectorVNSelection_h
#define _moForwardVectorVNSelection_h
#include <neighborhood/moVectorVNSelection.h>
#include "moVectorVNSelection.h"
/**
* This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection

2
mo/src/neighborhood/moIndexNeighbor.h
View file

@ -35,7 +35,7 @@
#ifndef _IndexNeighbor_h
#define _IndexNeighbor_h
#include <neighborhood/moNeighbor.h>
#include "moNeighbor.h"
/**
* Index Neighbor

2
mo/src/neighborhood/moIndexNeighborhood.h
View file

@ -35,7 +35,7 @@
#ifndef _moIndexNeighborhood_h
#define _moIndexNeighborhood_h
#include <neighborhood/moNeighborhood.h>
#include "moNeighborhood.h"
/**
* A Indexed Neighborhood

6
mo/src/neighborhood/moNeighbor.h
View file

@ -36,9 +36,9 @@
#define _moNeighbor_h
//EO inclusion
#include <EO.h>
#include <eoObject.h>
#include <eoPersistent.h>
#include <paradiseo/eo/EO.h>
#include <paradiseo/eo/eoObject.h>
#include <paradiseo/eo/eoPersistent.h>
/**
* Container of the neighbor informations

2
mo/src/neighborhood/moNeighborhood.h
View file

@ -35,7 +35,7 @@
#ifndef _moNeighborhood_h
#define _moNeighborhood_h
#include <eoObject.h>
#include <paradiseo/eo/eoObject.h>
/**
* A Neighborhood

2
mo/src/neighborhood/moOrderNeighborhood.h
View file

@ -35,7 +35,7 @@
#ifndef _moOrderNeighborhood_h
#define _moOrderNeighborhood_h
#include <neighborhood/moIndexNeighborhood.h>
#include "moIndexNeighborhood.h"
/**
* An ordered Neighborhood

2
mo/src/neighborhood/moRndNeighborhood.h
View file

@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moRndNeighborhood_h
#define _moRndNeighborhood_h
#include <neighborhood/moNeighborhood.h>
#include "moNeighborhood.h"
/**
* Class used to specify a neighborhood is random

6
mo/src/neighborhood/moRndVectorVNSelection.h
View file

@ -30,10 +30,10 @@
#ifndef _moRndVectorVNSelection_h
#define _moRndVectorVNSelection_h
#include <utils/eoRndGenerators.h>
#include <utils/rnd_generators.h>
#include "../utils/eoRndGenerators.h"
#include "../utils/rnd_generators.h"
#include <neighborhood/moVectorVNSelection.h>
#include "moVectorVNSelection.h"
/**
* This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection

6
mo/src/neighborhood/moRndWithReplNeighborhood.h
View file

@ -35,9 +35,9 @@
#ifndef _moRndWithReplNeighborhood_h
#define _moRndWithReplNeighborhood_h
#include <neighborhood/moIndexNeighborhood.h>
#include <neighborhood/moRndNeighborhood.h>
#include <utils/eoRNG.h>
#include "moIndexNeighborhood.h"
#include "moRndNeighborhood.h"
#include <paradiseo/eo/utils/eoRNG.h>
/**
* A Random With replacement Neighborhood

6
mo/src/neighborhood/moRndWithoutReplNeighborhood.h
View file

@ -35,9 +35,9 @@
#ifndef _moRndWithoutReplNeighborhood_h
#define _moRndWithoutReplNeighborhood_h
#include <neighborhood/moIndexNeighborhood.h>
#include <neighborhood/moRndNeighborhood.h>
#include <utils/eoRNG.h>
#include "moIndexNeighborhood.h"
#include "moRndNeighborhood.h"
#include <paradiseo/eo/utils/eoRNG.h>
/**
* A Random without replacement Neighborhood

2
mo/src/neighborhood/moVariableNeighborhoodSelection.h
View file

@ -30,7 +30,7 @@
#ifndef _moVariableNeighborhoodSelection_h
#define _moVariableNeighborhoodSelection_h
#include <eoOp.h>
#include <paradiseo/eo/eoOp.h>
#include <vector>
/**

4
mo/src/neighborhood/moVectorVNSelection.h
View file

@ -30,8 +30,8 @@
#ifndef _moVectorVNSelection_h
#define _moVectorVNSelection_h
#include <neighborhood/moVariableNeighborhoodSelection.h>
#include <eoOp.h>
#include "moVariableNeighborhoodSelection.h"
#include <paradiseo/eo/eoOp.h>
/**
* This class is used for the Variable Neighborhood Search explorer inherits from moVariableNeighborhoodSelection

4
mo/src/perturb/moLocalSearchInit.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moLocalSearchInit_h
#define _moLocalSearchInit_h
#include <eoInit.h>
#include <algo/moLocalSearch.h>
#include "../../eo/eoInit.h"
#include "../algo/moLocalSearch.h"
/**
* Initialization of the solution with a local search

8
mo/src/perturb/moMonOpPerturb.h
View file

@ -30,10 +30,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moMonOpPerturb_h
#define _moMonOpPerturb_h
#include <eoEvalFunc.h>
#include <eoOp.h>
#include <perturb/moPerturbation.h>
#include <memory/moDummyMemory.h>
#include "../../eo/eoEvalFunc.h"
#include "../../eo/eoOp.h"
#include "moPerturbation.h"
#include "../memory/moDummyMemory.h"
/**
* Perturbation operator using only a eoMonOp

6
mo/src/perturb/moNeighborhoodPerturb.h
View file

@ -30,9 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moNeighborhoodPerturb_h
#define _moNeighborhoodPerturb_h
#include <eval/moEval.h>
#include <perturb/moPerturbation.h>
#include <neighborhood/moNeighborhood.h>
#include "../eval/moEval.h"
#include "moPerturbation.h"
#include "../neighborhood/moNeighborhood.h"
/**
* Neighborhood Perturbation: explore the neighborhood to perturb the solution (the neighborhood could be different as the one used in the Local Search)

4
mo/src/perturb/moPerturbation.h
View file

@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moPertubation_h
#define _moPertubation_h
#include <eoOp.h>
#include <memory/moMemory.h>
#include <paradiseo/eo/eoOp.h>
#include "../memory/moMemory.h"
/**
* Abstract class for Perturbation operator

8
mo/src/perturb/moRestartPerturb.h
View file

@ -31,10 +31,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#define _moRestartPerturb_h
#include <eoEvalFunc.h>
#include <eoInit.h>
#include <perturb/moPerturbation.h>
#include <memory/moCountMoveMemory.h>
#include <paradiseo/eo/eoEvalFunc.h>
#include <paradiseo/eo/eoInit.h>
#include "moPerturbation.h"
#include "../memory/moCountMoveMemory.h"
/**
* Restart Perturbation : restart when maximum number of iteration with no improvement is reached

2
mo/src/perturb/moSolInit.h
View file

@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moSolInit_h
#define _moSolInit_h
#include <eoInit.h>
#include <paradiseo/eo/eoInit.h>
/**
* Initialization of the solution with the external solution