diff --git a/branches/cmakemodif/paradiseo-mo/src/mo.h b/branches/cmakemodif/paradiseo-mo/src/mo.h index 69dfaf350..448080cd5 100755 --- a/branches/cmakemodif/paradiseo-mo/src/mo.h +++ b/branches/cmakemodif/paradiseo-mo/src/mo.h @@ -72,5 +72,8 @@ #include #include #include +#include +#include +#include #endif diff --git a/branches/cmakemodif/paradiseo-mo/src/moExpl.h b/branches/cmakemodif/paradiseo-mo/src/moExpl.h new file mode 100644 index 000000000..b86a8d177 --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/src/moExpl.h @@ -0,0 +1,106 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 + (C) OPAC Team, LIFL, 2002-2008 + + Salma Mesmoudi (salma.mesmoudi@inria.fr), Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) + + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can use, + 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". + + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. + + 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 + */ +#ifndef _moExpl_h +#define _moExpl_h + +#include + +//! Description of an explorer +/*! + Only a description...See moMoveLoopExpl. +*/ +template < class EOT > +class moExpl : public eoBF < const EOT &, EOT &, bool > +{ +public: + unsigned int i; + + //Neighborhoods vector + std::vector< eoMonOp* > explore; + + //! Generic constructor + /*! + Generic constructor using a eoMonOp + + \param _expl Algorithme or mutation. + + */ + moExpl(eoMonOp & expl){ + i=0; + explore.resize(0); + add(expl); + } + + //! Generic constructor + /*! + Generic constructor using a eoMonOp + + \param _expl Algorithme or mutation. + + */ + + //! Procedure which launches the moExpl. + /*! + The exploration starts from an old solution and provides a new solution. + + \param _old_solution The current solution. + \param _new_solution The new solution (result of the procedure). + */ + + bool operator ()(const EOT & _old, EOT & _new){ + _new=(EOT)_old; + return (*explore[i])(_new); + } + //add an algorithm or mutation to neighborhoods vector + void add(eoMonOp & expl){ + explore.push_back(&expl); + } + //setIndice make sur that the initial indice (_i) is not bigger than the explorer size. + void setIndice(unsigned int _i){ + if( _i >= explore.size() ){ + std::cout << "[" << _i << "]" << std::endl; + throw std::runtime_error("[moExpl.h]: bad index "+_i); + } + i=_i; + } + + //return the size of the class + unsigned int size(){ + return explore.size(); + } + +}; + +#endif diff --git a/branches/cmakemodif/paradiseo-mo/src/moTA.h b/branches/cmakemodif/paradiseo-mo/src/moTA.h new file mode 100644 index 000000000..ee6f17d9b --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/src/moTA.h @@ -0,0 +1,162 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2008-2009 + (C) OPAC Team, LIFL, 2002-2008 + + Salma Mesmoudi + + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can use, + 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". + + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. + + 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 +*/ + +#ifndef _moTA_h +#define _moTA_h + +#include + +#include +#include +#include +#include +#include +#include + +//! Threeshol Accepting (TA) +/*! + Class that describes a Threeshol Accepting algorithm. +*/ +template < class M > +class moTA:public moAlgo < typename M::EOType > +{ + //! Alias for the type + typedef typename M::EOType EOT; + + //! Alias for the fitness + typedef typename EOT::Fitness Fitness; + + + public: + + //! TA constructor + /*! + All the boxes used by a SA need to be given. + + \param _random_move_generator The move generator (generally randomly). + \param _incremental_evaluation The (generally) efficient evaluation function + \param _continue The stopping criterion. + \param _initial_threeshold The initial threeshold. + \param _cooling_schedule The cooling schedule, describes how the temperature is modified. + \param _full_evaluation The full evaluation function. + */ + moTA (moRandMove < M > & _random_move_generator, moMoveIncrEval < M > & _incremental_evaluation, + moSolContinue < EOT > & _continue, double _initial_threeshold, moCoolingSchedule & _cooling_schedule, + eoEvalFunc < EOT > & _full_evaluation): + random_move_generator(_random_move_generator), incremental_evaluation(_incremental_evaluation), + continu(_continue), initial_threeshold(_initial_threeshold), + cooling_schedule(_cooling_schedule), full_evaluation(_full_evaluation) + {} + + //! function that launches the TA algorithm. + /*! + As a moSA the TA can be used for HYBRIDATION in an evolutionary algorithm. + + \param _solution A solution to improve. + \return TRUE. + */ + bool operator ()(EOT & _solution) + { + Fitness incremental_fitness, delta_fit; + EOT best_solution; + double threeshold; + M move; + + if (_solution.invalid()) + { + full_evaluation (_solution); + } + + threeshold = initial_threeshold; + + best_solution = _solution; + + do + { + continu.init (); + + do + { + random_move_generator(move); + + incremental_fitness = incremental_evaluation (move, _solution); + + delta_fit = incremental_fitness - _solution.fitness (); + + if ( threeshold > delta_fit) + + { + move(_solution); + _solution.fitness(incremental_fitness); + + // Updating the best solution found until now ? + if ( _solution.fitness() > best_solution.fitness() ) + { + best_solution = _solution; + } + } + + } + while ( continu (_solution)); + } + while ( cooling_schedule (threeshold) ); + + _solution = best_solution; + + return true; + } + + private: + + //! A move generator (generally randomly) + moRandMove < M > & random_move_generator; + + //! A (generally) efficient evaluation function. + moMoveIncrEval < M > & incremental_evaluation; + + //! Stopping criterion before threeshold update + moSolContinue < EOT > & continu; + + //! Initial temperature + double initial_threeshold; + + //! The cooling schedule + moCoolingSchedule & cooling_schedule; + + //! A full evaluation function. + eoEvalFunc < EOT > & full_evaluation; +}; + +#endif diff --git a/branches/cmakemodif/paradiseo-mo/src/moVNS.h b/branches/cmakemodif/paradiseo-mo/src/moVNS.h new file mode 100644 index 000000000..98695f27b --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/src/moVNS.h @@ -0,0 +1,117 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 + (C) OPAC Team, LIFL, 2002-2008 + + Salma Mesmoudi (salma.mesmoudi@inria.fr), Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) + + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can use, + 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". + + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. + + 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 + */ + +#ifndef _moVNS_h +#define _moVNS_h + +#include +#include +#include + +//! Variable Neighbors Search (VNS) +/*! + Class which describes the algorithm for a Variable Neighbors Search. +*/ + +template < class EOT> +class moVNS : public moAlgo < EOT> +{ + //! Alias for the fitness. + typedef typename EOT::Fitness Fitness; + +public: + + //! Generic constructor + /*! + Generic constructor using a moExpl + + \param _explorer Vector of Neighborhoods. + \param _full_evaluation The evaluation function. + */ + + moVNS(moExpl< EOT> & _explorer, eoEvalFunc < EOT> & _full_evaluation): explorer(_explorer), full_evaluation(_full_evaluation) {} + + + //! Function which launches the VNS + /*! + The VNS has to improve a current solution. + + \param _solution a current solution to improve. + \return true. + */ + + bool operator()(EOT & _solution) { + bool change=false; + int i = 0; + + EOT solution_initial=_solution; + EOT solution_prime, solution_second; + + + explorer.setIndice(i); + + while(i solution_initial) { + solution_initial=solution_second; + change=true; + if(i!= 0) { + explorer.setIndice(0); + i=0; + } + } + else { + i++; + if(i & explorer; + //The full evaluation function + eoEvalFunc & full_evaluation; +}; + +#endif diff --git a/branches/cmakemodif/paradiseo-mo/test/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/test/CMakeLists.txt index fc643e462..94ee35d63 100644 --- a/branches/cmakemodif/paradiseo-mo/test/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/test/CMakeLists.txt @@ -56,7 +56,10 @@ SET (TEST_LIST t-moBestImprSelect t-moSteadyFitSolContinue t-moTS t-moTS_2 - t-moTSMoveLoopExpl) + t-moTSMoveLoopExpl + t-moTA + t-moVNS + ) FOREACH (test ${TEST_LIST}) SET ("T_${test}_SOURCES" "${test}.cpp") diff --git a/branches/cmakemodif/paradiseo-mo/test/t-moTA.cpp b/branches/cmakemodif/paradiseo-mo/test/t-moTA.cpp new file mode 100644 index 000000000..2bfd91e2b --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/test/t-moTA.cpp @@ -0,0 +1,168 @@ +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2007-2008 +* (C) OPAC Team, LIFL, 2002-2008 +* +* Salma Mesmoudi +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* 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". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* 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 +* +*/ +//----------------------------------------------------------------------------- +// t-moTA.cpp +//----------------------------------------------------------------------------- + +#include // EO +#include // MO + +using std::cout; +using std::endl; + +//----------------------------------------------------------------------------- + +typedef EO solution; + +class testMove : public moMove +{ +public : + void operator () (solution & _solution) + { + solution sol=_solution; + } +} ; + +class testRandMove : public moRandMove +{ +public : + void operator () (testMove & _move) + { + _move=_move; + } +}; + +class testMoveIncrEval : public moMoveIncrEval +{ +public : + + testMoveIncrEval() : counter(0) + {} + + int operator () (const testMove & _move, const solution & _solution) + { + const testMove move(_move); + const solution solution(_solution); + + if(counter==0) + { + counter++; + return 2; + } + return 0; + } +private : + unsigned int counter; +} ; + +class solutionContinue : public moSolContinue +{ +public : + + solutionContinue() : counter(0) + {} + + bool operator () (const solution & _solution) + { + const solution sol(_solution); + + if(counter==0) + { + counter++; + return true; + } + + return false; + } + + void init() + {} +private : + unsigned int counter; +} ; + +class testCooling : public moCoolingSchedule +{ +public : + bool operator () (double & _threeshold) + { + double threeshold; + threeshold=_threeshold; + + return false; + } +}; + +class solutionEval : public eoEvalFunc +{ +public : + void operator () (solution & _solution) + { + _solution.fitness(0); + } +} ; + + +//----------------------------------------------------------------------------- + +int +main() +{ + std::string test_result; + int return_value; + + solution solution; + + testRandMove rand; + testMoveIncrEval incrEval; + solutionContinue continu; + testCooling cooling; + solutionEval eval; + + moTA ta(rand, incrEval, continu, 10.0, cooling, eval); + + cout << "[ moTA ] ==> "; + + ta(solution); + + test_result=((solution.fitness()!=2)?"KO":"OK"); + return_value=((test_result.compare("KO")==0)?EXIT_FAILURE:EXIT_SUCCESS); + + cout << test_result << endl; + return return_value; +} + +//----------------------------------------------------------------------------- diff --git a/branches/cmakemodif/paradiseo-mo/test/t-moVNS.cpp b/branches/cmakemodif/paradiseo-mo/test/t-moVNS.cpp new file mode 100644 index 000000000..da4164360 --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/test/t-moVNS.cpp @@ -0,0 +1,141 @@ +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2007-2008 +* (C) OPAC Team, LIFL, 2002-2008 +* +* Salma Mesmoudi (salma.mesmoudi@inria.fr), Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* Jeremie Humeau (jeremie.humeau@inria.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* 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". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* 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 +* +*/ +//----------------------------------------------------------------------------- +// t-moVNS.cpp +//----------------------------------------------------------------------------- + +#include // EO +#include // MO +#include + +using std::cout; +using std::endl; + +//----------------------------------------------------------------------------- + +typedef EO solution; +typedef eoScalarFitness< float, std::greater > tspFitness ; +typedef eoVector Route ; + +int cpt=0; +int tableau[7]={10.0, 9.0, 8.0, 8.0, 7.0, 7.0, 7.0}; + +class testMove : public moMove +{ +public : + + void operator () (solution & _solution) + { + solution sol=_solution; + } +} ; + + +class solutionAlgo : public moAlgo +{ +public : + bool operator () (solution & _solution) + { + solution solution(_solution); + return true; + } +} ; + +class Voisinage : public eoMonOp +{ +public : + bool operator () (Route & _solution) + { + _solution.invalidate(); + //_solution.fitness(); + + return true; + } +} ; + +class Explorer : public moExpl +{ +public: + Explorer(eoMonOp & expl): moExpl( expl) + { + + } +}; + +class solutionEval : public eoEvalFunc +{ +public : + void operator () (Route & _solution) + { + _solution.fitness(tableau[cpt]); + cpt++; + } +}; + +//----------------------------------------------------------------------------- + +int +main() +{ + std::string test_result; + int return_value; + + //solution solution; + Route so ; + + Voisinage sol1; + Voisinage sol2; + Explorer explorer(sol1); + explorer.add(sol2); + solutionEval eval; + + moVNS vns(explorer, eval); + + cout << "[moVNS] ==> "; + + so.fitness(20.0); + + vns(so); + + assert(so.fitness()==7.0); + + cout << "OK" << endl; + + return EXIT_SUCCESS; //return_value; +} + +//----------------------------------------------------------------------------- diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt index eb668f9e7..6b1468059 100644 --- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt +++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt @@ -162,6 +162,16 @@ MACRO(ADD_TARGET_MO n) ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp ) + ELSEIF(${n} STREQUAL "lesson5") + ADD_CUSTOM_TARGET(lesson5 DEPENDS + ${MO_BIN_DIR}/tutorial/Lesson5/param + ${MO_BIN_DIR}/tutorial/Lesson5/variable_neighborhood_search + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp + ${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp + ) ELSEIF(${n} STREQUAL "hybridlesson") ADD_CUSTOM_TARGET(hybridlesson DEPENDS ${MO_BIN_DIR}/tutorial/HybridLesson/param diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt new file mode 100644 index 000000000..191112d9f --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt @@ -0,0 +1,65 @@ +###################################################################################### +### 1) Include the sources +###################################################################################### + +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils) +INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) +INCLUDE_DIRECTORIES(${TSP_SRC_DIR}) + +###################################################################################### +### 2) Specify where CMake can find the libraries +###################################################################################### + +LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) + +###################################################################################### +### 3) Define your target(s): just an executable here +###################################################################################### + +IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + SOURCE_GROUP(src FILES iterated_local_search.cpp) + + SOURCE_GROUP(benchs FILES + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) + + ADD_EXECUTABLE(iterated_local_search + variable_neighborhood_search.cpp + ${MO_BIN_DIR}/tutorial/Lesson5/param + ${TSP_BIN_DIR}/benchs/berlin52.tsp + ${TSP_BIN_DIR}/benchs/eil101.tsp + ${TSP_BIN_DIR}/benchs/pr2392.tsp + ${TSP_BIN_DIR}/benchs/rl5915.tsp + ${TSP_BIN_DIR}/benchs/usa13509.tsp + ) +ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + ADD_COMMANDS_MO() + ADD_TARGET_MO(lesson5) + IF(ENABLE_CMAKE_EXAMPLE) + ADD_EXECUTABLE(variable_neighborhood_search variable_neighborhood_search.cpp) + ELSE(ENABLE_CMAKE_EXAMPLE) + ADD_EXECUTABLE(variable_neighborhood_search EXCLUDE_FROM_ALL variable_neighborhood_search.cpp) + ENDIF(ENABLE_CMAKE_EXAMPLE) +ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008") + +ADD_DEPENDENCIES(variable_neighborhood_search tsp) + +###################################################################################### +### 4) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION}) +SET_TARGET_PROPERTIES(variable_neighborhood_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}") + +###################################################################################### +### 5) Link the librairies for your target(s) +###################################################################################### + +TARGET_LINK_LIBRARIES(variable_neighborhood_search tsp eo eoutils) + +###################################################################################### diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param new file mode 100644 index 000000000..d81cd02b9 --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param @@ -0,0 +1,8 @@ +###### General ###### +# --help=0 # -h : Prints this message +# --stopOnUnknownParam=1 # Stop if unkown param entered + +###### Configuration ###### +# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance. +# --seed=1231949999 # Seed for rand. +# --selectionType=Best # Type of the selection: 'Best', 'First' or 'Random'. diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/variable_neighborhood_search.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/variable_neighborhood_search.cpp new file mode 100644 index 000000000..bbcd19e12 --- /dev/null +++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/variable_neighborhood_search.cpp @@ -0,0 +1,160 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 + (C) OPAC Team, LIFL, 2002-2008 + + Salma Mesmoudi (salma.mesmoudi@inria.fr), Jean-Charles Boisson + + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can use, + 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". + + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. + + 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 + + +//template void add(T& var, P& vect); +void manage_configuration_file(eoParser & _parser); +//void ajouter (std::vector > >& V, moMove& K)const ; + +int +main (int _argc, char* _argv []) +{ + std::string instancePath, selectionType; + unsigned int seed; + + eoParser parser(_argc, _argv); + + manage_configuration_file(parser); + + seed=atoi( (parser.getParamWithLongName("seed")->getValue()).c_str() ); + instancePath=parser.getParamWithLongName("instancePath")->getValue(); + selectionType=parser.getParamWithLongName("selectionType")->getValue(); + + srand (seed); + Graph::load(instancePath.c_str()); + + Route solution; + + RouteInit initializer; + initializer (solution); + + RouteEval full_evaluation; + full_evaluation (solution); + + std :: cout << "[From] " << solution << std :: endl; + //A neighbor is a local search or mutation + + /*Tools for an efficient (? :-)) + local search ! */ + //---------------------first neighbor---------------------------------- + + TwoOptInit two_opt_initializer; + + TwoOptNext two_opt_next_move_generator; + + TwoOptIncrEval two_opt_incremental_evaluation; + + moMoveSelect* two_opt_selection; + + if(selectionType.compare("Best")==0) + { + two_opt_selection= new moBestImprSelect(); + } + else if (selectionType.compare("First")==0) + { + two_opt_selection= new moFirstImprSelect(); + } + else if (selectionType.compare("Random")==0) + { + two_opt_selection= new moRandImprSelect(); + } + else + { + throw std::runtime_error("[hill_climbing.cpp]: the type of selection '"+selectionType+"' is not correct."); + } + + + moHC hill_climbing (two_opt_initializer, two_opt_next_move_generator, two_opt_incremental_evaluation, + *two_opt_selection, full_evaluation); + + + //--------------------second neighbor----------------- + + CitySwap perturbation; + + //-----------neighbor vector-------------------------- + + moExpl explorer(perturbation); + explorer.add(hill_climbing); + explorer.add(perturbation); + + //------------VNS application-------------------------- + + moVNS vns(explorer, full_evaluation); + vns(solution); + //hill_climbing(solution); + std :: cout << "[To] " << solution << std :: endl; + + delete(two_opt_selection); + + return EXIT_SUCCESS; +} + + +void +manage_configuration_file(eoParser & _parser) +{ + std::ofstream os; + + _parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", + 0, "Configuration", false); + + _parser.getORcreateParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false); + + _parser.getORcreateParam(std::string("Best"), "selectionType", "Type of the selection: 'Best', 'First' or 'Random'.", + 0, "Configuration", false); + + if (_parser.userNeedsHelp()) + { + _parser.printHelp(std::cout); + exit(EXIT_FAILURE); + } + + os.open("current_param"); + if(!os.is_open()) + { + throw std::runtime_error("[hill_climbing.cpp]: the file current_param cannot be created."); + } + os <<_parser; + os.close(); +} + + +