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

Lesson update: commentaries and variable names

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@878 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-01-15 15:52:09 +00:00
commit f5ded71db7
4 changed files with 222 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

106
trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
View file

@ -1,84 +1,84 @@
/* /*
* <hill_climbing.cpp> <hill_climbing.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2007 (C) OPAC Team, LIFL, 2002-2008
*
* Sébastien Cahon, Jean-Charles Boisson Sébastien Cahon, Jean-Charles Boisson
*
* This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info". "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy, 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 modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
*
* In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software, 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 that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or 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 data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security. same conditions as regards security.
* The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*
* ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
* Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*
*/ */
#include <mo> #include <mo>
#include <tsp> #include <tsp>
int int
main (int __argc, char * __argv []) main (int _argc, char* _argv [])
{ {
if (__argc != 2) if (_argc != 2)
{ {
std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl; std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl;
return 1 ; return EXIT_FAILURE;
} }
srand (1000); srand (1000);
Graph :: load (__argv [1]) ; // Instance Graph::load(_argv [1]);
Route route ; // Solution Route solution;
RouteInit init ; // Sol. Random Init. RouteInit initializer;
init (route) ; initializer (solution);
RouteEval full_eval ; // Full. Eval. RouteEval full_evaluation;
full_eval (route) ; full_evaluation (solution);
std :: cout << "[From] " << route << std :: endl ; std :: cout << "[From] " << solution << std :: endl;
/* Tools for an efficient (? :-)) /* Tools for an efficient (? :-))
local search ! */ local search ! */
TwoOptInit two_opt_init ; // Init. TwoOptInit two_opt_initializer;
TwoOptNext two_opt_next ; // Explorer. TwoOptNext two_opt_next_move_generator;
TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. TwoOptIncrEval two_opt_incremental_evaluation;
//moFirstImprSelect <TwoOpt> two_opt_select ; //moFirstImprSelect <TwoOpt> two_opt_selection;
moBestImprSelect <TwoOpt> two_opt_select ; moBestImprSelect <TwoOpt> two_opt_selection;
//moRandImprSelect <TwoOpt> two_opt_select ; //moRandImprSelect <TwoOpt> two_opt_selection;
moHC <TwoOpt> hill_climbing (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, full_eval) ; moHC <TwoOpt> hill_climbing (two_opt_initializer, two_opt_next_move_generator, two_opt_incremental_evaluation,
hill_climbing (route) ; two_opt_selection, full_evaluation);
hill_climbing (solution) ;
std :: cout << "[To] " << route << std :: endl ; std :: cout << "[To] " << solution << std :: endl;
return 0 ; return EXIT_SUCCESS;
} }

105
trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
View file

@ -1,85 +1,86 @@
/* /*
* <tabu_search.cpp> <tabu_search.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2007 (C) OPAC Team, LIFL, 2002-2008
*
* Sébastien Cahon, Jean-Charles Boisson Sébastien Cahon, Jean-Charles Boisson
*
* This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info". "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy, 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 modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
*
* In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software, 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 that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or 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 data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security. same conditions as regards security.
* The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*
* ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
* Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*
*/ */
#include <mo> #include <mo>
#include <tsp> #include <tsp>
int int
main (int __argc, char * __argv []) main (int _argc, char* _argv [])
{ {
if (__argc != 2) if (_argc != 2)
{ {
std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ; std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ;
return 1 ; return 1 ;
} }
Graph :: load (__argv [1]) ; // Instance Graph::load (_argv [1]);
Route route ; // Solution Route solution;
RouteInit init ; // Sol. Random Init. RouteInit initializer;
init (route) ; initializer(solution);
RouteEval full_eval ; // Full. Eval. RouteEval full_evaluation;
full_eval (route) ; full_evaluation(solution);
std :: cout << "[From] " << route << std :: endl ; std :: cout << "[From] " << solution << std :: endl;
/* Tools for an efficient (? :-)) /* Tools for an efficient (? :-))
local search ! */ local search ! */
TwoOptInit two_opt_init ; // Init. TwoOptInit two_opt_initializer;
TwoOptNext two_opt_next ; // Explorer. TwoOptNext two_opt_next_move_generator;
TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. TwoOptIncrEval two_opt_incremental_evaluation;
TwoOptTabuList tabu_list ; // Tabu List TwoOptTabuList tabu_list;
//moSimpleMoveTabuList<TwoOpt> tabu_list(10); //moSimpleMoveTabuList<TwoOpt> tabu_list(10);
//moSimpleSolutionTabuList<TwoOpt> tabu_list(10); //moSimpleSolutionTabuList<TwoOpt> tabu_list(10);
moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion moNoAspirCrit <TwoOpt> aspiration_criterion;
moGenSolContinue <Route> cont (10000) ; // Continuator moGenSolContinue <Route> continu (10000);
moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ; moTS <TwoOpt> tabu_search (two_opt_initializer, two_opt_next_move_generator,
tabu_search (route) ; two_opt_incremental_evaluation, tabu_list, aspiration_criterion, continu, full_evaluation);
tabu_search(solution);
std :: cout << "[To] " << route << std :: endl ; std :: cout << "[To] " << solution << std :: endl;
return 0 ; return EXIT_SUCCESS;
} }

104
trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
View file

@ -1,84 +1,84 @@
/* /*
* <simulated_annealing.cpp> <simulated_annealing.cpp>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2007 (C) OPAC Team, LIFL, 2002-2008
*
* Sébastien Cahon, Jean-Charles Boisson Sébastien Cahon, Jean-Charles Boisson
*
* This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info". "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy, 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 modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
*
* In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software, 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 that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or 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 data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security. same conditions as regards security.
* The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*
* ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
* Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*
*/ */
#include <mo> #include <mo>
#include <tsp> #include <tsp>
int int
main (int __argc, char * __argv []) main (int _argc, char* _argv [])
{ {
if (__argc != 2) if (_argc != 2)
{ {
std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl; std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl;
return 1 ; return EXIT_FAILURE;
} }
Graph :: load (__argv [1]) ; // Instance Graph::load (_argv [1]);
Route route ; // Solution Route solution;
RouteInit init ; // Sol. Random Init. RouteInit initializer;
init (route) ; initializer (solution);
RouteEval full_eval ; // Full. Eval. RouteEval full_evaluation;
full_eval (route) ; full_evaluation (solution);
std :: cout << "[From] " << route << std :: endl ; std :: cout << "[From] " << solution << std :: endl;
/* Tools for an efficient (? :-)) /* Tools for an efficient (? :-))
local search ! */ local search ! */
TwoOptRand two_opt_rand ; // Route Random. Gen. TwoOptRand two_opt_random_move_generator;
TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. TwoOptIncrEval two_opt_incremental_evaluation;
TwoOpt move; TwoOpt move;
moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule moExponentialCoolingSchedule cooling_schedule (0.1, 0.98);
//moLinearCoolingSchedule cool_sched (0.1, 0.5) ; // Linear Cooling Schedule //moLinearCoolingSchedule cooling_schedule (0.1, 0.5);
moGenSolContinue <Route> cont (1000) ; /* Temperature Descreasing moGenSolContinue <Route> continu (1000); /* Temperature Descreasing
will occur each 1000 will occur each 1000
iterations */ iterations */
moSA <TwoOpt> simulated_annealing (two_opt_rand, two_opt_incr_eval, cont, 1000, cool_sched, full_eval) ; moSA <TwoOpt> simulated_annealing (two_opt_random_move_generator, two_opt_incremental_evaluation,
simulated_annealing (route) ; continu, 1000, cooling_schedule, full_evaluation);
simulated_annealing (solution);
std :: cout << "[To] " << route << std :: endl ; std :: cout << "[To] " << solution << std :: endl;
return 0 ; return EXIT_SUCCESS ;
} }

76
trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
View file

@ -1,11 +1,35 @@
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- /*
<iterated_local_search.cpp>
Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
(C) OPAC Team, LIFL, 2002-2008
// "iterated_local_search.cpp" Sébastien Cahon, Jean-Charles Boisson
// (c) OPAC Team, LIFL, 2003-2007 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".
/* LICENCE TEXT 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 Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
@ -13,46 +37,46 @@
#include <tsp> #include <tsp>
int int
main (int __argc, char * __argv []) main (int _argc, char* _argv [])
{ {
if (__argc != 2) if (_argc != 2)
{ {
std :: cerr << "Usage : ./iterated_local_search [instance]" << std :: endl ; std :: cerr << "Usage : ./iterated_local_search [instance]" << std :: endl ;
return 1 ; return EXIT_FAILURE;
} }
Graph :: load (__argv [1]) ; // Instance Graph::load (_argv [1]);
Route route ; // Solution Route solution;
RouteInit init ; // Sol. Random Init. RouteInit initializer;
init (route) ; initializer (solution);
RouteEval full_eval ; // Full. Eval. RouteEval full_evaluation;
full_eval (route) ; full_evaluation (solution);
std :: cout << "[From] " << route << std :: endl ; std :: cout << "[From] " << solution << std :: endl;
TwoOptInit two_opt_init ; // Init. TwoOptInit two_opt_initializer;
TwoOptNext two_opt_next ; // Explorer. TwoOptNext two_opt_next_move_generator;
TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. TwoOptIncrEval two_opt_incremental_evaluation;
moBestImprSelect <TwoOpt> two_opt_select ; //Move selection moBestImprSelect <TwoOpt> two_opt_selection;
moGenSolContinue <Route> cont (1000) ; //Stopping criterion moGenSolContinue <Route> continu(1000);
moFitComparator<Route> comparator; // Route comparator moFitComparator<Route> comparator;
CitySwap perturbation; // Route perturbation CitySwap perturbation;
moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, moILS<TwoOpt> iterated_local_search (two_opt_initializer, two_opt_next_move_generator, two_opt_incremental_evaluation,
cont, comparator, perturbation, full_eval) ; two_opt_selection, continu, comparator, perturbation, full_evaluation) ;
iterated_local_search(route) ; iterated_local_search(solution);
std :: cout << "[To] " << route << std :: endl ; std :: cout << "[To] " << solution << std :: endl;
return 0 ; return EXIT_SUCCESS;
} }