updated meta-header files

This commit is contained in:
LPTK 2013-07-17 16:24:36 +02:00
commit 922be5f0bc
3 changed files with 10 additions and 5 deletions

View file

@ -35,6 +35,7 @@
// general purpose // general purpose
#include <utils/eoData.h> #include <utils/eoData.h>
#include <eoObject.h> #include <eoObject.h>
#include <eoOptional.h>
#include <eoPrintable.h> #include <eoPrintable.h>
#include <eoPersistent.h> #include <eoPersistent.h>
#include <eoScalarFitness.h> #include <eoScalarFitness.h>

View file

@ -43,7 +43,7 @@
#include <algo/moFirstImprHC.h> #include <algo/moFirstImprHC.h>
#include <algo/moILS.h> #include <algo/moILS.h>
#include <algo/moLocalSearch.h> #include <algo/moLocalSearch.h>
#include <algo/moMetropolisHasting.h> #include <algo/moMetropolisHastings.h>
#include <algo/moNeutralHC.h> #include <algo/moNeutralHC.h>
#include <algo/moRandomBestHC.h> #include <algo/moRandomBestHC.h>
#include <algo/moRandomNeutralWalk.h> #include <algo/moRandomNeutralWalk.h>
@ -100,11 +100,14 @@
#include <continuator/moTimeContinuator.h> #include <continuator/moTimeContinuator.h>
#include <continuator/moTrueContinuator.h> #include <continuator/moTrueContinuator.h>
#include <continuator/moVectorMonitor.h> #include <continuator/moVectorMonitor.h>
#include <continuator/moFitnessVarianceStat.h>
#include <coolingSchedule/moCoolingSchedule.h> #include <coolingSchedule/moCoolingSchedule.h>
#include <coolingSchedule/moDynSpanCoolingSchedule.h> #include <coolingSchedule/moDynSpanCoolingSchedule.h>
#include <coolingSchedule/moSimpleCoolingSchedule.h> #include <coolingSchedule/moSimpleCoolingSchedule.h>
#include <coolingSchedule/moDynSpanCoolingSchedule.h> #include <coolingSchedule/moDynSpanCoolingSchedule.h>
#include <coolingSchedule/moTrikiCoolingSchedule.h>
#include <coolingSchedule/moHuangCoolingSchedule.h>
#include <eval/moDummyEval.h> #include <eval/moDummyEval.h>
#include <eval/moEval.h> #include <eval/moEval.h>
@ -116,14 +119,14 @@
#include <explorer/moDummyExplorer.h> #include <explorer/moDummyExplorer.h>
#include <explorer/moFirstImprHCexplorer.h> #include <explorer/moFirstImprHCexplorer.h>
#include <explorer/moILSexplorer.h> #include <explorer/moILSexplorer.h>
#include <explorer/moMetropolisHastingExplorer.h> #include <explorer/moMetropolisHastingsExplorer.h>
#include <explorer/moNeighborhoodExplorer.h> #include <explorer/moNeighborhoodExplorer.h>
#include <explorer/moNeutralHCexplorer.h> #include <explorer/moNeutralHCexplorer.h>
#include <explorer/moRandomBestHCexplorer.h> #include <explorer/moRandomBestHCexplorer.h>
#include <explorer/moRandomNeutralWalkExplorer.h> #include <explorer/moRandomNeutralWalkExplorer.h>
#include <explorer/moRandomSearchExplorer.h> #include <explorer/moRandomSearchExplorer.h>
#include <explorer/moRandomWalkExplorer.h> #include <explorer/moRandomWalkExplorer.h>
#include <explorer/moSAexplorer.h> #include <explorer/moSAExplorer.h>
#include <explorer/moSimpleHCexplorer.h> #include <explorer/moSimpleHCexplorer.h>
#include <explorer/moTSexplorer.h> #include <explorer/moTSexplorer.h>
#include <explorer/moVNSexplorer.h> #include <explorer/moVNSexplorer.h>
@ -162,6 +165,8 @@
#include <neighborhood/moVariableNeighborhoodSelection.h> #include <neighborhood/moVariableNeighborhoodSelection.h>
#include <neighborhood/moVectorVNSelection.h> #include <neighborhood/moVectorVNSelection.h>
#include <neighborhood/moEvaluatedNeighborhood.h> #include <neighborhood/moEvaluatedNeighborhood.h>
#include <neighborhood/moRealNeighbor.h>
#include <neighborhood/moRealNeighborhood.h>
#include <perturb/moLocalSearchInit.h> #include <perturb/moLocalSearchInit.h>
#include <perturb/moMonOpPerturb.h> #include <perturb/moMonOpPerturb.h>
@ -207,5 +212,6 @@
#include <sampling/moRndRndFitnessCloudSampling.h> #include <sampling/moRndRndFitnessCloudSampling.h>
#include <sampling/moSampling.h> #include <sampling/moSampling.h>
#include <sampling/moStatistics.h> #include <sampling/moStatistics.h>
#include <sampling/moStdDevEstimator.h>
#endif #endif

View file

@ -3,8 +3,6 @@
#define __moRealNeighborhood_h__ #define __moRealNeighborhood_h__
#include <mo> #include <mo>
#include <eoFunctor.h> // FIXME: Why don't we use eoFunctorBase on the mother classes
#include "neighborhood/moRealNeighbor.h"
template<class Distrib, class Neighbor> template<class Distrib, class Neighbor>
class moRealNeighborhood : public moRndNeighborhood< Neighbor >, public eoFunctorBase class moRealNeighborhood : public moRndNeighborhood< Neighbor >, public eoFunctorBase