diff --git a/mo/src/mo.h b/mo/src/mo.h index 8a6343aeb..a781b6b9c 100755 --- a/mo/src/mo.h +++ b/mo/src/mo.h @@ -35,162 +35,162 @@ #ifndef _newmo_h #define _newmo_h -#include -#include -#include +#include "acceptCrit/moAcceptanceCriterion.h" +#include "acceptCrit/moAlwaysAcceptCrit.h" +#include "acceptCrit/moBetterAcceptCrit.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "algo/moDummyLS.h" +#include "algo/moFirstImprHC.h" +#include "algo/moILS.h" +#include "algo/moLocalSearch.h" +#include "algo/moMetropolisHasting.h" +#include "algo/moNeutralHC.h" +#include "algo/moRandomBestHC.h" +#include "algo/moRandomNeutralWalk.h" +#include "algo/moRandomSearch.h" +#include "algo/moRandomWalk.h" +#include "algo/moSA.h" +#include "algo/moSimpleHC.h" +#include "algo/moTS.h" +#include "algo/moVNS.h" +#include "algo/eoDummyMonOp.h" -#include -#include -#include -#include -#include -#include -#include +#include "comparator/moComparator.h" +#include "comparator/moNeighborComparator.h" +#include "comparator/moEqualNeighborComparator.h" +#include "comparator/moEqualSolNeighborComparator.h" +#include "comparator/moSolComparator.h" +#include "comparator/moEqualSolComparator.h" +#include "comparator/moSolNeighborComparator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "continuator/moAverageFitnessNeighborStat.h" +#include "continuator/moBestSoFarStat.h" +#include "continuator/moBestFitnessStat.h" +#include "continuator/moUnsignedStat.h" +#include "continuator/moValueStat.h" +#include "continuator/moBooleanStat.h" +#include "continuator/moCheckpoint.h" +#include "continuator/moCombinedContinuator.h" +#include "continuator/moContinuator.h" +#include "continuator/moCounterMonitorSaver.h" +#include "continuator/moCounterStat.h" +#include "continuator/moDistanceStat.h" +#include "continuator/moFitContinuator.h" +#include "continuator/moFitnessStat.h" +#include "continuator/moFullEvalContinuator.h" +#include "continuator/moEvalsContinuator.h" +#include "continuator/moIterContinuator.h" +#include "continuator/moMaxNeighborStat.h" +#include "continuator/moMinNeighborStat.h" +#include "continuator/moMinusOneCounterStat.h" +#include "continuator/moNbInfNeighborStat.h" +#include "continuator/moNbSupNeighborStat.h" +#include "continuator/moNeighborBestStat.h" +#include "continuator/moNeighborEvalContinuator.h" +#include "continuator/moNeighborFitnessStat.h" +#include "continuator/moNeighborhoodStat.h" +#include "continuator/moNeutralDegreeNeighborStat.h" +#include "continuator/moSecondMomentNeighborStat.h" +#include "continuator/moSizeNeighborStat.h" +#include "continuator/moSolutionStat.h" +#include "continuator/moStat.h" +#include "continuator/moStatBase.h" +#include "continuator/moStatFromStat.h" +#include "continuator/moStdFitnessNeighborStat.h" +#include "continuator/moTimeContinuator.h" +#include "continuator/moTrueContinuator.h" +#include "continuator/moVectorMonitor.h" -#include -#include -#include -#include +#include "coolingSchedule/moCoolingSchedule.h" +#include "coolingSchedule/moDynSpanCoolingSchedule.h" +#include "coolingSchedule/moSimpleCoolingSchedule.h" +#include "coolingSchedule/moDynSpanCoolingSchedule.h" -#include -#include -#include -#include -#include -#include +#include "eval/moDummyEval.h" +#include "eval/moEval.h" +#include "eval/moEvalCounter.h" +#include "eval/moFullEvalByCopy.h" +#include "eval/moFullEvalByModif.h" +#include "eval/moDoubleIncrNeighborhoodEval.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "explorer/moDummyExplorer.h" +#include "explorer/moFirstImprHCexplorer.h" +#include "explorer/moILSexplorer.h" +#include "explorer/moMetropolisHastingExplorer.h" +#include "explorer/moNeighborhoodExplorer.h" +#include "explorer/moNeutralHCexplorer.h" +#include "explorer/moRandomBestHCexplorer.h" +#include "explorer/moRandomNeutralWalkExplorer.h" +#include "explorer/moRandomSearchExplorer.h" +#include "explorer/moRandomWalkExplorer.h" +#include "explorer/moSAexplorer.h" +#include "explorer/moSimpleHCexplorer.h" +#include "explorer/moTSexplorer.h" +#include "explorer/moVNSexplorer.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "memory/moAspiration.h" +#include "memory/moBestImprAspiration.h" +#include "memory/moCountMoveMemory.h" +#include "memory/moDiversification.h" +#include "memory/moDummyDiversification.h" +#include "memory/moDummyIntensification.h" +#include "memory/moDummyMemory.h" +#include "memory/moIndexedVectorTabuList.h" +#include "memory/moIntensification.h" +#include "memory/moMemory.h" +#include "memory/moMonOpDiversification.h" +#include "memory/moNeighborVectorTabuList.h" +#include "memory/moRndIndexedVectorTabuList.h" +#include "memory/moSolVectorTabuList.h" +#include "memory/moRndIndexedVectorTabuList.h" +#include "memory/moTabuList.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "neighborhood/moBackableNeighbor.h" +#include "neighborhood/moBackwardVectorVNSelection.h" +#include "neighborhood/moDummyNeighbor.h" +#include "neighborhood/moDummyNeighborhood.h" +#include "neighborhood/moForwardVectorVNSelection.h" +#include "neighborhood/moIndexNeighbor.h" +#include "neighborhood/moIndexNeighborhood.h" +#include "neighborhood/moNeighbor.h" +#include "neighborhood/moNeighborhood.h" +#include "neighborhood/moOrderNeighborhood.h" +#include "neighborhood/moRndNeighborhood.h" +#include "neighborhood/moRndVectorVNSelection.h" +#include "neighborhood/moRndWithoutReplNeighborhood.h" +#include "neighborhood/moRndWithReplNeighborhood.h" +#include "neighborhood/moVariableNeighborhoodSelection.h" +#include "neighborhood/moVectorVNSelection.h" +#include "neighborhood/moEvaluatedNeighborhood.h" -#include -#include -#include -#include -#include -#include +#include "perturb/moLocalSearchInit.h" +#include "perturb/moMonOpPerturb.h" +#include "perturb/moNeighborhoodPerturb.h" +#include "perturb/moPerturbation.h" +#include "perturb/moRestartPerturb.h" +#include "perturb/moSolInit.h" -#include -#include -#include -#include -#include +#include "problems/bitString/moBitNeighbor.h" +#include "problems/bitString/moBitsNeighbor.h" +#include "problems/bitString/moBitsNeighborhood.h" +#include "problems/bitString/moBitsWithoutReplNeighborhood.h" +#include "problems/bitString/moBitsWithReplNeighborhood.h" -#include -#include -#include -#include -#include -#include +#include "problems/permutation/moIndexedSwapNeighbor.h" +#include "problems/permutation/moShiftNeighbor.h" +#include "problems/permutation/moSwapNeighbor.h" +#include "problems/permutation/moSwapNeighborhood.h" +#include "problems/permutation/moTwoOptExNeighbor.h" +#include "problems/permutation/moTwoOptExNeighborhood.h" -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include +//#include "problems/eval/moMaxSATincrEval.h" +//#include "problems/eval/moOneMaxIncrEval.h" +//#include "problems/eval/moQAPIncrEval.h" +//#include "problems/eval/moRoyalRoadIncrEval.h" +//#include "problems/eval/moUBQPSimpleIncrEval.h" +//#include "problems/eval/moUBQPdoubleIncrEvaluation.h" +//#include "problems/eval/moUBQPBitsIncrEval.h" +//#include "problems/eval/moNKlandscapesIncrEval.h" #include