From 0720d5f05d0fe70149a2ded728be0f1991415e4d Mon Sep 17 00:00:00 2001 From: jhumeau Date: Wed, 28 Apr 2010 15:50:22 +0000 Subject: [PATCH] rename files git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1754 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/src/algo/moFirstImprHC.h | 4 +- trunk/paradiseo-mo/src/algo/moRandomBestHC.h | 4 +- .../moDynSpanCoolingSchedule.h | 14 +++- ...ImprExplorer.h => moFirstImprHCexplorer.h} | 12 ++-- .../src/explorer/moNeutralHCexplorer.h | 32 ++++----- ...tHCExplorer.h => moRandomBestHCexplorer.h} | 12 ++-- .../{moTSExplorer.h => moTSexplorer.h} | 12 ++-- trunk/paradiseo-mo/src/mo.h | 8 +-- trunk/paradiseo-mo/test/CMakeLists.txt | 9 +-- ...plorer.cpp => t-moFirstImprHCexplorer.cpp} | 8 +-- ...Explorer.cpp => t-moNeutralHCexplorer.cpp} | 10 +-- ...lorer.cpp => t-moRandomBestHCexplorer.cpp} | 8 +-- trunk/paradiseo-mo/test/t-moSimpleHC.cpp | 65 +++++++++++++++++++ ...{t-moTSExplorer.cpp => t-moTSexplorer.cpp} | 14 ++-- 14 files changed, 144 insertions(+), 68 deletions(-) rename trunk/paradiseo-mo/src/explorer/{moFirstImprExplorer.h => moFirstImprHCexplorer.h} (90%) rename trunk/paradiseo-mo/src/explorer/{moRandomBestHCExplorer.h => moRandomBestHCexplorer.h} (96%) rename trunk/paradiseo-mo/src/explorer/{moTSExplorer.h => moTSexplorer.h} (97%) rename trunk/paradiseo-mo/test/{t-moFirstImprExplorer.cpp => t-moFirstImprHCexplorer.cpp} (91%) rename trunk/paradiseo-mo/test/{t-moHCneutralExplorer.cpp => t-moNeutralHCexplorer.cpp} (90%) rename trunk/paradiseo-mo/test/{t-moSimpleHCneutralExplorer.cpp => t-moRandomBestHCexplorer.cpp} (92%) create mode 100644 trunk/paradiseo-mo/test/t-moSimpleHC.cpp rename trunk/paradiseo-mo/test/{t-moTSExplorer.cpp => t-moTSexplorer.cpp} (92%) diff --git a/trunk/paradiseo-mo/src/algo/moFirstImprHC.h b/trunk/paradiseo-mo/src/algo/moFirstImprHC.h index ffa7d4c26..3380f9e6f 100644 --- a/trunk/paradiseo-mo/src/algo/moFirstImprHC.h +++ b/trunk/paradiseo-mo/src/algo/moFirstImprHC.h @@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #define _moFirstImprHC_h #include -#include +#include #include #include #include @@ -88,7 +88,7 @@ private: // compare the fitness values of the solution and the neighbor: true if strictly greater moSolNeighborComparator defaultSolNeighborComp; // the explorer of the first improvement HC - moFirstImprExplorer explorer; + moFirstImprHCexplorer explorer; }; #endif diff --git a/trunk/paradiseo-mo/src/algo/moRandomBestHC.h b/trunk/paradiseo-mo/src/algo/moRandomBestHC.h index 4e388f38d..016ff5089 100644 --- a/trunk/paradiseo-mo/src/algo/moRandomBestHC.h +++ b/trunk/paradiseo-mo/src/algo/moRandomBestHC.h @@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #define _moRandomBestHC_h #include -#include +#include #include #include #include @@ -88,7 +88,7 @@ private: // compare the fitness values of the solution and the neighbor: true if strictly greater moSolNeighborComparator defaultSolNeighborComp; // the explorer of the HC with random choice of the best solution - moRandomBestHCExplorer explorer; + moRandomBestHCexplorer explorer; }; #endif diff --git a/trunk/paradiseo-mo/src/coolingSchedule/moDynSpanCoolingSchedule.h b/trunk/paradiseo-mo/src/coolingSchedule/moDynSpanCoolingSchedule.h index c8f99e753..c28905f33 100644 --- a/trunk/paradiseo-mo/src/coolingSchedule/moDynSpanCoolingSchedule.h +++ b/trunk/paradiseo-mo/src/coolingSchedule/moDynSpanCoolingSchedule.h @@ -53,7 +53,7 @@ public: * @param _spanNoMove maximum number of no improvement with equal temperature * @param _nbSpan maximum number of span with no improvmement before stopping the search */ - moDynSpanCoolingSchedule(double _initT, double _alpha, unsigned _spanMove, unsigned _spanNoMove, unsigned _nbSpan) : initT(_initT), alpha(_alpha), spanMove(_spanMove), spanNoMove(_spanNoMove), nbSpan(_nbSpan) { + moDynSpanCoolingSchedule(double _initT, double _alpha, unsigned int _spanMove, unsigned int _spanNoMove, unsigned int _nbSpan) : initT(_initT), alpha(_alpha), spanMove(_spanMove), spanNoMove(_spanNoMove), nbSpan(_nbSpan) { } /** @@ -101,12 +101,22 @@ public: private: // initial temperature double initT; + // coefficient of decrease double alpha; + + // + unsigned int spanMove; + + // + unsigned int spanNoMove; + // maximum number of iterations at the same temperature - unsigned int span; + unsigned int nbSpan; + // threshold temperature double finalT; + // number of steps with the same temperature unsigned int step; }; diff --git a/trunk/paradiseo-mo/src/explorer/moFirstImprExplorer.h b/trunk/paradiseo-mo/src/explorer/moFirstImprHCexplorer.h similarity index 90% rename from trunk/paradiseo-mo/src/explorer/moFirstImprExplorer.h rename to trunk/paradiseo-mo/src/explorer/moFirstImprHCexplorer.h index 804cc7fd4..6707b393e 100644 --- a/trunk/paradiseo-mo/src/explorer/moFirstImprExplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moFirstImprHCexplorer.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef _moFirstImprexplorer_h -#define _moFirstImprexplorer_h +#ifndef _moFirstImprHCexplorer_h +#define _moFirstImprHCexplorer_h #include #include @@ -44,7 +44,7 @@ * Explorer for a first imporvement heuristic */ template< class Neighbor> -class moFirstImprExplorer : public moNeighborhoodExplorer +class moFirstImprHCexplorer : public moNeighborhoodExplorer { public: typedef typename Neighbor::EOT EOT ; @@ -60,7 +60,7 @@ public: * @param _neighborComparator a neighbor comparator * @param _solNeighborComparator a solution vs neighbor comparator */ - moFirstImprExplorer(Neighborhood& _neighborhood, moEval& _eval, moNeighborComparator& _neighborComparator, moSolNeighborComparator& _solNeighborComparator) : moNeighborhoodExplorer(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) { + moFirstImprHCexplorer(Neighborhood& _neighborhood, moEval& _eval, moNeighborComparator& _neighborComparator, moSolNeighborComparator& _solNeighborComparator) : moNeighborhoodExplorer(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) { isAccept = false; current=new Neighbor(); } @@ -68,7 +68,7 @@ public: /** * Destructor */ - ~moFirstImprExplorer() { + ~moFirstImprHCexplorer() { delete current; } diff --git a/trunk/paradiseo-mo/src/explorer/moNeutralHCexplorer.h b/trunk/paradiseo-mo/src/explorer/moNeutralHCexplorer.h index f29654be9..ff710cff3 100644 --- a/trunk/paradiseo-mo/src/explorer/moNeutralHCexplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moNeutralHCexplorer.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau @@ -32,10 +32,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef _moHCneutralExplorer_h -#define _moHCneutralExplorer_h +#ifndef _moNeutralHCexplorer_h +#define _moNeutralHCexplorer_h -#include +#include #include #include #include @@ -44,18 +44,18 @@ * Explorer for a neutral Hill-climbing */ template< class Neighbor > -class moHCneutralExplorer : public moRandomBestHCExplorer +class moNeutralHCexplorer : public moRandomBestHCexplorer { public: typedef typename Neighbor::EOT EOT ; typedef moNeighborhood Neighborhood ; using moNeighborhoodExplorer::neighborhood; - using moRandomBestHCExplorer::solNeighborComparator; - using moRandomBestHCExplorer::isAccept; - using moRandomBestHCExplorer::bestVector; - using moRandomBestHCExplorer::initParam; - using moRandomBestHCExplorer::updateParam; + using moRandomBestHCexplorer::solNeighborComparator; + using moRandomBestHCexplorer::isAccept; + using moRandomBestHCexplorer::bestVector; + using moRandomBestHCexplorer::initParam; + using moRandomBestHCexplorer::updateParam; /** * Constructor @@ -65,30 +65,30 @@ public: * @param _solNeighborComparator a solution vs neighbor comparator * @param _nbStep maximum step to do */ - moHCneutralExplorer(Neighborhood& _neighborhood, + moNeutralHCexplorer(Neighborhood& _neighborhood, moEval& _eval, moNeighborComparator& _neighborComparator, moSolNeighborComparator& _solNeighborComparator, unsigned _nbStep) : - moRandomBestHCExplorer(_neighborhood, _eval, _neighborComparator, _solNeighborComparator), + moRandomBestHCexplorer(_neighborhood, _eval, _neighborComparator, _solNeighborComparator), nbStep(_nbStep) { //Some cycle is possible with equals fitness solutions if the neighborhood is not random if (!neighborhood.isRandom()) { - std::cout << "moHCneutralExplorer::Warning -> the neighborhood used is not random" << std::endl; + std::cout << "moNeutralHCexplorer::Warning -> the neighborhood used is not random" << std::endl; } } /** * Destructor */ - ~moHCneutralExplorer() { + ~moNeutralHCexplorer() { } /** * initial number of step */ virtual void initParam(EOT & solution) { - moRandomBestHCExplorer::initParam(solution); + moRandomBestHCexplorer::initParam(solution); step = 0; }; @@ -97,7 +97,7 @@ public: * one more step */ virtual void updateParam(EOT & solution) { - moRandomBestHCExplorer::updateParam(solution); + moRandomBestHCexplorer::updateParam(solution); step++; }; diff --git a/trunk/paradiseo-mo/src/explorer/moRandomBestHCExplorer.h b/trunk/paradiseo-mo/src/explorer/moRandomBestHCexplorer.h similarity index 96% rename from trunk/paradiseo-mo/src/explorer/moRandomBestHCExplorer.h rename to trunk/paradiseo-mo/src/explorer/moRandomBestHCexplorer.h index ac929669b..476bf6a07 100644 --- a/trunk/paradiseo-mo/src/explorer/moRandomBestHCExplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moRandomBestHCexplorer.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef _moRandomBestHCExplorer_h -#define _moRandomBestHCExplorer_h +#ifndef _moRandomBestHCexplorer_h +#define _moRandomBestHCexplorer_h #include #include @@ -47,7 +47,7 @@ * which choose randomly one of the best solution in the neighborhood at each iteration */ template< class Neighbor > -class moRandomBestHCExplorer : public moNeighborhoodExplorer +class moRandomBestHCexplorer : public moNeighborhoodExplorer { public: typedef typename Neighbor::EOT EOT ; @@ -63,7 +63,7 @@ public: * @param _neighborComparator a neighbor comparator * @param _solNeighborComparator solution vs neighbor comparator */ - moRandomBestHCExplorer(Neighborhood& _neighborhood, + moRandomBestHCexplorer(Neighborhood& _neighborhood, moEval& _eval, moNeighborComparator& _neighborComparator, moSolNeighborComparator& _solNeighborComparator) : @@ -77,7 +77,7 @@ public: /** * Destructor */ - ~moRandomBestHCExplorer() { + ~moRandomBestHCexplorer() { delete current; } diff --git a/trunk/paradiseo-mo/src/explorer/moTSExplorer.h b/trunk/paradiseo-mo/src/explorer/moTSexplorer.h similarity index 97% rename from trunk/paradiseo-mo/src/explorer/moTSExplorer.h rename to trunk/paradiseo-mo/src/explorer/moTSexplorer.h index 5251b35fe..be7965ee2 100644 --- a/trunk/paradiseo-mo/src/explorer/moTSExplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moTSexplorer.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef _moTSExplorer_h -#define _moTSExplorer_h +#ifndef _moTSexplorer_h +#define _moTSexplorer_h #include #include @@ -48,7 +48,7 @@ * Explorer for a Tabu Search */ template< class Neighbor > -class moTSExplorer : public moNeighborhoodExplorer +class moTSexplorer : public moNeighborhoodExplorer { public: typedef typename Neighbor::EOT EOT ; @@ -65,7 +65,7 @@ public: * @param _diversification the diversification box * @param _aspiration the aspiration criteria */ - moTSExplorer(Neighborhood& _neighborhood, + moTSexplorer(Neighborhood& _neighborhood, moEval& _eval, moNeighborComparator& _neighborComparator, moSolNeighborComparator& _solNeighborComparator, @@ -85,7 +85,7 @@ public: /** * Destructor */ - ~moTSExplorer() { + ~moTSexplorer() { delete current; delete best; } diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index c3521d554..1530bd0aa 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -70,15 +70,15 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/trunk/paradiseo-mo/test/CMakeLists.txt b/trunk/paradiseo-mo/test/CMakeLists.txt index 44170d467..beee3d274 100644 --- a/trunk/paradiseo-mo/test/CMakeLists.txt +++ b/trunk/paradiseo-mo/test/CMakeLists.txt @@ -51,13 +51,13 @@ SET (TEST_LIST t-moSolVectorTabuList t-moBestImprAspiration t-moSimpleHCexplorer - t-moSimpleHCneutralExplorer - t-moHCneutralExplorer - t-moFirstImprExplorer + t-moRandomBestHCexplorer + t-moNeutralHCexplorer + t-moFirstImprHCexplorer t-moRandomWalkExplorer t-moMetropolisHastingExplorer t-moRandomNeutralWalkExplorer - t-moTSExplorer + t-moTSexplorer t-moForwardVariableNeighborhood t-moSolComparator t-moDummyEval @@ -74,6 +74,7 @@ SET (TEST_LIST t-moSA t-moLocalSearch t-moILSexplorer + t-moSimpleHC ) FOREACH (test ${TEST_LIST}) diff --git a/trunk/paradiseo-mo/test/t-moFirstImprExplorer.cpp b/trunk/paradiseo-mo/test/t-moFirstImprHCexplorer.cpp similarity index 91% rename from trunk/paradiseo-mo/test/t-moFirstImprExplorer.cpp rename to trunk/paradiseo-mo/test/t-moFirstImprHCexplorer.cpp index c5fc9cd3c..d8b28c3f0 100644 --- a/trunk/paradiseo-mo/test/t-moFirstImprExplorer.cpp +++ b/trunk/paradiseo-mo/test/t-moFirstImprHCexplorer.cpp @@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include +#include #include "moTestClass.h" #include @@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr int main() { - std::cout << "[t-moFirstImprExplorer] => START" << std::endl; + std::cout << "[t-moFirstImprHCexplorer] => START" << std::endl; //Instanciation eoBit sol(4, true); @@ -48,7 +48,7 @@ int main() { moNeighborComparator ncomp; moSolNeighborComparator sncomp; - moFirstImprExplorer test(nh, eval, ncomp, sncomp); + moFirstImprHCexplorer test(nh, eval, ncomp, sncomp); //on verifie qu'on améliore peut continuer à explorer tant qu'on améliore la solution @@ -86,7 +86,7 @@ int main() { assert(sol.fitness()==0); assert(!test.isContinue(sol)); - std::cout << "[t-moFirstImprExplorer] => OK" << std::endl; + std::cout << "[t-moFirstImprHCexplorer] => OK" << std::endl; return EXIT_SUCCESS; } diff --git a/trunk/paradiseo-mo/test/t-moHCneutralExplorer.cpp b/trunk/paradiseo-mo/test/t-moNeutralHCexplorer.cpp similarity index 90% rename from trunk/paradiseo-mo/test/t-moHCneutralExplorer.cpp rename to trunk/paradiseo-mo/test/t-moNeutralHCexplorer.cpp index 4022a4cbf..f0a69e4f0 100644 --- a/trunk/paradiseo-mo/test/t-moHCneutralExplorer.cpp +++ b/trunk/paradiseo-mo/test/t-moNeutralHCexplorer.cpp @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau @@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include +#include #include "moTestClass.h" #include @@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr int main() { - std::cout << "[t-moHCneutralExplorer] => START" << std::endl; + std::cout << "[t-moNeutralHCexplorer] => START" << std::endl; //Instanciation eoBit sol(4, true); @@ -48,7 +48,7 @@ int main() { moNeighborComparator ncomp; moSolNeighborComparator sncomp; - moHCneutralExplorer test(nh, eval, ncomp, sncomp,3); + moNeutralHCexplorer test(nh, eval, ncomp, sncomp,3); //on verifie qu'on ameliore bien la solution et que l'exploration dure 3 itérations @@ -85,7 +85,7 @@ int main() { - std::cout << "[t-moHCneutralExplorer] => OK" << std::endl; + std::cout << "[t-moNeutralHCexplorer] => OK" << std::endl; return EXIT_SUCCESS; } diff --git a/trunk/paradiseo-mo/test/t-moSimpleHCneutralExplorer.cpp b/trunk/paradiseo-mo/test/t-moRandomBestHCexplorer.cpp similarity index 92% rename from trunk/paradiseo-mo/test/t-moSimpleHCneutralExplorer.cpp rename to trunk/paradiseo-mo/test/t-moRandomBestHCexplorer.cpp index 74f8c8bcf..f050fc49e 100644 --- a/trunk/paradiseo-mo/test/t-moSimpleHCneutralExplorer.cpp +++ b/trunk/paradiseo-mo/test/t-moRandomBestHCexplorer.cpp @@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include +#include #include "moTestClass.h" #include @@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr int main() { - std::cout << "[t-moRandomBestHCExplorer] => START" << std::endl; + std::cout << "[t-moRandomBestHCexplorer] => START" << std::endl; //instanciation eoBit sol(4, true); @@ -48,7 +48,7 @@ int main() { moNeighborComparator ncomp; moSolNeighborComparator sncomp; - moRandomBestHCExplorer test(nh, eval, ncomp, sncomp); + moRandomBestHCexplorer test(nh, eval, ncomp, sncomp); //test qu'on ameliore bien a chaque itération test.initParam(sol); @@ -94,7 +94,7 @@ int main() { test.updateParam(sol); - std::cout << "[t-moRandomBestHCExplorer] => OK" << std::endl; + std::cout << "[t-moRandomBestHCexplorer] => OK" << std::endl; return EXIT_SUCCESS; } diff --git a/trunk/paradiseo-mo/test/t-moSimpleHC.cpp b/trunk/paradiseo-mo/test/t-moSimpleHC.cpp new file mode 100644 index 000000000..fc67ba398 --- /dev/null +++ b/trunk/paradiseo-mo/test/t-moSimpleHC.cpp @@ -0,0 +1,65 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + +Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can ue, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. + +ParadisEO WebSite : http://paradiseo.gforge.inria.fr +Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#include +#include +#include + +#include +#include "moTestClass.h" +#include +#include +#include + + +int main(){ + + std::cout << "[t-moSimpleHC] => START" << std::endl; + + bitNeighborhood nh(4); + oneMaxFullEval fullEval; + evalOneMax eval(4); + + //test first constructor + moSimpleHC test1(nh, fullEval, eval); + + //test second constructor + moTrueContinuator cont; + moSimpleHC test2(nh, fullEval, eval, cont); + + //test third constructor + moSolNeighborComparator sncomp; + moNeighborComparator ncomp; + moSimpleHC test3(nh, fullEval, eval, cont, ncomp, sncomp); + + std::cout << "[t-moSimpleHC] => OK" << std::endl; + + return EXIT_SUCCESS; +} + diff --git a/trunk/paradiseo-mo/test/t-moTSExplorer.cpp b/trunk/paradiseo-mo/test/t-moTSexplorer.cpp similarity index 92% rename from trunk/paradiseo-mo/test/t-moTSExplorer.cpp rename to trunk/paradiseo-mo/test/t-moTSexplorer.cpp index df03e9634..dcce178ec 100644 --- a/trunk/paradiseo-mo/test/t-moTSExplorer.cpp +++ b/trunk/paradiseo-mo/test/t-moTSexplorer.cpp @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau @@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include #include -#include +#include #include "moTestClass.h" #include @@ -40,7 +40,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr int main() { - std::cout << "[t-moTSExplorer] => START" << std::endl; + std::cout << "[t-moTSexplorer] => START" << std::endl; //instansiation eoBit sol(4, true); @@ -55,8 +55,8 @@ int main() { moSolVectorTabuList tabuList(4,0); moBestImprAspiration aspir; - moTSExplorer test(nh, eval, ncomp, sncomp, tabuList, intens, diver, aspir); - moTSExplorer test2(emptyNH, eval, ncomp, sncomp, tabuList, intens, diver, aspir); + moTSexplorer test(nh, eval, ncomp, sncomp, tabuList, intens, diver, aspir); + moTSexplorer test2(emptyNH, eval, ncomp, sncomp, tabuList, intens, diver, aspir); //test d'un voisinage vide test2.initParam(sol); @@ -130,7 +130,7 @@ int main() { bitNeighborhood nh2(2); evalOneMax eval2(2); - moTSExplorer test3(nh2, eval2, ncomp, sncomp, tabuList, intens, diver, aspir); + moTSexplorer test3(nh2, eval2, ncomp, sncomp, tabuList, intens, diver, aspir); test3.initParam(sol2); test3(sol2); @@ -158,7 +158,7 @@ int main() { assert(!test3.accept(sol2)); - std::cout << "[t-moTSExplorer] => OK" << std::endl; + std::cout << "[t-moTSexplorer] => OK" << std::endl; return EXIT_SUCCESS; }