Description of an algorithm of the paradiseo-mo library.
More...
@@ -50,14 +52,14 @@
Description of an algorithm of the paradiseo-mo library.
-moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library.
+moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library.
@@ -54,11 +56,11 @@
Description of the conditions in which a tabu move could be accepted.
-It is only a description... An object that herits from this class is needed to be used in a moTS. See moNoAspriCrit for example.
+It is only a description... An object that herits from this class is needed to be used in a moTS. See moNoAspriCrit for example.
moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
-This class is a move (moMove) generator with a bound for the maximum number of iterations.
+This class is a move (moMove) generator with a bound for the maximum number of iterations.
-It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
+It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
-Class which allows to generate a new move (moMove).
+Class which allows to generate a new move (moMove).
-Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used.
+Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used.
-Only a description... An object that herits from this class needs to be designed in order to use a moSA.
+Only a description... An object that herits from this class needs to be designed in order to use a moSA.
-Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.
+Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.
moTS uses.
+Class describing a tabu list that a moTS uses.
-It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS.
+It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS.
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
index.h
00001 /* <index.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Jean-Charles BOISSON: Jean-Charles.Boisson@lifl.fr
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00092 // coding: iso-8859-1
+00093 // mode: C++
+00094 // c-file-style: "Stroustrup"
+00095 // fill-column: 80
+00096 // End:
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/main.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/main.html
index 5c5483135..309eb5518 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/main.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/main.html
@@ -1,13 +1,13 @@
-
+
PARADISEO-MO: Welcome to PARADISEO-Moving Objects
-
+
MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
- It contains classes for almost any kind of one solution based heuristics.
+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.
+The installation procedure of the package is detailed in the README file in the top-directory of the source-tree. Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_8h-source.html
index e0b1b65af..e5fadab86 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: mo.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
mo.h
00001 /* <mo.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __mo_h
+00036 #define __mo_h
+00037
+00038 #include "moAlgo.h"
+00039 #include "moAspirCrit.h"
+00040 #include "moBestImprSelect.h"
+00041 #include "moCoolingSchedule.h"
+00042 #include "moExponentialCoolingSchedule.h"
+00043 #include "moFirstImprSelect.h"
+00044 #include "moGenSolContinue.h"
+00045 #include "moHC.h"
+00046 #include "moHCMoveLoopExpl.h"
+00047 #include "moImprBestFitAspirCrit.h"
+00048 #include "moItRandNextMove.h"
+00049 #include "moLinearCoolingSchedule.h"
+00050 #include "moLSCheckPoint.h"
+00051 #include "moMoveExpl.h"
+00052 #include "moMove.h"
+00053 #include "moMoveIncrEval.h"
+00054 #include "moMoveInit.h"
+00055 #include "moMoveLoopExpl.h"
+00056 #include "moMoveSelect.h"
+00057 #include "moNextMove.h"
+00058 #include "moNoAspirCrit.h"
+00059 #include "moRandImprSelect.h"
+00060 #include "moRandMove.h"
+00061 #include "moSA.h"
+00062 #include "moSimpleMoveTabuList.h"
+00063 #include "moSimpleSolutionTabuList.h"
+00064 #include "moSolContinue.h"
+00065 #include "moTabuList.h"
+00066 #include "moTS.h"
+00067 #include "moTSMoveLoopExpl.h"
+00068
+00069 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_algo_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_algo_8h-source.html
index 780dab13f..282ffe291 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_algo_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_algo_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moAlgo.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moAlgo.h
00001 /* <moAlgo.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moAlgo_h
+00036 #define __moAlgo_h
+00037
+00038 #include <eoOp.h>
+00039
+00041
+00044template < class EOT > class moAlgo:publiceoMonOp < EOT >
+00045 {
+00046
+00047 };
+00048
+00049 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html
index 32496df4f..22abe9571 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moAspirCrit.h Source File
-
+
00001 /* <moAspirCrit.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */00034
-00035 };
-00036
-00037 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+00035 #ifndef __moAspirCrit_h
+00036 #define __moAspirCrit_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00045template < class M > class moAspirCrit:publiceoBF < const M &, const typename
+00046 M::EOType::Fitness &,
+00047 bool >
+00048 {
+00049
+00050 public:
+00052
+00055 virtualvoid
+00056 init () = 0;
+00057
+00058 };
+00059
+00060 #endif
+Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html
index 13c69f02a..40f8333bf 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moBestImprSelect.h Source File
-
+
00001 /* <moBestImprSelect.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moBestImprSelect_h
+00036 #define __moBestImprSelect_h
+00037
+00038 #include "moMoveSelect.h"00039
-00047boolupdate (const M & __move, constFitness & __fit)
-00048 {
+00041
+00045template < class M > class moBestImprSelect:publicmoMoveSelect < M >
+00046 {
+00047
+00048 public:
00049
-00050 if (first_time || __fit > best_fit)
-00051 {
+00051typedeftypename M::EOType::Fitness Fitness;
00052
-00053 best_fit = __fit;
-00054 best_move = __move;
-00055
-00056 first_time = false;
-00057 }
-00058
-00059 returntrue;
-00060 }
-00061
-00063
-00068voidoperator () (M & __move, Fitness & __fit) throw (EmptySelection)
-00069 {
-00070
-00071 if (!first_time)
-00072 {
-00073 __move = best_move;
-00074 __fit = best_fit;
-00075 }
-00076 else
-00077 throwEmptySelection ();
-00078 }
-00079
-00080 private:
+00054voidinit (constFitness & __fit)
+00055 {
+00056
+00057 first_time = true;
+00058 }
+00059
+00060
+00062
+00070boolupdate (const M & __move, constFitness & __fit)
+00071 {
+00072
+00073 if (first_time || __fit > best_fit)
+00074 {
+00075
+00076 best_fit = __fit;
+00077 best_move = __move;
+00078
+00079 first_time = false;
+00080 }
00081
-00083boolfirst_time;
+00082 returntrue;
+00083 }
00084
-00086 M best_move;
-00087
-00089Fitnessbest_fit;
-00090
-00091 };
-00092
-00093 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moCoolingSchedule.h
00001 /* <moCoolingSchedule.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moCoolingSchedule_h
+00036 #define __moCoolingSchedule_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00045class moCoolingSchedule:publiceoUF < double &, bool >
+00046 {
+00047
+00048 };
+00049
+00050 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html
index 06b97d8a8..2c7c3fab8 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moExponentialCoolingSchedule.h Source File
-
+
00001 /* <moExponentialCoolingSchedule.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Jean-Charles BOISSON: Jean-Charles.Boisson@lifl.fr
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moExponentialCoolingSchedule_h
+00036 #define __moExponentialCoolingSchedule_h
+00037
+00038 #include "moCoolingSchedule.h"
+00039
+00041
+00045class moExponentialCoolingSchedule: publicmoCoolingSchedule
+00046 {
00047
-00049doublethreshold;
+00048 public:
00050
-00052doubleratio;
-00053 };
-00054
-00055 #endif
-
00001 /* <moFirstImrpSelect.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moFirstImprSelect_h
+00036 #define __moFirstImprSelect_h
+00037
+00038 #include "moMoveSelect.h"
+00039
00041
-00042
-00044
-00052boolupdate (const M & __move, consttypename M::EOType::Fitness & __fit)
-00053 {
-00054
-00055 if (__fit > init_fit)
-00056 {
-00057
-00058 best_fit = __fit;
-00059 best_move = __move;
-00060 valid = true;
-00061
-00062 returnfalse;
-00063 }
-00064 else
-00065 {
-00066 returntrue;
-00067 }
-00068 }
-00069
-00071
-00076voidoperator () (M & __move, Fitness & __fit) throw (EmptySelection)
-00077 {
-00078
-00079 if (valid)
-00080 {
-00081 __move = best_move;
-00082 __fit = best_fit;
-00083 }
-00084 else
-00085 throwEmptySelection ();
-00086 }
-00087
-00088 private:
-00089
-00091boolvalid;
+00046template < class M > class moFirstImprSelect:publicmoMoveSelect < M >
+00047 {
+00048
+00049 public:
+00050
+00052typedeftypename M::EOType::Fitness Fitness;
+00053
+00055
+00058virtualvoidinit (constFitness & __fit)
+00059 {
+00060
+00061 valid = false;
+00062 init_fit = __fit;
+00063 }
+00064
+00065
+00067
+00075boolupdate (const M & __move, consttypename M::EOType::Fitness & __fit)
+00076 {
+00077
+00078 if (__fit > init_fit)
+00079 {
+00080
+00081 best_fit = __fit;
+00082 best_move = __move;
+00083 valid = true;
+00084
+00085 returnfalse;
+00086 }
+00087 else
+00088 {
+00089 returntrue;
+00090 }
+00091 }
00092
-00094 M best_move;
-00095
-00097Fitnessinit_fit;
-00098
-00100Fitnessbest_fit;
+00094
+00099voidoperator () (M & __move, Fitness & __fit) throw (EmptySelection)
+00100 {
00101
-00102 };
-00103
-00104 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+00102 if (valid)
+00103 {
+00104 __move = best_move;
+00105 __fit = best_fit;
+00106 }
+00107 else
+00108 throwEmptySelection ();
+00109 }
+00110
+00111 private:
+00112
+00114boolvalid;
+00115
+00117 M best_move;
+00118
+00120Fitnessinit_fit;
+00121
+00123Fitnessbest_fit;
+00124
+00125 };
+00126
+00127 #endif
+Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html
index 5c3ea2178..32469755f 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moGenSolContinue.h Source File
-
+
00001 /* <moGenSolContinue.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */00034
-00036
-00044booloperator () (const EOT & __sol)
-00045 {
+00035 #ifndef __moGenSolContinue_h
+00036 #define __moGenSolContinue_h
+00037
+00038 #include "moSolContinue.h"
+00039
+00041
+00044template < class EOT > class moGenSolContinue:publicmoSolContinue < EOT >
+00045 {
00046
-00047 return (++numGen < maxNumGen);
-00048 }
-00049
-00051
-00054voidinit ()
-00055 {
-00056
-00057 numGen = 0;
-00058 }
+00047 public:
+00048
+00050
+00053moGenSolContinue (unsignedint __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
+00054 {
+00055
+00056 }
+00057
00059
-00060 private:
-00061
-00063unsignedintmaxNumGen;
-00064
-00066unsignedintnumGen;
-00067 };
-00068
-00069 #endif
-
00001 /* <moHC.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */00034
-00036 typedef
-00037 typename
-00038 EOT::Fitness
-00039Fitness;
+00035 #ifndef __moHC_h
+00036 #define __moHC_h
+00037
+00038 #include <eoOp.h>
+00039 #include <eoEvalFunc.h>00040
-00041 public:
-00042
+00041 #include "moAlgo.h"
+00042 #include "moMoveExpl.h"
+00043 #include "moHCMoveLoopExpl.h"00044
-00053moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
-00054 (__move_init, __next_move, __incr_eval, __move_select)),
-00055 full_eval (__full_eval)
-00056 {
+00046
+00049template < class M > class moHC:publicmoAlgo < typename M::EOType >
+00050 {
+00051
+00053 typedef
+00054 typename
+00055 M::EOType
+00056EOT;
00057
-00058 }
-00059
-00061
-00067moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
-00068 full_eval
-00069 (__full_eval)
-00070 {
-00071
-00072 }
-00073
-00075
-00082booloperator ()(EOT & __sol)
-00083 {
+00059 typedef
+00060 typename
+00061 EOT::Fitness
+00062Fitness;
+00063
+00064 public:
+00065
+00067
+00076moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
+00077 (__move_init, __next_move, __incr_eval, __move_select)),
+00078 full_eval (__full_eval)
+00079 {
+00080
+00081 }
+00082
00084
-00085 if (__sol.invalid ())
-00086 {
-00087 full_eval (__sol);
-00088 }
-00089
-00090 EOT new_sol;
-00091
-00092 do
-00093 {
+00090moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
+00091 full_eval
+00092 (__full_eval)
+00093 {
00094
-00095 new_sol = __sol;
+00095 }
00096
-00097 try
-00098 {
-00099
-00100 move_expl (__sol, new_sol);
-00101
-00102 }
-00103 catch (EmptySelection & __ex)
-00104 {
-00105
-00106 break;
-00107 }
-00108
-00109 if (new_sol.fitness () > __sol.fitness ())
-00110 {
-00111 __sol = new_sol;
-00112 }
-00113 else
-00114 {
-00115 break;
-00116 }
+00098
+00105booloperator ()(EOT & __sol)
+00106 {
+00107
+00108 if (__sol.invalid ())
+00109 {
+00110 full_eval (__sol);
+00111 }
+00112
+00113 EOT new_sol;
+00114
+00115 do
+00116 {
00117
-00118 }
-00119 while (true);
-00120
-00121 returntrue;
-00122 }
-00123
-00124 private:
-00125
-00127 moMoveExpl < M > &move_expl;
+00118 new_sol = __sol;
+00119
+00120 try
+00121 {
+00122
+00123 move_expl (__sol, new_sol);
+00124
+00125 }
+00126 catch (EmptySelection & __ex)
+00127 {
00128
-00130 eoEvalFunc < EOT > &full_eval;
-00131 };
-00132
-00133 #endif
-
00001 /* <moHCMoveLoopExpl.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moHCMoveLoopExpl_h
+00036 #define __moHCMoveLoopExpl_h
+00037
+00038 #include "moMoveLoopExpl.h"
+00039
+00040 #include "moMoveInit.h"
+00041 #include "moNextMove.h"
+00042 #include "moMoveIncrEval.h"
+00043 #include "moMoveSelect.h"00044
-00045 move_init (__move_init),
-00046 next_move (__next_move),
-00047 incr_eval (__incr_eval), move_select (__move_select)
-00048 {
-00049
-00050 }
+00046template < class M > class moHCMoveLoopExpl:publicmoMoveLoopExpl < M >
+00047 {
+00048
+00050typedeftypename M::EOType EOT;
00051
-00053
-00059voidoperator () (constEOT & __old_sol, EOT & __new_sol)
-00060 {
-00061
-00062 M move;
-00063
-00064 //
-00065 move_init (move, __old_sol); /* Restarting the exploration of
-00066 of the neighborhood ! */
+00053typedeftypename M::EOType::Fitness Fitness;
+00054
+00055 public:
+00056
+00058
+00066moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
00067
-00068 move_select.init (__old_sol.fitness ());
-00069
-00070 while (move_select.update (move, incr_eval (move, __old_sol))
-00071 && next_move (move, __old_sol));
+00068 move_init (__move_init),
+00069 next_move (__next_move),
+00070 incr_eval (__incr_eval), move_select (__move_select)
+00071 {
00072
-00073 try
-00074 {
-00075
-00076 M best_move;
-00077
-00078 Fitness best_move_fit;
-00079
-00080 move_select (best_move, best_move_fit);
-00081 __new_sol.fitness (best_move_fit);
-00082 best_move (__new_sol);
-00083
-00084 }
-00085 catch (EmptySelection & __ex)
-00086 {
-00087
-00088 // ?
-00089 }
-00090 }
-00091
-00092 private:
-00093
-00095 moMoveInit < M > &move_init;
-00096
-00098 moNextMove < M > &next_move;
-00099
-00101 moMoveIncrEval < M > &incr_eval;
+00073 }
+00074
+00076
+00082voidoperator () (constEOT & __old_sol, EOT & __new_sol)
+00083 {
+00084
+00085 M move;
+00086
+00087 //
+00088 move_init (move, __old_sol); /* Restarting the exploration of
+00089 of the neighborhood ! */
+00090
+00091 move_select.init (__old_sol.fitness ());
+00092
+00093 while (move_select.update (move, incr_eval (move, __old_sol))
+00094 && next_move (move, __old_sol));
+00095
+00096 try
+00097 {
+00098
+00099 M best_move;
+00100
+00101 Fitness best_move_fit;
00102
-00104 moMoveSelect < M > &move_select;
-00105
-00106 };
-00107
-00108 #endif
-
00001 /* <moImrpBestFitAspirCrit.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moImprBestFitAspirCrit_h
+00036 #define __moImprBestFitAspirCrit_h
+00037
+00038 #include "moAspirCrit.h"
+00039
+00041
+00045template < class M > class moImprBestFitAspirCrit:publicmoAspirCrit < M >
+00046 {
+00047
+00048 public:
+00049
+00051typedeftypename M::EOType::Fitness Fitness;
+00052
+00054moImprBestFitAspirCrit ()
+00055 {
+00056
+00057 first_time = true;
+00058 }
+00059
+00061voidinit ()
+00062 {
+00063
+00064 first_time = true;
+00065 }
+00066
00068
-00069 best_fit = __fit;
-00070
-00071 returntrue;
-00072 }
-00073 }
-00074
-00075 private:
-00076
-00078Fitnessbest_fit;
-00079
-00081boolfirst_time;
-00082 };
+00075booloperator () (const M & __move, constFitness & __fit)
+00076 {
+00077
+00078 if (first_time)
+00079 {
+00080
+00081 best_fit = __fit;
+00082 first_time = false;
00083
-00084 #endif
-
00001 /* <moItRandNextMove.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moItRandNextMove_h
+00036 #define __moItRandNextMove_h
+00037
+00038 #include "moNextMove.h"
+00039 #include "moRandMove.h"
+00040
+00042
+00045template < class M > class moItRandNextMove:publicmoNextMove < M >
+00046 {
+00047
+00049typedeftypename M::EOType EOT;
+00050
+00051 public:
+00052
00054
-00055 if (num_iter++ > max_iter)
-00056 {
-00057
-00058 num_iter = 0;
-00059 returnfalse;
-00060 }
-00061 else
-00062 {
-00063
-00064 /* The given solution is discarded here */
-00065 rand_move (__move);
-00066 num_iter++;
-00067 returntrue;
-00068 }
-00069 }
-00070
-00071 private:
-00072
-00074 moRandMove < M > &rand_move;
-00075
-00077unsignedintmax_iter;
-00078
-00080unsignedintnum_iter;
-00081
-00082 };
-00083
-00084 #endif
-
00001 /* <moLSCheckPoint.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moLSCheckPoint_h
+00036 #define __moLSCheckPoinr_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00044template < class M > class moLSCheckPoint:publiceoBF < const M &, const typename
+00045 M::EOType &, void >
+00046 {
+00047
+00048 public:
+00050
+00056 void
+00057operator () (const M & __move, consttypename M::EOType & __sol)
+00058 {
+00059
+00060 for (unsignedint i = 0; i < func.size (); i++)
+00061 {
+00062 func[i]->operator ()(__move, __sol);
+00063 }
+00064 }
00065
-00066 #endif
-
00001 /* <moLinearCoolingSchedule.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Jean-Charles BOISSON: Jean-Charles.Boisson@lifl.fr
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moLinearCoolingSchedule_h
+00036 #define __moLinearCoolingSchedule_h
+00037
+00038 #include "moCoolingSchedule.h"
+00039
+00041
+00045class moLinearCoolingSchedule: publicmoCoolingSchedule
+00046 {
00047
-00049doublethreshold;
+00048 public:
00050
-00052doublequantity;
-00053 };
-00054
-00055 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moMove.h
00001 /* <moMove.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moMove_h
+00036 #define __moMove_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00046template < class EOT > class moMove:publiceoUF < EOT &, void >
+00047 {
+00048
+00049 public:
+00051typedef EOT EOType;
+00052
+00053 };
+00054
+00055 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_expl_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_expl_8h-source.html
index e8613fa95..766c8aa10 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_expl_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_expl_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moMoveExpl.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moMoveExpl.h
00001 /* <moMoveExpl.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moMoveExpl_h
+00036 #define __moMoveExpl_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00044template < class M > class moMoveExpl:publiceoBF < const typename
+00045 M::EOType &,
+00046 typename
+00047 M::EOType &, void >
+00048 {
+00049
+00050 };
+00051
+00052 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html
index d3ac41aff..0baa365b2 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moMoveIncrEval.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moMoveIncrEval.h
00001 /* <moMoveIncrEval.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moMoveIncrEval_h
+00036 #define __moMoveIncrEval_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00047template < class M > class moMoveIncrEval:publiceoBF < const M &, const typename
+00048 M::EOType &,
+00049 typename
+00050 M::EOType::Fitness >
+00051 {
+00052
+00053 };
+00054
+00055 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_init_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_init_8h-source.html
index 3dc15757b..117e30d37 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_init_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_init_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moMoveInit.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moMoveInit.h
00001 /* <moMoveInit.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moMoveInit_h
+00036 #define __moMoveInit_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00045template < class M > class moMoveInit:publiceoBF < M &, const typename
+00046 M::EOType &, void >
+00047 {
+00048
+00049 };
+00050
+00051 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html
index b9cc30878..3a59346f9 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moMoveLoopExpl.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moMoveLoopExpl.h
00001 /* <moMoveLoopExpl.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moMoveLoopExpl_h
+00036 #define __moMoveLoopExpl_h
+00037
+00038 #include "moMoveExpl.h"
+00039
+00041
+00044template < class M > class moMoveLoopExpl:publicmoMoveExpl < M >
+00045 {
+00046
+00047 };
+00048
+00049 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_select_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_select_8h-source.html
index 13e726946..451652bd8 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_select_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_move_select_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moMoveSelect.h Source File
-
+
00001 /* <moMoveSelect.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moMoveSelect_h
+00036 #define __moMoveSelect_h
+00037
+00038 #include <eoFunctor.h>
+00039
00041
-00043
-00050 virtualvoid
-00051 init (constFitness & __fit) = 0;
-00052
-00054
-00059 virtual
-00060 bool
-00061 update (const M & __move, constFitness & __fit) = 0;
-00062
-00063 };
+00044class EmptySelection
+00045 {
+00046
+00047 };
+00048
+00050
+00055template < class M > class moMoveSelect:publiceoBF < M &, typename M::EOType::Fitness &,
+00056 void >
+00057 {
+00058 public:
+00060 typedef
+00061 typename
+00062 M::EOType::Fitness
+00063Fitness;
00064
-00065 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+00066
+00073 virtualvoid
+00074 init (constFitness & __fit) = 0;
+00075
+00077
+00082 virtual
+00083 bool
+00084 update (const M & __move, constFitness & __fit) = 0;
+00085
+00086 };
+00087
+00088 #endif
+Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_next_move_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_next_move_8h-source.html
index f2fbde367..b54849b51 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_next_move_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_next_move_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moNextMove.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moNextMove.h
00001 /* <moNextMove.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moNextMove_h
+00036 #define __moNextMove_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00045template < class M > class moNextMove:publiceoBF < M &, const typename
+00046 M::EOType &,
+00047 bool >
+00048 {
+00049
+00050 };
+00051
+00052 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html
index 4ff49512f..0cbf3a797 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moNoAspirCrit.h Source File
-
+
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moNoAspirCrit.h
00001 /* <moNoAspirCrit.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moNoAspirCrit_h
+00036 #define __moNoAspirCrit_h
+00037
+00038 #include "moAspirCrit.h"
+00039
+00041
+00044template < class M > class moNoAspirCrit:publicmoAspirCrit < M >
+00045 {
+00046
+00048
+00055booloperator () (const M & __move,
+00056 consttypename M::EOType::Fitness & __sol)
+00057 {
+00058
+00059 returnfalse;
+00060 }
+00061
+00063
+00066voidinit ()
+00067 {
+00068 }
+00069 };
+00070
+00071 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html
index 9e5938bb4..a59568064 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moRandImprSelect.h Source File
-
+
00001 /* <moRandImprSelect.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */00034
-00040voidinit (constFitness & __fit)
-00041 {
-00042 init_fit = __fit;
-00043 vect_better_fit.clear ();
-00044 vect_better_moves.clear ();
-00045 }
-00046
-00048
-00056boolupdate (const M & __move, constFitness & __fit)
-00057 {
-00058
-00059 if (__fit > init_fit)
-00060 {
-00061
-00062 vect_better_fit.push_back (__fit);
-00063 vect_better_moves.push_back (__move);
-00064 }
-00065
-00066 returntrue;
-00067 }
-00068
-00070
-00077voidoperator () (M & __move, Fitness & __fit) throw (EmptySelection)
-00078 {
-00079
-00080 if (!vect_better_fit.empty ())
-00081 {
-00082
-00083 unsigned n = rng.random (vect_better_fit.size ());
+00035 #ifndef __moRandImprSelect_h
+00036 #define __moRandImprSelect_h
+00037
+00038 #include <vector>
+00039
+00040 #include <utils/eoRNG.h>
+00041 #include "moMoveSelect.h"
+00042
+00044
+00048template < class M > class moRandImprSelect:publicmoMoveSelect < M >
+00049 {
+00050
+00051 public:
+00052
+00054typedeftypename M::EOType::Fitness Fitness;
+00055
+00057
+00063voidinit (constFitness & __fit)
+00064 {
+00065 init_fit = __fit;
+00066 vect_better_fit.clear ();
+00067 vect_better_moves.clear ();
+00068 }
+00069
+00071
+00079boolupdate (const M & __move, constFitness & __fit)
+00080 {
+00081
+00082 if (__fit > init_fit)
+00083 {
00084
-00085 __move = vect_better_moves[n];
-00086 __fit = vect_better_fit[n];
+00085 vect_better_fit.push_back (__fit);
+00086 vect_better_moves.push_back (__move);
00087 }
-00088 else
-00089 throwEmptySelection ();
+00088
+00089 returntrue;
00090 }
00091
-00092 private:
00093
-00095Fitnessinit_fit;
-00096
-00098 std::vector < Fitness > vect_better_fit;
-00099
-00101 std::vector < M > vect_better_moves;
-00102 };
-00103
-00104 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moRandMove.h
00001 /* <moRandMove.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moRandMove_h
+00036 #define __moRandMove_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00044template < class M > class moRandMove:publiceoUF < M &, void >
+00045 {
+00046
+00047 };
+00048
+00049 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_s_a_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_s_a_8h-source.html
index 168afa10a..888c8d1be 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_s_a_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_s_a_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moSA.h Source File
-
+
00001 /* <moSA.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moSA_h
+00036 #define __moSA_h
+00037
+00038 #include <eoOp.h>
+00039 #include <eoEvalFunc.h>
+00040
+00041 #include "moAlgo.h"
+00042 #include "moRandMove.h"
+00043 #include "moMoveIncrEval.h"
+00044 #include "moCoolingSchedule.h"
+00045 #include "moSolContinue.h"00046
+00047 #include <math.h>00048
-00058moSA (moRandMove < M > &__move_rand,
-00059 moMoveIncrEval < M > &__incr_eval,
-00060 moSolContinue < EOT > &__cont,
-00061 double __init_temp,
-00062 moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
-00063 move_rand (__move_rand),
-00064 incr_eval (__incr_eval),
-00065 cont (__cont),
-00066 init_temp (__init_temp),
-00067 cool_sched (__cool_sched),
-00068 full_eval (__full_eval)
-00069 {
-00070
-00071 }
-00072
-00074
-00080booloperator ()(EOT & __sol)
-00081 {
-00082
-00083 if (__sol.invalid ())
-00084 {
-00085 full_eval (__sol);
-00086 }
-00087
-00088 double temp = init_temp;
-00089
-00090 M move;
-00091
-00092 EOT best_sol = __sol;
+00050
+00053template < class M > class moSA:publicmoAlgo < typename M::EOType >
+00054 {
+00055
+00057 typedef
+00058 typename
+00059 M::EOType
+00060EOT;
+00061
+00063 typedef
+00064 typename
+00065 EOT::Fitness
+00066Fitness;
+00067
+00068 public:
+00069
+00071
+00081moSA (moRandMove < M > &__move_rand,
+00082 moMoveIncrEval < M > &__incr_eval,
+00083 moSolContinue < EOT > &__cont,
+00084 double __init_temp,
+00085 moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
+00086 move_rand (__move_rand),
+00087 incr_eval (__incr_eval),
+00088 cont (__cont),
+00089 init_temp (__init_temp),
+00090 cool_sched (__cool_sched),
+00091 full_eval (__full_eval)
+00092 {
00093
-00094 do
-00095 {
-00096
-00097 cont.init ();
-00098 do
-00099 {
-00100
-00101 move_rand (move);
-00102
-00103 Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
-00104
-00105 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
-00106 {
-00107
-00108 __sol.fitness (incr_eval (move, __sol));
-00109 move (__sol);
+00094 }
+00095
+00097
+00103booloperator ()(EOT & __sol)
+00104 {
+00105
+00106 if (__sol.invalid ())
+00107 {
+00108 full_eval (__sol);
+00109 }
00110
-00111 /* Updating the best solution found
-00112 until now ? */
-00113 if (__sol.fitness () > best_sol.fitness ())
-00114 best_sol = __sol;
-00115 }
+00111 double temp = init_temp;
+00112
+00113 M move;
+00114
+00115 EOT best_sol = __sol;
00116
-00117 }
-00118 while (cont (__sol));
+00117 do
+00118 {
00119
-00120 }
-00121 while (cool_sched (temp));
-00122
-00123 __sol = best_sol;
-00124
-00125 returntrue;
-00126 }
+00120 cont.init ();
+00121 do
+00122 {
+00123
+00124 move_rand (move);
+00125
+00126 Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
00127
-00128 private:
-00129
-00131 moRandMove < M > &move_rand;
-00132
-00134 moMoveIncrEval < M > &incr_eval;
-00135
-00137 moSolContinue < EOT > &cont;
-00138
-00140doubleinit_temp;
-00141
-00143moCoolingSchedule & cool_sched;
-00144
-00146 eoEvalFunc < EOT > &full_eval; // Full evaluator.
-00147 };
-00148
-00149 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+00128 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
+00129 {
+00130
+00131 __sol.fitness (incr_eval (move, __sol));
+00132 move (__sol);
+00133
+00134 /* Updating the best solution found
+00135 until now ? */
+00136 if (__sol.fitness () > best_sol.fitness ())
+00137 best_sol = __sol;
+00138 }
+00139
+00140 }
+00141 while (cont (__sol));
+00142
+00143 }
+00144 while (cool_sched (temp));
+00145
+00146 __sol = best_sol;
+00147
+00148 returntrue;
+00149 }
+00150
+00151 private:
+00152
+00154 moRandMove < M > &move_rand;
+00155
+00157 moMoveIncrEval < M > &incr_eval;
+00158
+00160 moSolContinue < EOT > &cont;
+00161
+00163doubleinit_temp;
+00164
+00166moCoolingSchedule & cool_sched;
+00167
+00169 eoEvalFunc < EOT > &full_eval; // Full evaluator.
+00170 };
+00171
+00172 #endif
+Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html
index e562d4398..52ead1be0 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moSimpleMoveTabuList.h Source File
-
+
00001 /* <moSimpleMoveTabuList.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Jean-Charles BOISSON: Jean-Charles.Boisson@lifl.fr
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moSimpleMoveTabuList_h
+00036 #define __moSimpleMoveTabuList_h
+00037
+00038 #include <list>
+00039 #include <iterator>00040
-00045 bool
-00046operator () (const M & __move, constEOT & __sol)
-00047 {
-00048 typename std::list<M>::iterator it;
-00049
-00050 it=tabuList.begin();
-00051 while(it!=tabuList.end()&&(!((*it)==__move)))
-00052 {
-00053 it++;
-00054 }
-00055
-00056 return it!=tabuList.end();
-00057 }
-00058
-00059 void
-00060add (const M & __move, constEOT & __sol)
-00061 {
-00062 if(currentSize!=0)
-00063 {
-00064 // Useful in the case of a move has been kept thanks to the moAspirCrit.
-00065 // In this case, the move can already be in the tabuList.
-00066 removeMove(__move);
-00067 }
-00068
-00069 tabuList.push_back(__move);
-00070
-00071 if(currentSize==maxSize)
-00072 {
-00073 tabuList.erase(tabuList.begin());
-00074 }
-00075 else
-00076 {
-00077 currentSize++;
-00078 }
-00079 }
-00080
-00081 void
-00082update ()
-00083 {
-00084 //nothing to do
-00085 }
-00086
-00087 void
-00088init ()
-00089 {
-00090 //nothing to do
-00091 }
-00092
-00093 private:
-00094
-00096
-00099 void
-00100removeMove(const M & __move)
-00101 {
-00102 typename std::list<M>::iterator it;
-00103
-00104 it=tabuList.begin();
-00105 while(it!=tabuList.end()&&(!((*it)==__move)))
-00106 {
-00107 it++;
-00108 }
+00041 #include "moTabuList.h"
+00042
+00044 template <class M>
+00045class moSimpleMoveTabuList: publicmoTabuList < M >
+00046 {
+00047
+00048 public:
+00049
+00051typedeftypename M::EOType EOT;
+00052
+00054 /*
+00055 \param __size The maximum size of the move tabu list.
+00056 */
+00057moSimpleMoveTabuList(unsignedint __size): maxSize(__size)
+00058 {
+00059 currentSize=0;
+00060 }
+00061
+00063
+00068 bool
+00069operator () (const M & __move, constEOT & __sol)
+00070 {
+00071 typename std::list<M>::iterator it;
+00072
+00073 it=tabuList.begin();
+00074 while(it!=tabuList.end()&&(!((*it)==__move)))
+00075 {
+00076 it++;
+00077 }
+00078
+00079 return it!=tabuList.end();
+00080 }
+00081
+00082 void
+00083add (const M & __move, constEOT & __sol)
+00084 {
+00085 if(currentSize!=0)
+00086 {
+00087 // Useful in the case of a move has been kept thanks to the moAspirCrit.
+00088 // In this case, the move can already be in the tabuList.
+00089 removeMove(__move);
+00090 }
+00091
+00092 tabuList.push_back(__move);
+00093
+00094 if(currentSize==maxSize)
+00095 {
+00096 tabuList.erase(tabuList.begin());
+00097 }
+00098 else
+00099 {
+00100 currentSize++;
+00101 }
+00102 }
+00103
+00104 void
+00105update ()
+00106 {
+00107 //nothing to do
+00108 }
00109
-00110 if(it!=tabuList.end())
-00111 {
-00112 tabuList.erase(it);
-00113 }
+00110 void
+00111init ()
+00112 {
+00113 //nothing to do00114 }
00115
-00117unsignedintmaxSize;
-00118
-00120unsignedintcurrentSize;
-00121
-00123 std::list<M> tabuList;
-00124 };
-00125
-00126 #endif
-
00001 /* <moSimpleSolutionTabuList.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moSimpleSolutionTabuList_h
+00036 #define __moSimpleSolutionTabuList_h
+00037
+00038 #include <list>
+00039 #include <iterator>00040
-00045booloperator () (const M & __move, constEOT & __sol)
-00046 {
-00047 typename std::list<EOT>::iterator it;
-00048
-00049 M _move=(M)__move;
-00050 EOT _sol=(EOT) __sol;
-00051
-00052 _move(_sol);
-00053
-00054 it=tabuList.begin();
-00055 while(it!=tabuList.end()&&(!((*it)==_sol)))
-00056 {
-00057 it++;
-00058 }
-00059
-00060 return it!=tabuList.end();
-00061 }
-00062
-00063 void
-00064add (const M & __move, constEOT & __sol)
-00065 {
-00066 M _move=(M)__move;
-00067 EOT _sol=(EOT) _sol;
-00068
-00069 _move(_sol);
-00070
-00071 if(currentSize!=0)
-00072 {
-00073 // Useful in the case of a solution has been kept thanks to the moAspirCrit.
-00074 // In this case, the solution can already be in the tabuList.
-00075 removeSolution(_sol);
-00076 }
-00077
-00078 tabuList.push_back(_sol);
-00079
-00080 if(currentSize==maxSize)
-00081 {
-00082 tabuList.erase(tabuList.begin());
-00083 }
-00084 else
-00085 {
-00086 currentSize++;
-00087 }
-00088 }
-00089
-00090 void
-00091update ()
-00092 {
-00093 //nothing to do
-00094 }
-00095
-00096 void
-00097init ()
-00098 {
-00099 //nothing to do
-00100 }
-00101
-00102 private:
-00103
-00105
-00108 void
-00109removeSolution(constEOT & __sol)
-00110 {
-00111 typename std::list<EOT>::iterator it;
+00041 #include "moTabuList.h"
+00042
+00044 template <class M>
+00045class moSimpleSolutionTabuList: publicmoTabuList < M >
+00046 {
+00047
+00048 public:
+00049
+00051typedeftypename M::EOType EOT;
+00052
+00054
+00057moSimpleSolutionTabuList(unsignedint __size): maxSize(__size)
+00058 {
+00059 currentSize=0;
+00060 }
+00061
+00063
+00068booloperator () (const M & __move, constEOT & __sol)
+00069 {
+00070 typename std::list<EOT>::iterator it;
+00071
+00072 M _move=(M)__move;
+00073 EOT _sol=(EOT) __sol;
+00074
+00075 _move(_sol);
+00076
+00077 it=tabuList.begin();
+00078 while(it!=tabuList.end()&&(!((*it)==_sol)))
+00079 {
+00080 it++;
+00081 }
+00082
+00083 return it!=tabuList.end();
+00084 }
+00085
+00086 void
+00087add (const M & __move, constEOT & __sol)
+00088 {
+00089 M _move=(M)__move;
+00090 EOT _sol=(EOT) _sol;
+00091
+00092 _move(_sol);
+00093
+00094 if(currentSize!=0)
+00095 {
+00096 // Useful in the case of a solution has been kept thanks to the moAspirCrit.
+00097 // In this case, the solution can already be in the tabuList.
+00098 removeSolution(_sol);
+00099 }
+00100
+00101 tabuList.push_back(_sol);
+00102
+00103 if(currentSize==maxSize)
+00104 {
+00105 tabuList.erase(tabuList.begin());
+00106 }
+00107 else
+00108 {
+00109 currentSize++;
+00110 }
+00111 }
00112
-00113 it=tabuList.begin();
-00114 while(it!=tabuList.end()&&(!((*it)==__sol)))
-00115 {
-00116 it++;
-00117 }
+00113 void
+00114update ()
+00115 {
+00116 //nothing to do
+00117 }
00118
-00119 if(it!=tabuList.end())
-00120 {
-00121 tabuList.erase(it);
-00122 }
+00119 void
+00120init ()
+00121 {
+00122 //nothing to do00123 }
-00124
-00126unsignedintmaxSize;
-00127
-00129unsignedintcurrentSize;
-00130
-00132 std::list<EOT> tabuList;
-00133 };
-00134
-00135 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+
+
+
moSolContinue.h
00001 /* <moSolContinue.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moSolContinue_h
+00036 #define __moSolContinue_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00045template < class EOT > class moSolContinue:publiceoUF < const EOT &, bool >
+00046 {
+00047
+00048 public:
+00050
+00053 virtualvoidinit () = 0;
+00054 };
+00055
+00056 #endif
+
Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_t_s_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_t_s_8h-source.html
index df2f8721f..210e634d5 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_t_s_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_t_s_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moTS.h Source File
-
+
00001 /* <moTS.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moTS_h
+00036 #define __moTS_h
+00037
+00038 #include <eoOp.h>
+00039 #include <eoEvalFunc.h>
+00040
+00041 #include "moAlgo.h"
+00042 #include "moSolContinue.h"00043
-00044 public:
-00045
+00044 #include "moMoveExpl.h"
+00045 #include "moTSMoveLoopExpl.h"
+00046
00047
-00058moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
-00059 (__move_init, __next_move, __incr_eval, __tabu_list,
-00060 __aspir_crit)), cont (__cont), full_eval (__full_eval)
-00061 {}
-00062
-00064
-00071moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
-00072 cont (__cont),
-00073 full_eval (__full_eval)
-00074 {}
-00075
-00077
-00085booloperator ()(EOT & __sol)
-00086 {
-00087 if (__sol.invalid ())
-00088 {
-00089 full_eval (__sol);
-00090 }
-00091
-00092 M move;
-00093
-00094 EOT best_sol = __sol, new_sol;
-00095
-00096 cont.init ();
-00097
-00098 do
-00099 {
+00049
+00052template < class M > class moTS:publicmoAlgo < typename M::EOType >
+00053 {
+00054
+00056 typedef
+00057 typename
+00058 M::EOType
+00059EOT;
+00060
+00062 typedef
+00063 typename
+00064 EOT::Fitness
+00065Fitness;
+00066
+00067 public:
+00068
+00070
+00081moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
+00082 (__move_init, __next_move, __incr_eval, __tabu_list,
+00083 __aspir_crit)), cont (__cont), full_eval (__full_eval)
+00084 {}
+00085
+00087
+00094moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
+00095 cont (__cont),
+00096 full_eval (__full_eval)
+00097 {}
+00098
00100
-00101 new_sol = __sol;
-00102
-00103 try
-00104 {
-00105
-00106 move_expl (__sol, new_sol);
-00107
-00108 }
-00109 catch (EmptySelection & __ex)
-00110 {
-00111
-00112 break;
-00113 }
+00108booloperator ()(EOT & __sol)
+00109 {
+00110 if (__sol.invalid ())
+00111 {
+00112 full_eval (__sol);
+00113 }
00114
-00115 /* Updating the best solution
-00116 found until now ? */
-00117 if (new_sol.fitness () > __sol.fitness ())
-00118 {
-00119 best_sol = new_sol;
-00120 }
-00121
-00122 __sol = new_sol;
+00115 M move;
+00116
+00117 EOT best_sol = __sol, new_sol;
+00118
+00119 cont.init ();
+00120
+00121 do
+00122 {
00123
-00124 }
-00125 while (cont (__sol));
-00126
-00127 __sol = best_sol;
-00128
-00129 returntrue;
-00130 }
-00131
-00132 private:
-00133
-00135 moMoveExpl < M > &move_expl;
-00136
-00138 moSolContinue < EOT > &cont;
-00139
-00141 eoEvalFunc < EOT > &full_eval;
-00142 };
-00143
-00144 #endif
-
00001 /* <moTSMoveLoopExpl.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moTSMoveLoopExpl_h
+00036 #define __moTSMoveLoopExpl_h
+00037
+00038 #include "moMoveLoopExpl.h"
+00039
+00040 #include "moMoveInit.h"
+00041 #include "moNextMove.h"
+00042 #include "moMoveIncrEval.h"
+00043 #include "moMoveSelect.h"
+00044
+00045 #include "moTabuList.h"
+00046 #include "moAspirCrit.h"
+00047 #include "moBestImprSelect.h"
+00048
+00050
+00053template < class M > class moTSMoveLoopExpl:publicmoMoveLoopExpl < M >
+00054 {
00055
-00056 tabu_list.init ();
-00057 aspir_crit.init ();
-00058 }
-00059
+00057typedeftypename M::EOType EOT;
+00058
+00060typedeftypename M::EOType::Fitness Fitness;
00061
-00069voidoperator () (constEOT & __old_sol, EOT & __new_sol)
-00070 {
-00071
-00072 M move;
-00073
-00074
-00075 move_init (move, __old_sol); /* Restarting the exploration of
-00076 of the neighborhood ! */
-00077
-00078 move_select.init (__old_sol.fitness ());
-00079
-00080 do
-00081 {
+00062 public:
+00063
+00065
+00072moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
+00073 move_init (__move_init),
+00074 next_move (__next_move),
+00075 incr_eval (__incr_eval),
+00076 tabu_list (__tabu_list), aspir_crit (__aspir_crit)
+00077 {
+00078
+00079 tabu_list.init ();
+00080 aspir_crit.init ();
+00081 }
00082
-00083 Fitness fit = incr_eval (move, __old_sol);
00084
-00085 if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
-00086 {
-00087 if (!move_select.update (move, fit))
-00088 break;
-00089 }
-00090
-00091 }
-00092 while (next_move (move, __old_sol));
-00093
-00094 M best_move;
-00095
-00096 Fitness best_move_fit;
+00092voidoperator () (constEOT & __old_sol, EOT & __new_sol)
+00093 {
+00094
+00095 M move;
+00096
00097
-00098 move_select (best_move, best_move_fit);
-00099
-00100 __new_sol.fitness (best_move_fit);
-00101 best_move (__new_sol);
+00098 move_init (move, __old_sol); /* Restarting the exploration of
+00099 of the neighborhood ! */
+00100
+00101 move_select.init (__old_sol.fitness ());
00102
-00103 /* Removing moves that are
-00104 no more tabu */
-00105 tabu_list.update ();
-00106
-00107 // Updating the tabu list
-00108 tabu_list.add (best_move, __new_sol);
-00109 }
-00110
-00111 private:
-00112
-00114 moMoveInit < M > &move_init;
-00115
-00117 moNextMove < M > &next_move;
+00103 do
+00104 {
+00105
+00106 Fitness fit = incr_eval (move, __old_sol);
+00107
+00108 if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
+00109 {
+00110 if (!move_select.update (move, fit))
+00111 break;
+00112 }
+00113
+00114 }
+00115 while (next_move (move, __old_sol));
+00116
+00117 M best_move;
00118
-00120 moMoveIncrEval < M > &incr_eval;
-00121
-00123 moBestImprSelect < M > move_select;
-00124
-00126 moTabuList < M > &tabu_list;
-00127
-00129 moAspirCrit < M > &aspir_crit;
-00130 };
-00131
-00132 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+00119 Fitness best_move_fit;
+00120
+00121 move_select (best_move, best_move_fit);
+00122
+00123 __new_sol.fitness (best_move_fit);
+00124 best_move (__new_sol);
+00125
+00126 /* Removing moves that are
+00127 no more tabu */
+00128 tabu_list.update ();
+00129
+00130 // Updating the tabu list
+00131 tabu_list.add (best_move, __new_sol);
+00132 }
+00133
+00134 private:
+00135
+00137 moMoveInit < M > &move_init;
+00138
+00140 moNextMove < M > &next_move;
+00141
+00143 moMoveIncrEval < M > &incr_eval;
+00144
+00146 moBestImprSelect < M > move_select;
+00147
+00149 moTabuList < M > &tabu_list;
+00150
+00152 moAspirCrit < M > &aspir_crit;
+00153 };
+00154
+00155 #endif
+Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html
index a7037144a..2bb1238ba 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html
@@ -1,15 +1,15 @@
-
+
PARADISEO-MO: moTabuList.h Source File
-
+
00001 /* <moTabuList.h>
+00002 *
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sebastien CAHON
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software. You can use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty and the software's author, the holder of the
+00017 * economic rights, and the successive licensors have only limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading, using, modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean that it is complicated to manipulate, and that also
+00023 * therefore means that it is reserved for developers and experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and, more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 */
+00034
+00035 #ifndef __moTabuList_h
+00036 #define __moTabuList_h
+00037
+00038 #include <eoFunctor.h>
+00039
+00041
+00045template < class M > class moTabuList:publiceoBF < const M &, const typename
+00046 M::EOType &,
+00047 bool >
+00048 {
00049
-00052 virtualvoid
-00053 init () = 0;
-00054 };
+00050 public:
+00052typedeftypename M::EOType EOT;
+00053
00055
-00056 #endif
-
Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by
+00061 virtualvoid
+00062 add (const M & __move, constEOT & __sol) = 0;
+00063
+00065
+00068 virtualvoid
+00069 update () = 0;
+00070
+00072
+00075 virtualvoid
+00076 init () = 0;
+00077 };
+00078
+00079 #endif
+Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by
- 1.4.7
+ 1.5.2
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.idx b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.idx
index 9acfc7ce9..3ba4e0f48 100644
Binary files a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.idx and b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.idx differ
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.php b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.php
index 4728886ec..88cba2ac4 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.php
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/html/search.php
@@ -1,10 +1,10 @@
-
+
Search
-
+
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/annotated.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/annotated.tex
index cef418d52..d9ae06077 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/annotated.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/annotated.tex
@@ -1,34 +1,34 @@
\section{PARADISEO-MO Class List}
Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList}
-\item\contentsline{section}{\bf{Empty\-Selection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{}
-\item\contentsline{section}{\bf{mo\-Algo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{}
-\item\contentsline{section}{\bf{mo\-Aspir\-Crit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{}
-\item\contentsline{section}{\bf{mo\-Best\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{}
-\item\contentsline{section}{\bf{mo\-Cooling\-Schedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{}
-\item\contentsline{section}{\bf{mo\-Exponential\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{}
-\item\contentsline{section}{\bf{mo\-First\-Impr\-Select$<$ M $>$} (One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{}
-\item\contentsline{section}{\bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{}
-\item\contentsline{section}{\bf{mo\-HC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{}
-\item\contentsline{section}{\bf{mo\-HCMove\-Loop\-Expl$<$ M $>$} (Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{}
-\item\contentsline{section}{\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} (One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
-\item\contentsline{section}{\bf{mo\-It\-Rand\-Next\-Move$<$ M $>$} (One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{}
-\item\contentsline{section}{\bf{mo\-Linear\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{}
-\item\contentsline{section}{\bf{mo\-LSCheck\-Point$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{}
-\item\contentsline{section}{\bf{mo\-Move$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{}
-\item\contentsline{section}{\bf{mo\-Move\-Expl$<$ M $>$} (Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{}
-\item\contentsline{section}{\bf{mo\-Move\-Incr\-Eval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{}
-\item\contentsline{section}{\bf{mo\-Move\-Init$<$ M $>$} (Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{}
-\item\contentsline{section}{\bf{mo\-Move\-Loop\-Expl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{}
-\item\contentsline{section}{\bf{mo\-Move\-Select$<$ M $>$} (Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{}
-\item\contentsline{section}{\bf{mo\-Next\-Move$<$ M $>$} (Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{}
-\item\contentsline{section}{\bf{mo\-No\-Aspir\-Crit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{}
-\item\contentsline{section}{\bf{mo\-Rand\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{}
-\item\contentsline{section}{\bf{mo\-Rand\-Move$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{}
-\item\contentsline{section}{\bf{mo\-SA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{}
-\item\contentsline{section}{\bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{}
-\item\contentsline{section}{\bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{}
-\item\contentsline{section}{\bf{mo\-Sol\-Continue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{}
-\item\contentsline{section}{\bf{mo\-Tabu\-List$<$ M $>$} (Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{}
-\item\contentsline{section}{\bf{mo\-TS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{}
-\item\contentsline{section}{\bf{mo\-TSMove\-Loop\-Expl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{}
+\item\contentsline{section}{{\bf EmptySelection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{}
+\item\contentsline{section}{{\bf moAlgo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{}
+\item\contentsline{section}{{\bf moAspirCrit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{}
+\item\contentsline{section}{{\bf moBestImprSelect$<$ M $>$} (One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{}
+\item\contentsline{section}{{\bf moCoolingSchedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{}
+\item\contentsline{section}{{\bf moExponentialCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{}
+\item\contentsline{section}{{\bf moFirstImprSelect$<$ M $>$} (One possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{}
+\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{}
+\item\contentsline{section}{{\bf moHC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{}
+\item\contentsline{section}{{\bf moHCMoveLoopExpl$<$ M $>$} (Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{}
+\item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
+\item\contentsline{section}{{\bf moItRandNextMove$<$ M $>$} (One of the possible \doxyref{moNextMove}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{}
+\item\contentsline{section}{{\bf moLinearCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{}
+\item\contentsline{section}{{\bf moLSCheckPoint$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{}
+\item\contentsline{section}{{\bf moMove$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{}
+\item\contentsline{section}{{\bf moMoveExpl$<$ M $>$} (Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{}
+\item\contentsline{section}{{\bf moMoveIncrEval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{}
+\item\contentsline{section}{{\bf moMoveInit$<$ M $>$} (Move (\doxyref{moMove}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{}
+\item\contentsline{section}{{\bf moMoveLoopExpl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{}
+\item\contentsline{section}{{\bf moMoveSelect$<$ M $>$} (Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{}
+\item\contentsline{section}{{\bf moNextMove$<$ M $>$} (Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{}
+\item\contentsline{section}{{\bf moNoAspirCrit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{}
+\item\contentsline{section}{{\bf moRandImprSelect$<$ M $>$} (One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{}
+\item\contentsline{section}{{\bf moRandMove$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{}
+\item\contentsline{section}{{\bf moSA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{}
+\item\contentsline{section}{{\bf moSimpleMoveTabuList$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{}
+\item\contentsline{section}{{\bf moSimpleSolutionTabuList$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{}
+\item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{}
+\item\contentsline{section}{{\bf moTabuList$<$ M $>$} (Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{}
+\item\contentsline{section}{{\bf moTS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{}
+\item\contentsline{section}{{\bf moTSMoveLoopExpl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{}
\end{CompactList}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/class_empty_selection.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/class_empty_selection.tex
index 4b44303b4..650a35b4c 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/class_empty_selection.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/class_empty_selection.tex
@@ -1,9 +1,9 @@
-\section{Empty\-Selection Class Reference}
+\section{EmptySelection Class Reference}
\label{class_empty_selection}\index{EmptySelection@{EmptySelection}}
Special class that describes the case of no selection.
-{\tt \#include $<$mo\-Move\-Select.h$>$}
+{\tt \#include $<$moMoveSelect.h$>$}
@@ -14,8 +14,8 @@ This class is used as an exception that can be thrown if a solution selector has
-Definition at line 21 of file mo\-Move\-Select.h.
+Definition at line 44 of file moMoveSelect.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move\-Select.h\end{CompactItemize}
+moMoveSelect.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_algo.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_algo.tex
index bfd2994a6..69f099310 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_algo.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_algo.tex
@@ -1,11 +1,11 @@
-\section{mo\-Algo$<$ EOT $>$ Class Template Reference}
+\section{moAlgo$<$ EOT $>$ Class Template Reference}
\label{classmo_algo}\index{moAlgo@{moAlgo}}
Description of an algorithm of the paradiseo-mo library.
-{\tt \#include $<$mo\-Algo.h$>$}
+{\tt \#include $<$moAlgo.h$>$}
-Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_algo}
@@ -14,16 +14,16 @@ Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class mo\-Algo$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class moAlgo$<$ EOT $>$}
Description of an algorithm of the paradiseo-mo library.
-\doxyref{mo\-HC}{p.}{classmo_h_c}, \doxyref{mo\-TS}{p.}{classmo_t_s} and \doxyref{mo\-SA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library.
+\doxyref{moHC}{p.}{classmo_h_c}, \doxyref{moTS}{p.}{classmo_t_s} and \doxyref{moSA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library.
-Definition at line 21 of file mo\-Algo.h.
+Definition at line 44 of file moAlgo.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Algo.h\end{CompactItemize}
+moAlgo.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
index 7a0252d70..da056c4c6 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 218.579
+%%BoundingBox: 0 0 500 119.76
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 4.175 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -174,7 +174,7 @@
boxfont setfont
1 boundaspect scale
(moAspirCrit< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType::Fitness &, bool >) cw
(eoFunctorBase) cw
(moImprBestFitAspirCrit< M >) cw
(moNoAspirCrit< M >) cw
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moAspirCrit< M >) 0.5 1 box
- (eoBF< A1, A2, R >) 0.5 2 box
+ (eoBF< const M &, const M::EOType::Fitness &, bool >) 0.5 2 box
(eoFunctorBase) 0.5 3 box
(moImprBestFitAspirCrit< M >) 0 0 box
(moNoAspirCrit< M >) 1 0 box
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
index 8349f497a..2089d5845 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
@@ -1,46 +1,46 @@
-\section{mo\-Aspir\-Crit$<$ M $>$ Class Template Reference}
+\section{moAspirCrit$<$ M $>$ Class Template Reference}
\label{classmo_aspir_crit}\index{moAspirCrit@{moAspirCrit}}
Description of the conditions in which a tabu move could be accepted.
-{\tt \#include $<$mo\-Aspir\-Crit.h$>$}
+{\tt \#include $<$moAspirCrit.h$>$}
-Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_aspir_crit}
+\includegraphics[height=3.35329cm]{classmo_aspir_crit}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void \bf{init} ()=0
+virtual void {\bf init} ()=0
\begin{CompactList}\small\item\em Procedure which initialises all that needs a aspiration criterion. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Aspir\-Crit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moAspirCrit$<$ M $>$}
Description of the conditions in which a tabu move could be accepted.
-It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. See mo\-No\-Aspri\-Crit for example.
+It is only a description... An object that herits from this class is needed to be used in a \doxyref{moTS}{p.}{classmo_t_s}. See moNoAspriCrit for example.
-Definition at line 22 of file mo\-Aspir\-Crit.h.
+Definition at line 45 of file moAspirCrit.h.
\subsection{Member Function Documentation}
-\index{moAspirCrit@{mo\-Aspir\-Crit}!init@{init}}
-\index{init@{init}!moAspirCrit@{mo\-Aspir\-Crit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}
+\index{moAspirCrit@{moAspirCrit}!init@{init}}
+\index{init@{init}!moAspirCrit@{moAspirCrit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}
Procedure which initialises all that needs a aspiration criterion.
It can be possible that this procedure do nothing...
-Implemented in \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and \bf{mo\-No\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}.
+Implemented in {\bf moImprBestFitAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and {\bf moNoAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Aspir\-Crit.h\end{CompactItemize}
+moAspirCrit.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
index f0598e3a1..76257a720 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
@@ -1,11 +1,11 @@
-\section{mo\-Best\-Impr\-Select$<$ M $>$ Class Template Reference}
+\section{moBestImprSelect$<$ M $>$ Class Template Reference}
\label{classmo_best_impr_select}\index{moBestImprSelect@{moBestImprSelect}}
-One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
+One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
-{\tt \#include $<$mo\-Best\-Impr\-Select.h$>$}
+{\tt \#include $<$moBestImprSelect.h$>$}
-Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_best_impr_select}
@@ -14,53 +14,53 @@ Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H]
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}
+void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}
\begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item
-bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)
-\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
-void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection)
+bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)
+\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
+void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection)
\begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-bool \bf{first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13}
+bool {\bf first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13}
\begin{CompactList}\small\item\em Allowing to know if at least one move has been generated. \item\end{CompactList}\item
-M \bf{best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a}
+M {\bf best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a}
\begin{CompactList}\small\item\em The best move. \item\end{CompactList}\item
-\bf{Fitness} \bf{best\_\-fit}\label{classmo_best_impr_select_dcac897424b5805f146bb1dbb429f2fe}
+{\bf Fitness} {\bf best\_\-fit}\label{classmo_best_impr_select_dcac897424b5805f146bb1dbb429f2fe}
\begin{CompactList}\small\item\em The best fitness. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Best\-Impr\-Select$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moBestImprSelect$<$ M $>$}
-One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
+One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
All neighbors are considered, and the movement which enables the best improvement is selected.
-Definition at line 22 of file mo\-Best\-Impr\-Select.h.
+Definition at line 45 of file moBestImprSelect.h.
\subsection{Member Function Documentation}
-\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!update@{update}}
-\index{update@{update}!moBestImprSelect@{mo\-Best\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}
+\index{moBestImprSelect@{moBestImprSelect}!update@{update}}
+\index{update@{update}!moBestImprSelect@{moBestImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moBestImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}
-\doxyref{Function} that indicates if the current move has not improved the fitness.
+{\bf Function} that indicates if the current move has not improved the fitness.
-If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) and the fitness linked to this move are saved.
+If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) and the fitness linked to this move are saved.
\begin{Desc}
\item[Parameters:]
@@ -71,13 +71,13 @@ If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{cla
\item[Returns:]TRUE if the move does not improve the fitness. \end{Desc}
-Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}.
+Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}.
-Definition at line 47 of file mo\-Best\-Impr\-Select.h.
+Definition at line 70 of file moBestImprSelect.h.
-References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}}
-\index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da}
+References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.\index{moBestImprSelect@{moBestImprSelect}!operator()@{operator()}}
+\index{operator()@{operator()}!moBestImprSelect@{moBestImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da}
Procedure which saved the best move and fitness.
@@ -90,16 +90,16 @@ Procedure which saved the best move and fitness.
\begin{Desc}
\item[Exceptions:]
\begin{description}
-\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description}
+\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description}
\end{Desc}
-Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
-Definition at line 68 of file mo\-Best\-Impr\-Select.h.
+Definition at line 91 of file moBestImprSelect.h.
-References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.
+References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Best\-Impr\-Select.h\end{CompactItemize}
+moBestImprSelect.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
index 65e4977be..b293469d7 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
@@ -1,11 +1,11 @@
-\section{mo\-Cooling\-Schedule Class Reference}
+\section{moCoolingSchedule Class Reference}
\label{classmo_cooling_schedule}\index{moCoolingSchedule@{moCoolingSchedule}}
This class gives the description of a cooling schedule.
-{\tt \#include $<$mo\-Cooling\-Schedule.h$>$}
+{\tt \#include $<$moCoolingSchedule.h$>$}
-Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H]
+Inheritance diagram for moCoolingSchedule::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_cooling_schedule}
@@ -16,12 +16,12 @@ Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H]
\subsection{Detailed Description}
This class gives the description of a cooling schedule.
-It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-SA}{p.}{classmo_s_a}. See \doxyref{mo\-Exponential\-Cooling\-Schedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{mo\-Linear\-Cooling\-Schedule}{p.}{classmo_linear_cooling_schedule} for example.
+It is only a description... An object that herits from this class is needed to be used in a \doxyref{moSA}{p.}{classmo_s_a}. See \doxyref{moExponentialCoolingSchedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{moLinearCoolingSchedule}{p.}{classmo_linear_cooling_schedule} for example.
-Definition at line 22 of file mo\-Cooling\-Schedule.h.
+Definition at line 45 of file moCoolingSchedule.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Cooling\-Schedule.h\end{CompactItemize}
+moCoolingSchedule.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
index 728025e98..570122acb 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
@@ -1,11 +1,11 @@
-\section{mo\-Exponential\-Cooling\-Schedule Class Reference}
+\section{moExponentialCoolingSchedule Class Reference}
\label{classmo_exponential_cooling_schedule}\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
-One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
-{\tt \#include $<$mo\-Exponential\-Cooling\-Schedule.h$>$}
+{\tt \#include $<$moExponentialCoolingSchedule.h$>$}
-Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H]
+Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_exponential_cooling_schedule}
@@ -14,34 +14,34 @@ Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-Exponential\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-ratio)
+{\bf moExponentialCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-ratio)
\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item
-bool \bf{operator()} (double \&\_\-\_\-temp)
-\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
+bool {\bf operator()} (double \&\_\-\_\-temp)
+\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-double \bf{threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84}
+double {\bf threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84}
\begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item
-double \bf{ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa}
+double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa}
\begin{CompactList}\small\item\em The decreasing factor of the temperature. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.
-Definition at line 22 of file mo\-Exponential\-Cooling\-Schedule.h.
+Definition at line 45 of file moExponentialCoolingSchedule.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
-\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Exponential\-Cooling\-Schedule::mo\-Exponential\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc}
+\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
+\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moExponentialCoolingSchedule::moExponentialCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc}
Simple constructor.
@@ -53,15 +53,15 @@ Simple constructor.
\end{Desc}
-Definition at line 31 of file mo\-Exponential\-Cooling\-Schedule.h.
+Definition at line 54 of file moExponentialCoolingSchedule.h.
\subsection{Member Function Documentation}
-\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}}
-\index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db}
+\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!operator()@{operator()}}
+\index{operator()@{operator()}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db}
-\doxyref{Function} which proceeds to the cooling.
+{\bf Function} which proceeds to the cooling.
It decreases the temperature and indicates if it is greater than the threshold.
@@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold.
\item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc}
-Implements \bf{eo\-UF$<$ double \&, bool $>$}.
+Implements {\bf eoUF$<$ double \&, bool $>$}.
-Definition at line 41 of file mo\-Exponential\-Cooling\-Schedule.h.
+Definition at line 64 of file moExponentialCoolingSchedule.h.
References ratio, and threshold.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Exponential\-Cooling\-Schedule.h\end{CompactItemize}
+moExponentialCoolingSchedule.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
index 68e591cc4..5892c2529 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
@@ -1,11 +1,11 @@
-\section{mo\-First\-Impr\-Select$<$ M $>$ Class Template Reference}
+\section{moFirstImprSelect$<$ M $>$ Class Template Reference}
\label{classmo_first_impr_select}\index{moFirstImprSelect@{moFirstImprSelect}}
-One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
+One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
-{\tt \#include $<$mo\-First\-Impr\-Select.h$>$}
+{\tt \#include $<$moFirstImprSelect.h$>$}
-Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_first_impr_select}
@@ -14,68 +14,68 @@ Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H]
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)
+virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)
\begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item
-bool \bf{update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit)
-\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
-void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection)
+bool {\bf update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit)
+\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
+void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection)
\begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-bool \bf{valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c}
+bool {\bf valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c}
\begin{CompactList}\small\item\em Allow to know if at least one move has improved the solution. \item\end{CompactList}\item
-M \bf{best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c}
+M {\bf best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c}
\begin{CompactList}\small\item\em Best stored movement. \item\end{CompactList}\item
-\bf{Fitness} \bf{init\_\-fit}\label{classmo_first_impr_select_ce7ba63e8cc3a9164f4e546477e98ca8}
+{\bf Fitness} {\bf init\_\-fit}\label{classmo_first_impr_select_ce7ba63e8cc3a9164f4e546477e98ca8}
\begin{CompactList}\small\item\em Initial fitness. \item\end{CompactList}\item
-\bf{Fitness} \bf{best\_\-fit}\label{classmo_first_impr_select_e1190347b76ec6fe717be32354b4a9a9}
+{\bf Fitness} {\bf best\_\-fit}\label{classmo_first_impr_select_e1190347b76ec6fe717be32354b4a9a9}
\begin{CompactList}\small\item\em Best stored fitness. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-First\-Impr\-Select$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moFirstImprSelect$<$ M $>$}
-One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
+One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
The neighborhood is explored until a move enables an improvment of the current solution.
-Definition at line 23 of file mo\-First\-Impr\-Select.h.
+Definition at line 46 of file moFirstImprSelect.h.
\subsection{Member Function Documentation}
-\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!init@{init}}
-\index{init@{init}!moFirstImprSelect@{mo\-First\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-First\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}
+\index{moFirstImprSelect@{moFirstImprSelect}!init@{init}}
+\index{init@{init}!moFirstImprSelect@{moFirstImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moFirstImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}
Procedure which initialise the exploration.
It save the current fitness as the initial value for the fitness.
-Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}.
+Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}.
-Definition at line 35 of file mo\-First\-Impr\-Select.h.
+Definition at line 58 of file moFirstImprSelect.h.
-References mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!update@{update}}
-\index{update@{update}!moFirstImprSelect@{mo\-First\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0}
+References moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!update@{update}}
+\index{update@{update}!moFirstImprSelect@{moFirstImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moFirstImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0}
-\doxyref{Function} that indicates if the current move has not improved the fitness.
+{\bf Function} that indicates if the current move has not improved the fitness.
-If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) should be applied to the current solution.
+If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) should be applied to the current solution.
\begin{Desc}
\item[Parameters:]
@@ -86,11 +86,11 @@ If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{cla
\item[Returns:]TRUE if the move does not improve the fitness. \end{Desc}
-Definition at line 52 of file mo\-First\-Impr\-Select.h.
+Definition at line 75 of file moFirstImprSelect.h.
-References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}}
-\index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95}
+References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!operator()@{operator()}}
+\index{operator()@{operator()}!moFirstImprSelect@{moFirstImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moFirstImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95}
Procedure which saved the best move and fitness.
@@ -103,16 +103,16 @@ Procedure which saved the best move and fitness.
\begin{Desc}
\item[Exceptions:]
\begin{description}
-\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description}
+\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description}
\end{Desc}
-Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
-Definition at line 76 of file mo\-First\-Impr\-Select.h.
+Definition at line 99 of file moFirstImprSelect.h.
-References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid.
+References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-First\-Impr\-Select.h\end{CompactItemize}
+moFirstImprSelect.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
index e123e64bb..e92335507 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
@@ -1,11 +1,11 @@
-\section{mo\-Gen\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
+\section{moGenSolContinue$<$ EOT $>$ Class Template Reference}
\label{classmo_gen_sol_continue}\index{moGenSolContinue@{moGenSolContinue}}
One possible stop criterion for a solution-based heuristic.
-{\tt \#include $<$mo\-Gen\-Sol\-Continue.h$>$}
+{\tt \#include $<$moGenSolContinue.h$>$}
-Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_gen_sol_continue}
@@ -14,25 +14,25 @@ Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-Gen\-Sol\-Continue} (unsigned int \_\-\_\-max\-Num\-Gen)
+{\bf moGenSolContinue} (unsigned int \_\-\_\-maxNumGen)
\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item
-bool \bf{operator()} (const EOT \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} that activates the stop criterion. \item\end{CompactList}\item
-void \bf{init} ()
+bool {\bf operator()} (const EOT \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} that activates the stop criterion. \item\end{CompactList}\item
+void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int \bf{max\-Num\-Gen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a}
+unsigned int {\bf maxNumGen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a}
\begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item
-unsigned int \bf{num\-Gen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c}
+unsigned int {\bf numGen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c}
\begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class mo\-Gen\-Sol\-Continue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class moGenSolContinue$<$ EOT $>$}
One possible stop criterion for a solution-based heuristic.
@@ -40,12 +40,12 @@ The stop criterion corresponds to a maximum number of iteration.
-Definition at line 21 of file mo\-Gen\-Sol\-Continue.h.
+Definition at line 44 of file moGenSolContinue.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!moGenSolContinue@{moGenSolContinue}}
-\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Gen\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Num\-Gen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b}
+\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}}
+\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moGenSolContinue}$<$ EOT $>$::{\bf moGenSolContinue} (unsigned int {\em \_\-\_\-maxNumGen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b}
Simple constructor.
@@ -53,19 +53,19 @@ Simple constructor.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-\_\-max\-Num\-Gen}]the maximum number of generation. \end{description}
+\item[{\em \_\-\_\-maxNumGen}]the maximum number of generation. \end{description}
\end{Desc}
-Definition at line 30 of file mo\-Gen\-Sol\-Continue.h.
+Definition at line 53 of file moGenSolContinue.h.
\subsection{Member Function Documentation}
-\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}}
-\index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61}
+\index{moGenSolContinue@{moGenSolContinue}!operator()@{operator()}}
+\index{operator()@{operator()}!moGenSolContinue@{moGenSolContinue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moGenSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61}
-\doxyref{Function} that activates the stop criterion.
+{\bf Function} that activates the stop criterion.
Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.
@@ -78,25 +78,25 @@ Increments the counter and returns TRUE if the current number of iteration is lo
\item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc}
-Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}.
+Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
-Definition at line 44 of file mo\-Gen\-Sol\-Continue.h.
+Definition at line 67 of file moGenSolContinue.h.
-References mo\-Gen\-Sol\-Continue$<$ EOT $>$::max\-Num\-Gen, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}}
-\index{init@{init}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}
+References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}}
+\index{init@{init}!moGenSolContinue@{moGenSolContinue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moGenSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}
Procedure which allows to initialise the generation counter.
It can also be used to reset the iteration counter.
-Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
+Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
-Definition at line 54 of file mo\-Gen\-Sol\-Continue.h.
+Definition at line 77 of file moGenSolContinue.h.
-References mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.
+References moGenSolContinue$<$ EOT $>$::numGen.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Gen\-Sol\-Continue.h\end{CompactItemize}
+moGenSolContinue.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c.tex
index ef82357b0..84cd8c6f4 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c.tex
@@ -1,11 +1,11 @@
-\section{mo\-HC$<$ M $>$ Class Template Reference}
+\section{moHC$<$ M $>$ Class Template Reference}
\label{classmo_h_c}\index{moHC@{moHC}}
Hill Climbing (HC).
-{\tt \#include $<$mo\-HC.h$>$}
+{\tt \#include $<$moHC.h$>$}
-Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=5cm]{classmo_h_c}
@@ -14,34 +14,34 @@ Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item
-\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item
-bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} which launches the HC. \item\end{CompactList}\end{CompactItemize}
+bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} which launches the HC. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb}
+typedef M::EOType {\bf EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness \bf{Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027}
+typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103}
+{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103}
\begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item
-\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736}
+{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736}
\begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-HC$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moHC$<$ M $>$}
Hill Climbing (HC).
@@ -49,17 +49,17 @@ Class which describes the algorithm for a hill climbing.
-Definition at line 26 of file mo\-HC.h.
+Definition at line 49 of file moHC.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moHC@{mo\-HC}!moHC@{moHC}}
-\index{moHC@{moHC}!moHC@{mo\-HC}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7}
+\index{moHC@{moHC}!moHC@{moHC}}
+\index{moHC@{moHC}!moHC@{moHC}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7}
Full constructor.
-All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}.
+All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}.
\begin{Desc}
\item[Parameters:]
@@ -68,14 +68,14 @@ All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl
\end{Desc}
-Definition at line 53 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}}
-\index{moHC@{moHC}!moHC@{mo\-HC}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65}
+Definition at line 76 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}}
+\index{moHC@{moHC}!moHC@{moHC}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65}
Light constructor.
-This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_expl} (generally not a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}).
+This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl} (generally not a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}).
\begin{Desc}
\item[Parameters:]
@@ -84,17 +84,17 @@ This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_
\end{Desc}
-Definition at line 67 of file mo\-HC.h.
+Definition at line 90 of file moHC.h.
\subsection{Member Function Documentation}
-\index{moHC@{mo\-HC}!operator()@{operator()}}
-\index{operator()@{operator()}!moHC@{mo\-HC}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-HC}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010}
+\index{moHC@{moHC}!operator()@{operator()}}
+\index{operator()@{operator()}!moHC@{moHC}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moHC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010}
-\doxyref{Function} which launches the HC.
+{\bf Function} which launches the HC.
-The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.
+The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.
\begin{Desc}
\item[Parameters:]
@@ -105,12 +105,12 @@ The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_
\item[Returns:]TRUE. \end{Desc}
-Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}.
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
-Definition at line 82 of file mo\-HC.h.
+Definition at line 105 of file moHC.h.
-References mo\-HC$<$ M $>$::full\_\-eval, and mo\-HC$<$ M $>$::move\_\-expl.
+References moHC$<$ M $>$::full\_\-eval, and moHC$<$ M $>$::move\_\-expl.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-HC.h\end{CompactItemize}
+moHC.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
index 8b96d664a..3dfccfef3 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
@@ -1,11 +1,11 @@
-\section{mo\-HCMove\-Loop\-Expl$<$ M $>$ Class Template Reference}
+\section{moHCMoveLoopExpl$<$ M $>$ Class Template Reference}
\label{classmo_h_c_move_loop_expl}\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}}
-Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}.
+Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}.
-{\tt \#include $<$mo\-HCMove\-Loop\-Expl.h$>$}
+{\tt \#include $<$moHCMoveLoopExpl.h$>$}
-Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=5cm]{classmo_h_c_move_loop_expl}
@@ -14,49 +14,49 @@ Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select)
+{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select)
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-void \bf{operator()} (const \bf{EOT} \&\_\-\_\-old\_\-sol, \bf{EOT} \&\_\-\_\-new\_\-sol)
+void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol)
\begin{CompactList}\small\item\em Procedure which launches the explorer. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9}
+typedef M::EOType {\bf EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc}
+{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc}
\begin{CompactList}\small\item\em Move initialiser. \item\end{CompactList}\item
-\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443}
+{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443}
\begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item
-\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779}
+{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779}
\begin{CompactList}\small\item\em (generally) Efficient evaluation. \item\end{CompactList}\item
-\bf{mo\-Move\-Select}$<$ M $>$ \& \bf{move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb}
+{\bf moMoveSelect}$<$ M $>$ \& {\bf move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb}
\begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-HCMove\-Loop\-Expl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moHCMoveLoopExpl$<$ M $>$}
-Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}.
+Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}.
-Definition at line 23 of file mo\-HCMove\-Loop\-Expl.h.
+Definition at line 46 of file moHCMoveLoopExpl.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
-\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5}
+\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
+\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHCMoveLoopExpl}$<$ M $>$::{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5}
Constructor.
@@ -70,12 +70,12 @@ All the boxes have to be specified.
\end{Desc}
-Definition at line 43 of file mo\-HCMove\-Loop\-Expl.h.
+Definition at line 66 of file moHCMoveLoopExpl.h.
\subsection{Member Function Documentation}
-\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}}
-\index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-\_\-old\_\-sol}, \bf{EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb}
+\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!operator()@{operator()}}
+\index{operator()@{operator()}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moHCMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb}
Procedure which launches the explorer.
@@ -89,12 +89,12 @@ The exploration starts from an old solution and provides a new solution.
\end{Desc}
-Implements \bf{eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}.
+Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}.
-Definition at line 59 of file mo\-HCMove\-Loop\-Expl.h.
+Definition at line 82 of file moHCMoveLoopExpl.h.
-References mo\-HCMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-select, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move.
+References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-HCMove\-Loop\-Expl.h\end{CompactItemize}
+moHCMoveLoopExpl.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
index a00a3c3cb..b569936e2 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 437.158
+%%BoundingBox: 0 0 500 239.521
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.14375 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -175,7 +175,7 @@ boxfont setfont
1 boundaspect scale
(moImprBestFitAspirCrit< M >) cw
(moAspirCrit< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType::Fitness &, bool >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
(moImprBestFitAspirCrit< M >) 0 0 box
(moAspirCrit< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
+ (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box
(eoFunctorBase) 0 3 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
index c1ffc5c16..cab85f0cb 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
@@ -1,11 +1,11 @@
-\section{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$ Class Template Reference}
+\section{moImprBestFitAspirCrit$<$ M $>$ Class Template Reference}
\label{classmo_impr_best_fit_aspir_crit}\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}}
-One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}.
+One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}.
-{\tt \#include $<$mo\-Impr\-Best\-Fit\-Aspir\-Crit.h$>$}
+{\tt \#include $<$moImprBestFitAspirCrit.h$>$}
-Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit}
@@ -14,49 +14,49 @@ Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340}
+{\bf moImprBestFitAspirCrit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340}
\begin{CompactList}\small\item\em Contructor. \item\end{CompactList}\item
-void \bf{init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}
+void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}
\begin{CompactList}\small\item\em Initialisation procedure. \item\end{CompactList}\item
-bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)
-\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize}
+bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)
+\begin{CompactList}\small\item\em {\bf Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{Fitness} \bf{best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3}
+{\bf Fitness} {\bf best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3}
\begin{CompactList}\small\item\em Best fitness found until now. \item\end{CompactList}\item
-bool \bf{first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265}
+bool {\bf first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265}
\begin{CompactList}\small\item\em Indicates that a fitness has been already saved or not. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moImprBestFitAspirCrit$<$ M $>$}
-One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}.
+One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}.
This criterion is satisfied when a given fitness is the best ever considered.
-Definition at line 22 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h.
+Definition at line 45 of file moImprBestFitAspirCrit.h.
\subsection{Member Function Documentation}
-\index{moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}!operator()@{operator()}}
-\index{operator()@{operator()}!moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b}
+\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}!operator()@{operator()}}
+\index{operator()@{operator()}!moImprBestFitAspirCrit@{moImprBestFitAspirCrit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moImprBestFitAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b}
-\doxyref{Function} that indicates if the fit is better that the already saved fit.
+{\bf Function} that indicates if the fit is better that the already saved fit.
The first time, the function only saved the current move and fitness.
@@ -69,10 +69,12 @@ The first time, the function only saved the current move and fitness.
\item[Returns:]TRUE the first time and if \_\-\_\-fit $>$ best\_\-fit, else FALSE. \end{Desc}
-Definition at line 52 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h.
+Implements {\bf eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>$}.
-References mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::best\_\-fit, and mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::first\_\-time.
+Definition at line 75 of file moImprBestFitAspirCrit.h.
+
+References moImprBestFitAspirCrit$<$ M $>$::best\_\-fit, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Impr\-Best\-Fit\-Aspir\-Crit.h\end{CompactItemize}
+moImprBestFitAspirCrit.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
index 5f2df0014..3c5267824 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 490.798
+%%BoundingBox: 0 0 500 316.206
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -175,7 +175,7 @@ boxfont setfont
1 boundaspect scale
(moItRandNextMove< M >) cw
(moNextMove< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< M &, const M::EOType &, bool >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
(moItRandNextMove< M >) 0 0 box
(moNextMove< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
+ (eoBF< M &, const M::EOType &, bool >) 0 2 box
(eoFunctorBase) 0 3 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
index b14d59d18..80c6d17dd 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
@@ -1,11 +1,11 @@
-\section{mo\-It\-Rand\-Next\-Move$<$ M $>$ Class Template Reference}
+\section{moItRandNextMove$<$ M $>$ Class Template Reference}
\label{classmo_it_rand_next_move}\index{moItRandNextMove@{moItRandNextMove}}
-One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}.
+One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}.
-{\tt \#include $<$mo\-It\-Rand\-Next\-Move.h$>$}
+{\tt \#include $<$moItRandNextMove.h$>$}
-Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_it_rand_next_move}
@@ -14,50 +14,50 @@ Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter)
+{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter)
\begin{CompactList}\small\item\em The constructor. \item\end{CompactList}\item
-bool \bf{operator()} (M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)
+bool {\bf operator()} (M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em Generation of a new move. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf}
+typedef M::EOType {\bf EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459}
+{\bf moRandMove}$<$ M $>$ \& {\bf rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459}
\begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item
-unsigned int \bf{max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033}
+unsigned int {\bf max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033}
\begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item
-unsigned int \bf{num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b}
+unsigned int {\bf num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b}
\begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-It\-Rand\-Next\-Move$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moItRandNextMove$<$ M $>$}
-One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}.
+One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}.
-This class is a move (\doxyref{mo\-Move}{p.}{classmo_move}) generator with a bound for the maximum number of iterations.
+This class is a move (\doxyref{moMove}{p.}{classmo_move}) generator with a bound for the maximum number of iterations.
-Definition at line 22 of file mo\-It\-Rand\-Next\-Move.h.
+Definition at line 45 of file moItRandNextMove.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!moItRandNextMove@{moItRandNextMove}}
-\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a}
+\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}}
+\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moItRandNextMove}$<$ M $>$::{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a}
The constructor.
-\doxyref{Parameters} only for initialising the attributes.
+{\bf Parameters} only for initialising the attributes.
\begin{Desc}
\item[Parameters:]
@@ -66,12 +66,12 @@ The constructor.
\end{Desc}
-Definition at line 37 of file mo\-It\-Rand\-Next\-Move.h.
+Definition at line 60 of file moItRandNextMove.h.
\subsection{Member Function Documentation}
-\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!operator()@{operator()}}
-\index{operator()@{operator()}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102}
+\index{moItRandNextMove@{moItRandNextMove}!operator()@{operator()}}
+\index{operator()@{operator()}!moItRandNextMove@{moItRandNextMove}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moItRandNextMove}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102}
Generation of a new move.
@@ -87,10 +87,12 @@ If the maximum number is not already reached, the current move is forgotten and
\item[Returns:]FALSE if the maximum number of iteration is reached, else TRUE. \end{Desc}
-Definition at line 52 of file mo\-It\-Rand\-Next\-Move.h.
+Implements {\bf eoBF$<$ M \&, const M::EOType \&, bool $>$}.
-References mo\-It\-Rand\-Next\-Move$<$ M $>$::max\_\-iter, mo\-It\-Rand\-Next\-Move$<$ M $>$::num\_\-iter, and mo\-It\-Rand\-Next\-Move$<$ M $>$::rand\_\-move.
+Definition at line 75 of file moItRandNextMove.h.
+
+References moItRandNextMove$<$ M $>$::max\_\-iter, moItRandNextMove$<$ M $>$::num\_\-iter, and moItRandNextMove$<$ M $>$::rand\_\-move.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-It\-Rand\-Next\-Move.h\end{CompactItemize}
+moItRandNextMove.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps
index dfd4f441a..1c276f23e 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 400
+%%BoundingBox: 0 0 500 208.333
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.4 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -174,7 +174,7 @@
boxfont setfont
1 boundaspect scale
(moLSCheckPoint< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType &, void >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -188,7 +188,7 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moLSCheckPoint< M >) 0 0 box
- (eoBF< A1, A2, R >) 0 1 box
+ (eoBF< const M &, const M::EOType &, void >) 0 1 box
(eoFunctorBase) 0 2 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
index 9ac583db0..f642162cf 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
@@ -1,11 +1,11 @@
-\section{mo\-LSCheck\-Point$<$ M $>$ Class Template Reference}
+\section{moLSCheckPoint$<$ M $>$ Class Template Reference}
\label{classmo_l_s_check_point}\index{moLSCheckPoint@{moLSCheckPoint}}
Class which allows a checkpointing system.
-{\tt \#include $<$mo\-LSCheck\-Point.h$>$}
+{\tt \#include $<$moLSCheckPoint.h$>$}
-Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=3cm]{classmo_l_s_check_point}
@@ -14,36 +14,36 @@ Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-void \bf{operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} which launches the checkpointing. \item\end{CompactList}\item
-void \bf{add} (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f)
+void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} which launches the checkpointing. \item\end{CompactList}\item
+void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f)
\begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-std::vector$<$ \bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ \bf{func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4}
+std::vector$<$ {\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4}
\begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-LSCheck\-Point$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moLSCheckPoint$<$ M $>$}
Class which allows a checkpointing system.
-Thanks to this class, at each iteration, additionnal function can be used (and not only one).
+Thanks to this class, at each iteration, additionnal functions can be used (and not only one).
-Definition at line 21 of file mo\-LSCheck\-Point.h.
+Definition at line 44 of file moLSCheckPoint.h.
\subsection{Member Function Documentation}
-\index{moLSCheckPoint@{mo\-LSCheck\-Point}!operator()@{operator()}}
-\index{operator()@{operator()}!moLSCheckPoint@{mo\-LSCheck\-Point}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e}
+\index{moLSCheckPoint@{moLSCheckPoint}!operator()@{operator()}}
+\index{operator()@{operator()}!moLSCheckPoint@{moLSCheckPoint}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e}
-\doxyref{Function} which launches the checkpointing.
+{\bf Function} which launches the checkpointing.
Each saved function is used on the current move and the current solution.
@@ -54,11 +54,11 @@ Each saved function is used on the current move and the current solution.
\end{Desc}
-Definition at line 34 of file mo\-LSCheck\-Point.h.
+Definition at line 57 of file moLSCheckPoint.h.
-References mo\-LSCheck\-Point$<$ M $>$::func.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}}
-\index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::add (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6}
+References moLSCheckPoint$<$ M $>$::func.\index{moLSCheckPoint@{moLSCheckPoint}!add@{add}}
+\index{add@{add}!moLSCheckPoint@{moLSCheckPoint}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::add ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6}
Procedure which add a new function to the function vector.
@@ -70,10 +70,10 @@ The new function is added at the end of the vector. \begin{Desc}
\end{Desc}
-Definition at line 49 of file mo\-LSCheck\-Point.h.
+Definition at line 72 of file moLSCheckPoint.h.
-References mo\-LSCheck\-Point$<$ M $>$::func.
+References moLSCheckPoint$<$ M $>$::func.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-LSCheck\-Point.h\end{CompactItemize}
+moLSCheckPoint.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
index 5a239d9f4..e2cb3f31a 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
@@ -1,11 +1,11 @@
-\section{mo\-Linear\-Cooling\-Schedule Class Reference}
+\section{moLinearCoolingSchedule Class Reference}
\label{classmo_linear_cooling_schedule}\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}}
-One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
-{\tt \#include $<$mo\-Linear\-Cooling\-Schedule.h$>$}
+{\tt \#include $<$moLinearCoolingSchedule.h$>$}
-Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H]
+Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_linear_cooling_schedule}
@@ -14,34 +14,34 @@ Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-Linear\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-quantity)
+{\bf moLinearCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-quantity)
\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item
-bool \bf{operator()} (double \&\_\-\_\-temp)
-\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
+bool {\bf operator()} (double \&\_\-\_\-temp)
+\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-double \bf{threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76}
+double {\bf threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76}
\begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item
-double \bf{quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed}
+double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed}
\begin{CompactList}\small\item\em The quantity that allows the temperature to decrease. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold.
-Definition at line 22 of file mo\-Linear\-Cooling\-Schedule.h.
+Definition at line 45 of file moLinearCoolingSchedule.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
-\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Linear\-Cooling\-Schedule::mo\-Linear\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d}
+\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
+\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moLinearCoolingSchedule::moLinearCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d}
Simple constructor.
@@ -53,15 +53,15 @@ Simple constructor.
\end{Desc}
-Definition at line 31 of file mo\-Linear\-Cooling\-Schedule.h.
+Definition at line 54 of file moLinearCoolingSchedule.h.
\subsection{Member Function Documentation}
-\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}}
-\index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3}
+\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!operator()@{operator()}}
+\index{operator()@{operator()}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3}
-\doxyref{Function} which proceeds to the cooling.
+{\bf Function} which proceeds to the cooling.
It decreases the temperature and indicates if it is greater than the threshold.
@@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold.
\item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc}
-Implements \bf{eo\-UF$<$ double \&, bool $>$}.
+Implements {\bf eoUF$<$ double \&, bool $>$}.
-Definition at line 41 of file mo\-Linear\-Cooling\-Schedule.h.
+Definition at line 64 of file moLinearCoolingSchedule.h.
References quantity, and threshold.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Linear\-Cooling\-Schedule.h\end{CompactItemize}
+moLinearCoolingSchedule.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move.tex
index 05267ce0e..505c0dd21 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move.tex
@@ -1,11 +1,11 @@
-\section{mo\-Move$<$ EOT $>$ Class Template Reference}
+\section{moMove$<$ EOT $>$ Class Template Reference}
\label{classmo_move}\index{moMove@{moMove}}
Definition of a move.
-{\tt \#include $<$mo\-Move.h$>$}
+{\tt \#include $<$moMove.h$>$}
-Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=3cm]{classmo_move}
@@ -14,13 +14,13 @@ Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H]
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef EOT \bf{EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba}
+typedef EOT {\bf EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class mo\-Move$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class moMove$<$ EOT $>$}
Definition of a move.
@@ -28,8 +28,8 @@ A move transforms a solution to another close solution. It describes how a solut
-Definition at line 23 of file mo\-Move.h.
+Definition at line 46 of file moMove.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move.h\end{CompactItemize}
+moMove.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_expl.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_expl.tex
index 5d0b1e66b..7fa216d8b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_expl.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_expl.tex
@@ -1,11 +1,11 @@
-\section{mo\-Move\-Expl$<$ M $>$ Class Template Reference}
+\section{moMoveExpl$<$ M $>$ Class Template Reference}
\label{classmo_move_expl}\index{moMoveExpl@{moMoveExpl}}
-Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer.
+Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer.
-{\tt \#include $<$mo\-Move\-Expl.h$>$}
+{\tt \#include $<$moMoveExpl.h$>$}
-Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4.59016cm]{classmo_move_expl}
@@ -14,16 +14,16 @@ Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Move\-Expl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moMoveExpl$<$ M $>$}
-Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer.
+Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer.
-Only a description...See \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}.
+Only a description...See \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}.
-Definition at line 21 of file mo\-Move\-Expl.h.
+Definition at line 44 of file moMoveExpl.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move\-Expl.h\end{CompactItemize}
+moMoveExpl.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps
index 1f107a403..bbff52acc 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 400
+%%BoundingBox: 0 0 500 160.858
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 3.10833 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -174,7 +174,7 @@
boxfont setfont
1 boundaspect scale
(moMoveIncrEval< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType &, M::EOType::Fitness >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -188,7 +188,7 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moMoveIncrEval< M >) 0 0 box
- (eoBF< A1, A2, R >) 0 1 box
+ (eoBF< const M &, const M::EOType &, M::EOType::Fitness >) 0 1 box
(eoFunctorBase) 0 2 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
index 91421ef4b..12b10a0df 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
@@ -1,11 +1,11 @@
-\section{mo\-Move\-Incr\-Eval$<$ M $>$ Class Template Reference}
+\section{moMoveIncrEval$<$ M $>$ Class Template Reference}
\label{classmo_move_incr_eval}\index{moMoveIncrEval@{moMoveIncrEval}}
(generally) Efficient evaluation function based a move and a solution.
-{\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$}
+{\tt \#include $<$moMoveIncrEval.h$>$}
-Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=3cm]{classmo_move_incr_eval}
@@ -14,7 +14,7 @@ Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Move\-Incr\-Eval$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moMoveIncrEval$<$ M $>$}
(generally) Efficient evaluation function based a move and a solution.
@@ -22,8 +22,8 @@ From a move and a solution, it computes a new fitness that could be associated t
-Definition at line 24 of file mo\-Move\-Incr\-Eval.h.
+Definition at line 47 of file moMoveIncrEval.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move\-Incr\-Eval.h\end{CompactItemize}
+moMoveIncrEval.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.eps
index e04209e70..783ab9a81 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 454.545
+%%BoundingBox: 0 0 500 237.154
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.1 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.10833 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -174,7 +174,7 @@
boxfont setfont
1 boundaspect scale
(moMoveInit< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< M &, const M::EOType &, void >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -188,7 +188,7 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moMoveInit< M >) 0 0 box
- (eoBF< A1, A2, R >) 0 1 box
+ (eoBF< M &, const M::EOType &, void >) 0 1 box
(eoFunctorBase) 0 2 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.tex
index 353911436..f387d24ea 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_init.tex
@@ -1,11 +1,11 @@
-\section{mo\-Move\-Init$<$ M $>$ Class Template Reference}
+\section{moMoveInit$<$ M $>$ Class Template Reference}
\label{classmo_move_init}\index{moMoveInit@{moMoveInit}}
-Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer.
+Move (\doxyref{moMove}{p.}{classmo_move}) initializer.
-{\tt \#include $<$mo\-Move\-Init.h$>$}
+{\tt \#include $<$moMoveInit.h$>$}
-Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=3cm]{classmo_move_init}
@@ -14,16 +14,16 @@ Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Move\-Init$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moMoveInit$<$ M $>$}
-Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer.
+Move (\doxyref{moMove}{p.}{classmo_move}) initializer.
Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used.
-Definition at line 22 of file mo\-Move\-Init.h.
+Definition at line 45 of file moMoveInit.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move\-Init.h\end{CompactItemize}
+moMoveInit.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
index 1a6c5b997..b79a84b53 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
@@ -1,11 +1,11 @@
-\section{mo\-Move\-Loop\-Expl$<$ M $>$ Class Template Reference}
+\section{moMoveLoopExpl$<$ M $>$ Class Template Reference}
\label{classmo_move_loop_expl}\index{moMoveLoopExpl@{moMoveLoopExpl}}
Class which describes an iterative explorer.
-{\tt \#include $<$mo\-Move\-Loop\-Expl.h$>$}
+{\tt \#include $<$moMoveLoopExpl.h$>$}
-Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4.59016cm]{classmo_move_loop_expl}
@@ -14,16 +14,16 @@ Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Move\-Loop\-Expl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moMoveLoopExpl$<$ M $>$}
Class which describes an iterative explorer.
-Only a description... \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}.
+Only a description... \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}.
-Definition at line 21 of file mo\-Move\-Loop\-Expl.h.
+Definition at line 44 of file moMoveLoopExpl.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move\-Loop\-Expl.h\end{CompactItemize}
+moMoveLoopExpl.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_select.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_select.tex
index 6a9be3909..ffff333e5 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_select.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_move_select.tex
@@ -1,11 +1,11 @@
-\section{mo\-Move\-Select$<$ M $>$ Class Template Reference}
+\section{moMoveSelect$<$ M $>$ Class Template Reference}
\label{classmo_move_select}\index{moMoveSelect@{moMoveSelect}}
-Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}).
+Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}).
-{\tt \#include $<$mo\-Move\-Select.h$>$}
+{\tt \#include $<$moMoveSelect.h$>$}
-Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=2.82828cm]{classmo_move_select}
@@ -14,33 +14,33 @@ Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H]
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)=0
+virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)=0
\begin{CompactList}\small\item\em Procedure which initialises all that the move selector needs including the initial fitness. \item\end{CompactList}\item
-virtual bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)=0
-\begin{CompactList}\small\item\em \doxyref{Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize}
+virtual bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)=0
+\begin{CompactList}\small\item\em {\bf Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Move\-Select$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moMoveSelect$<$ M $>$}
-Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}).
+Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}).
-It iteratively considers some moves (\doxyref{mo\-Move}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
+It iteratively considers some moves (\doxyref{moMove}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
-Definition at line 32 of file mo\-Move\-Select.h.
+Definition at line 55 of file moMoveSelect.h.
\subsection{Member Function Documentation}
-\index{moMoveSelect@{mo\-Move\-Select}!init@{init}}
-\index{init@{init}!moMoveSelect@{mo\-Move\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Move\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}
+\index{moMoveSelect@{moMoveSelect}!init@{init}}
+\index{init@{init}!moMoveSelect@{moMoveSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moMoveSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}
Procedure which initialises all that the move selector needs including the initial fitness.
@@ -54,12 +54,12 @@ In order to know the fitness of the solution, for which the neighborhood will be
\end{Desc}
-Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, \bf{mo\-First\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{mo\-Move\-Select}!update@{update}}
-\index{update@{update}!moMoveSelect@{mo\-Move\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool \bf{mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}
+Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, {\bf moFirstImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{moMoveSelect}!update@{update}}
+\index{update@{update}!moMoveSelect@{moMoveSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf moMoveSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}
-\doxyref{Function} which updates the best solutions.
+{\bf Function} which updates the best solutions.
\begin{Desc}
\item[Parameters:]
@@ -70,8 +70,8 @@ Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_im
\item[Returns:]a boolean that expresses the need to resume the exploration. \end{Desc}
-Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}.
+Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Move\-Select.h\end{CompactItemize}
+moMoveSelect.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.eps
index 08b997f12..dfda1c365 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 490.798
+%%BoundingBox: 0 0 500 316.206
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -174,7 +174,7 @@
boxfont setfont
1 boundaspect scale
(moNextMove< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< M &, const M::EOType &, bool >) cw
(eoFunctorBase) cw
(moItRandNextMove< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -189,7 +189,7 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moNextMove< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
+ (eoBF< M &, const M::EOType &, bool >) 0 2 box
(eoFunctorBase) 0 3 box
(moItRandNextMove< M >) 0 0 box
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.tex
index 7da58dd8d..7b7f8bdc6 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_next_move.tex
@@ -1,11 +1,11 @@
-\section{mo\-Next\-Move$<$ M $>$ Class Template Reference}
+\section{moNextMove$<$ M $>$ Class Template Reference}
\label{classmo_next_move}\index{moNextMove@{moNextMove}}
-Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}).
+Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}).
-{\tt \#include $<$mo\-Next\-Move.h$>$}
+{\tt \#include $<$moNextMove.h$>$}
-Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_next_move}
@@ -14,16 +14,16 @@ Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Next\-Move$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moNextMove$<$ M $>$}
-Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}).
+Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}).
-Useful for the explorer (for \doxyref{mo\-TS}{p.}{classmo_t_s} or \doxyref{mo\-HC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used.
+Useful for the explorer (for \doxyref{moTS}{p.}{classmo_t_s} or \doxyref{moHC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used.
-Definition at line 22 of file mo\-Next\-Move.h.
+Definition at line 45 of file moNextMove.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Next\-Move.h\end{CompactItemize}
+moNextMove.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
index f5d50a373..8bc333965 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 583.942
+%%BoundingBox: 0 0 500 239.521
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -175,7 +175,7 @@ boxfont setfont
1 boundaspect scale
(moNoAspirCrit< M >) cw
(moAspirCrit< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType::Fitness &, bool >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
(moNoAspirCrit< M >) 0 0 box
(moAspirCrit< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
+ (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box
(eoFunctorBase) 0 3 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
index 88109d6be..e5f65e865 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
@@ -1,11 +1,11 @@
-\section{mo\-No\-Aspir\-Crit$<$ M $>$ Class Template Reference}
+\section{moNoAspirCrit$<$ M $>$ Class Template Reference}
\label{classmo_no_aspir_crit}\index{moNoAspirCrit@{moNoAspirCrit}}
-One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}).
+One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}).
-{\tt \#include $<$mo\-No\-Aspir\-Crit.h$>$}
+{\tt \#include $<$moNoAspirCrit.h$>$}
-Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_no_aspir_crit}
@@ -14,30 +14,30 @@ Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
\subsection*{Private Member Functions}
\begin{CompactItemize}
\item
-bool \bf{operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item
-void \bf{init} ()
-\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize}
+bool {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item
+void {\bf init} ()
+\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-No\-Aspir\-Crit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moNoAspirCrit$<$ M $>$}
-One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}).
+One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}).
The simplest : never satisfied.
-Definition at line 21 of file mo\-No\-Aspir\-Crit.h.
+Definition at line 44 of file moNoAspirCrit.h.
\subsection{Member Function Documentation}
-\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!operator()@{operator()}}
-\index{operator()@{operator()}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8}
+\index{moNoAspirCrit@{moNoAspirCrit}!operator()@{operator()}}
+\index{operator()@{operator()}!moNoAspirCrit@{moNoAspirCrit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moNoAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8}
-\doxyref{Function} which describes the aspiration criterion behaviour.
+{\bf Function} which describes the aspiration criterion behaviour.
Does nothing.
@@ -50,19 +50,19 @@ Does nothing.
\item[Returns:]FALSE. \end{Desc}
-Definition at line 32 of file mo\-No\-Aspir\-Crit.h.\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!init@{init}}
-\index{init@{init}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}
+Definition at line 55 of file moNoAspirCrit.h.\index{moNoAspirCrit@{moNoAspirCrit}!init@{init}}
+\index{init@{init}!moNoAspirCrit@{moNoAspirCrit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moNoAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}
-Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}.
+Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}.
Nothing...
-Implements \bf{mo\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}.
+Implements {\bf moAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}.
-Definition at line 43 of file mo\-No\-Aspir\-Crit.h.
+Definition at line 66 of file moNoAspirCrit.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-No\-Aspir\-Crit.h\end{CompactItemize}
+moNoAspirCrit.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
index 5e7d64978..136edf15b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
@@ -1,11 +1,11 @@
-\section{mo\-Rand\-Impr\-Select$<$ M $>$ Class Template Reference}
+\section{moRandImprSelect$<$ M $>$ Class Template Reference}
\label{classmo_rand_impr_select}\index{moRandImprSelect@{moRandImprSelect}}
-One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}).
+One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}).
-{\tt \#include $<$mo\-Rand\-Impr\-Select.h$>$}
+{\tt \#include $<$moRandImprSelect.h$>$}
-Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_rand_impr_select}
@@ -14,50 +14,50 @@ Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H]
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)
-\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item
-bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)
-\begin{CompactList}\small\item\em \doxyref{Function} that updates the fitness and move vectors. \item\end{CompactList}\item
-void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection)
+void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)
+\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item
+bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)
+\begin{CompactList}\small\item\em {\bf Function} that updates the fitness and move vectors. \item\end{CompactList}\item
+void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection)
\begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{Fitness} \bf{init\_\-fit}\label{classmo_rand_impr_select_d153c277a0a2ea95ac484210d445b40e}
+{\bf Fitness} {\bf init\_\-fit}\label{classmo_rand_impr_select_d153c277a0a2ea95ac484210d445b40e}
\begin{CompactList}\small\item\em Fitness of the current solution. \item\end{CompactList}\item
-std::vector$<$ \bf{Fitness} $>$ \bf{vect\_\-better\_\-fit}\label{classmo_rand_impr_select_05c7c3b858e8a25632f2f5c86b0c97a3}
+std::vector$<$ {\bf Fitness} $>$ {\bf vect\_\-better\_\-fit}\label{classmo_rand_impr_select_05c7c3b858e8a25632f2f5c86b0c97a3}
\begin{CompactList}\small\item\em Candidate fitnesse vector. \item\end{CompactList}\item
-std::vector$<$ M $>$ \bf{vect\_\-better\_\-moves}\label{classmo_rand_impr_select_2ace12bd179144fa71d56324694201f5}
+std::vector$<$ M $>$ {\bf vect\_\-better\_\-moves}\label{classmo_rand_impr_select_2ace12bd179144fa71d56324694201f5}
\begin{CompactList}\small\item\em Candidate move vector. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Rand\-Impr\-Select$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moRandImprSelect$<$ M $>$}
-One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}).
+One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}).
All the neighbors are considered. One of them that enables an improvment of the objective function is choosen.
-Definition at line 25 of file mo\-Rand\-Impr\-Select.h.
+Definition at line 48 of file moRandImprSelect.h.
\subsection{Member Function Documentation}
-\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!init@{init}}
-\index{init@{init}!moRandImprSelect@{mo\-Rand\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}
+\index{moRandImprSelect@{moRandImprSelect}!init@{init}}
+\index{init@{init}!moRandImprSelect@{moRandImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}
-Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}.
+Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}.
Give a value to the initialise fitness. Clean the move and fitness vectors.
@@ -68,16 +68,16 @@ Give a value to the initialise fitness. Clean the move and fitness vectors.
\end{Desc}
-Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}.
+Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}.
-Definition at line 40 of file mo\-Rand\-Impr\-Select.h.
+Definition at line 63 of file moRandImprSelect.h.
-References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!update@{update}}
-\index{update@{update}!moRandImprSelect@{mo\-Rand\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}
+References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!update@{update}}
+\index{update@{update}!moRandImprSelect@{moRandImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moRandImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}
-\doxyref{Function} that updates the fitness and move vectors.
+{\bf Function} that updates the fitness and move vectors.
if a move give a better fitness than the initial fitness, it is saved and the fitness too.
@@ -90,13 +90,13 @@ if a move give a better fitness than the initial fitness, it is saved and the fi
\item[Returns:]TRUE. \end{Desc}
-Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}.
+Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}.
-Definition at line 56 of file mo\-Rand\-Impr\-Select.h.
+Definition at line 79 of file moRandImprSelect.h.
-References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}}
-\index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55}
+References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!operator()@{operator()}}
+\index{operator()@{operator()}!moRandImprSelect@{moRandImprSelect}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55}
The move selection.
@@ -111,16 +111,16 @@ One the saved move is randomly chosen.
\begin{Desc}
\item[Exceptions:]
\begin{description}
-\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description}
+\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description}
\end{Desc}
-Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
-Definition at line 77 of file mo\-Rand\-Impr\-Select.h.
+Definition at line 100 of file moRandImprSelect.h.
-References eo\-Rng::random(), mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.
+References eoRng::random(), moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Rand\-Impr\-Select.h\end{CompactItemize}
+moRandImprSelect.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_move.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_move.tex
index a35b6919a..43f2083a8 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_move.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_rand_move.tex
@@ -1,11 +1,11 @@
-\section{mo\-Rand\-Move$<$ M $>$ Class Template Reference}
+\section{moRandMove$<$ M $>$ Class Template Reference}
\label{classmo_rand_move}\index{moRandMove@{moRandMove}}
Random move generator.
-{\tt \#include $<$mo\-Rand\-Move.h$>$}
+{\tt \#include $<$moRandMove.h$>$}
-Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=3cm]{classmo_rand_move}
@@ -14,16 +14,16 @@ Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H]
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Rand\-Move$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moRandMove$<$ M $>$}
Random move generator.
-Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{mo\-SA}{p.}{classmo_s_a}.
+Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{moSA}{p.}{classmo_s_a}.
-Definition at line 21 of file mo\-Rand\-Move.h.
+Definition at line 44 of file moRandMove.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Rand\-Move.h\end{CompactItemize}
+moRandMove.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_s_a.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_s_a.tex
index 017b05804..82d0fca73 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_s_a.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_s_a.tex
@@ -1,11 +1,11 @@
-\section{mo\-SA$<$ M $>$ Class Template Reference}
+\section{moSA$<$ M $>$ Class Template Reference}
\label{classmo_s_a}\index{moSA@{moSA}}
Simulated Annealing (SA).
-{\tt \#include $<$mo\-SA.h$>$}
+{\tt \#include $<$moSA.h$>$}
-Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=5cm]{classmo_s_a}
@@ -14,44 +14,44 @@ Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, \bf{mo\-Cooling\-Schedule} \&\_\-\_\-cool\_\-sched, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item
-bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol)
+bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5}
+typedef M::EOType {\bf EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness \bf{Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b}
+typedef EOT::Fitness {\bf Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec}
+{\bf moRandMove}$<$ M $>$ \& {\bf move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec}
\begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item
-\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc}
+{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc}
\begin{CompactList}\small\item\em A (generally) efficient evaluation function. \item\end{CompactList}\item
-\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716}
+{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716}
\begin{CompactList}\small\item\em Stopping criterion before temperature update. \item\end{CompactList}\item
-double \bf{init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4}
+double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4}
\begin{CompactList}\small\item\em Initial temperature. \item\end{CompactList}\item
-\bf{mo\-Cooling\-Schedule} \& \bf{cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6}
+{\bf moCoolingSchedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6}
\begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item
-\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c}
+{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c}
\begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-SA$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moSA$<$ M $>$}
Simulated Annealing (SA).
@@ -59,12 +59,12 @@ Class that describes a Simulated Annealing algorithm.
-Definition at line 30 of file mo\-SA.h.
+Definition at line 53 of file moSA.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moSA@{mo\-SA}!moSA@{moSA}}
-\index{moSA@{moSA}!moSA@{mo\-SA}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-SA}$<$ M $>$::\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9}
+\index{moSA@{moSA}!moSA@{moSA}}
+\index{moSA@{moSA}!moSA@{moSA}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSA}$<$ M $>$::{\bf moSA} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9}
SA constructor.
@@ -78,17 +78,17 @@ All the boxes used by a SA need to be given.
\end{Desc}
-Definition at line 58 of file mo\-SA.h.
+Definition at line 81 of file moSA.h.
\subsection{Member Function Documentation}
-\index{moSA@{mo\-SA}!operator()@{operator()}}
-\index{operator()@{operator()}!moSA@{mo\-SA}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-SA}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5}
+\index{moSA@{moSA}!operator()@{operator()}}
+\index{operator()@{operator()}!moSA@{moSA}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5}
function that launches the SA algorithm.
-As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm.
+As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm.
\begin{Desc}
\item[Parameters:]
@@ -99,12 +99,12 @@ As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, t
\item[Returns:]TRUE. \end{Desc}
-Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}.
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
-Definition at line 80 of file mo\-SA.h.
+Definition at line 103 of file moSA.h.
-References mo\-SA$<$ M $>$::cont, mo\-SA$<$ M $>$::cool\_\-sched, mo\-SA$<$ M $>$::full\_\-eval, mo\-SA$<$ M $>$::incr\_\-eval, mo\-SA$<$ M $>$::init\_\-temp, mo\-SA$<$ M $>$::move\_\-rand, and eo\-Rng::uniform().
+References moSA$<$ M $>$::cont, moSA$<$ M $>$::cool\_\-sched, moSA$<$ M $>$::full\_\-eval, moSA$<$ M $>$::incr\_\-eval, moSA$<$ M $>$::init\_\-temp, moSA$<$ M $>$::move\_\-rand, and eoRng::uniform().
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-SA.h\end{CompactItemize}
+moSA.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
index b0dcef476..95d9a8476 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 427.807
+%%BoundingBox: 0 0 500 277.778
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.16875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -175,7 +175,7 @@ boxfont setfont
1 boundaspect scale
(moSimpleMoveTabuList< M >) cw
(moTabuList< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType &, bool >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
(moSimpleMoveTabuList< M >) 0 0 box
(moTabuList< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
+ (eoBF< const M &, const M::EOType &, bool >) 0 2 box
(eoFunctorBase) 0 3 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
index 729e656e6..9b98ec3da 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
@@ -1,11 +1,11 @@
-\section{mo\-Simple\-Move\-Tabu\-List$<$ M $>$ Class Template Reference}
+\section{moSimpleMoveTabuList$<$ M $>$ Class Template Reference}
\label{classmo_simple_move_tabu_list}\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}}
Class describing a move tabu list with a limited memory.
-{\tt \#include $<$mo\-Simple\-Move\-Tabu\-List.h$>$}
+{\tt \#include $<$moSimpleMoveTabuList.h$>$}
-Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_simple_move_tabu_list}
@@ -14,73 +14,75 @@ Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H]
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7}
+typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-Simple\-Move\-Tabu\-List} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79}
+{\bf moSimpleMoveTabuList} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79}
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
-void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)
+bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
+void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
-void \bf{update} ()
+void {\bf update} ()
\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item
-void \bf{init} ()
+void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Member Functions}
\begin{CompactItemize}
\item
-void \bf{remove\-Move} (const M \&\_\-\_\-move)
+void {\bf removeMove} (const M \&\_\-\_\-move)
\begin{CompactList}\small\item\em Procedure that removes a given move from the tabu list (if it is into, else do nothing). \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int \bf{max\-Size}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23}
+unsigned int {\bf maxSize}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23}
\begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item
-unsigned int \bf{current\-Size}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb}
+unsigned int {\bf currentSize}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb}
\begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item
-std::list$<$ M $>$ \bf{tabu\-List}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a}
+std::list$<$ M $>$ {\bf tabuList}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a}
\begin{CompactList}\small\item\em The move tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Simple\-Move\-Tabu\-List$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moSimpleMoveTabuList$<$ M $>$}
Class describing a move tabu list with a limited memory.
-Definition at line 22 of file mo\-Simple\-Move\-Tabu\-List.h.
+Definition at line 45 of file moSimpleMoveTabuList.h.
\subsection{Member Function Documentation}
-\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!operator()@{operator()}}
-\index{operator()@{operator()}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a}
+\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!operator()@{operator()}}
+\index{operator()@{operator()}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleMoveTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a}
-\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not.
+{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description}
+\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description}
\end{Desc}
\begin{Desc}
\item[Returns:]true or false. \end{Desc}
-Definition at line 46 of file mo\-Simple\-Move\-Tabu\-List.h.
+Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}.
-References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!add@{add}}
-\index{add@{add}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}
+Definition at line 69 of file moSimpleMoveTabuList.h.
+
+References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}}
+\index{add@{add}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}
Procedure to add a move in the tabu list.
@@ -94,35 +96,35 @@ The two parameters have not to be modified so they are constant parameters.
\end{Desc}
-Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}.
+Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}.
-Definition at line 60 of file mo\-Simple\-Move\-Tabu\-List.h.
+Definition at line 83 of file moSimpleMoveTabuList.h.
-References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::remove\-Move(), and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}}
-\index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}
+References moSimpleMoveTabuList$<$ M $>$::currentSize, moSimpleMoveTabuList$<$ M $>$::maxSize, moSimpleMoveTabuList$<$ M $>$::removeMove(), and moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!update@{update}}
+\index{update@{update}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}
Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
+Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
-Definition at line 82 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}}
-\index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}
+Definition at line 105 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!init@{init}}
+\index{init@{init}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}
Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
+Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
-Definition at line 88 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!removeMove@{removeMove}}
-\index{removeMove@{removeMove}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::remove\-Move (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f}
+Definition at line 111 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!removeMove@{removeMove}}
+\index{removeMove@{removeMove}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::removeMove (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f}
Procedure that removes a given move from the tabu list (if it is into, else do nothing).
@@ -130,16 +132,16 @@ Procedure that removes a given move from the tabu list (if it is into, else do n
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \end{description}
+\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \end{description}
\end{Desc}
-Definition at line 100 of file mo\-Simple\-Move\-Tabu\-List.h.
+Definition at line 123 of file moSimpleMoveTabuList.h.
-References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.
+References moSimpleMoveTabuList$<$ M $>$::tabuList.
-Referenced by mo\-Simple\-Move\-Tabu\-List$<$ M $>$::add().
+Referenced by moSimpleMoveTabuList$<$ M $>$::add().
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Simple\-Move\-Tabu\-List.h\end{CompactItemize}
+moSimpleMoveTabuList.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
index 06f8e8fc5..c673817e4 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 400
+%%BoundingBox: 0 0 500 277.778
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -175,7 +175,7 @@ boxfont setfont
1 boundaspect scale
(moSimpleSolutionTabuList< M >) cw
(moTabuList< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType &, bool >) cw
(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
(moSimpleSolutionTabuList< M >) 0 0 box
(moTabuList< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
+ (eoBF< const M &, const M::EOType &, bool >) 0 2 box
(eoFunctorBase) 0 3 box
% ----- relations -----
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
index 7d0407bd5..e0296ce57 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
@@ -1,11 +1,11 @@
-\section{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$ Class Template Reference}
+\section{moSimpleSolutionTabuList$<$ M $>$ Class Template Reference}
\label{classmo_simple_solution_tabu_list}\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
Class describing a solution tabu list with limited length.
-{\tt \#include $<$mo\-Simple\-Solution\-Tabu\-List.h$>$}
+{\tt \#include $<$moSimpleSolutionTabuList.h$>$}
-Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_simple_solution_tabu_list}
@@ -14,54 +14,54 @@ Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9}
+typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int \_\-\_\-size)
+{\bf moSimpleSolutionTabuList} (unsigned int \_\-\_\-size)
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
-void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)
+bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
+void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
-void \bf{update} ()
+void {\bf update} ()
\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item
-void \bf{init} ()
+void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Member Functions}
\begin{CompactItemize}
\item
-void \bf{remove\-Solution} (const \bf{EOT} \&\_\-\_\-sol)
+void {\bf removeSolution} (const {\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em Procedure that removes a given solution from the tabu list (if it is into, else does nothing). \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int \bf{max\-Size}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845}
+unsigned int {\bf maxSize}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845}
\begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item
-unsigned int \bf{current\-Size}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf}
+unsigned int {\bf currentSize}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf}
\begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item
-std::list$<$ \bf{EOT} $>$ \bf{tabu\-List}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b}
+std::list$<$ {\bf EOT} $>$ {\bf tabuList}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b}
\begin{CompactList}\small\item\em The solution tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moSimpleSolutionTabuList$<$ M $>$}
Class describing a solution tabu list with limited length.
-Definition at line 22 of file mo\-Simple\-Solution\-Tabu\-List.h.
+Definition at line 45 of file moSimpleSolutionTabuList.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178}
+\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSimpleSolutionTabuList}$<$ M $>$::{\bf moSimpleSolutionTabuList} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178}
Constructor.
@@ -73,32 +73,34 @@ Constructor.
\end{Desc}
-Definition at line 34 of file mo\-Simple\-Solution\-Tabu\-List.h.
+Definition at line 57 of file moSimpleSolutionTabuList.h.
-References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size.
+References moSimpleSolutionTabuList$<$ M $>$::currentSize.
\subsection{Member Function Documentation}
-\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!operator()@{operator()}}
-\index{operator()@{operator()}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047}
+\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!operator()@{operator()}}
+\index{operator()@{operator()}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleSolutionTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047}
-\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not.
+{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description}
+\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description}
\end{Desc}
\begin{Desc}
\item[Returns:]true or false. \end{Desc}
-Definition at line 45 of file mo\-Simple\-Solution\-Tabu\-List.h.
+Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}.
-References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!add@{add}}
-\index{add@{add}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}
+Definition at line 68 of file moSimpleSolutionTabuList.h.
+
+References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}}
+\index{add@{add}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}
Procedure to add a move in the tabu list.
@@ -112,35 +114,35 @@ The two parameters have not to be modified so they are constant parameters.
\end{Desc}
-Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}.
+Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}.
-Definition at line 64 of file mo\-Simple\-Solution\-Tabu\-List.h.
+Definition at line 87 of file moSimpleSolutionTabuList.h.
-References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::remove\-Solution(), and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}}
-\index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}
+References moSimpleSolutionTabuList$<$ M $>$::currentSize, moSimpleSolutionTabuList$<$ M $>$::maxSize, moSimpleSolutionTabuList$<$ M $>$::removeSolution(), and moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!update@{update}}
+\index{update@{update}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}
Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
+Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
-Definition at line 91 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}}
-\index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}
+Definition at line 114 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!init@{init}}
+\index{init@{init}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}
Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
+Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
-Definition at line 97 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!removeSolution@{removeSolution}}
-\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::remove\-Solution (const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560}
+Definition at line 120 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!removeSolution@{removeSolution}}
+\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::removeSolution (const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560}
Procedure that removes a given solution from the tabu list (if it is into, else does nothing).
@@ -152,12 +154,12 @@ Procedure that removes a given solution from the tabu list (if it is into, else
\end{Desc}
-Definition at line 109 of file mo\-Simple\-Solution\-Tabu\-List.h.
+Definition at line 132 of file moSimpleSolutionTabuList.h.
-References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.
+References moSimpleSolutionTabuList$<$ M $>$::tabuList.
-Referenced by mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::add().
+Referenced by moSimpleSolutionTabuList$<$ M $>$::add().
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Simple\-Solution\-Tabu\-List.h\end{CompactItemize}
+moSimpleSolutionTabuList.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_sol_continue.tex
index 3eafbc4e4..b52850f74 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_sol_continue.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_sol_continue.tex
@@ -1,11 +1,11 @@
-\section{mo\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
+\section{moSolContinue$<$ EOT $>$ Class Template Reference}
\label{classmo_sol_continue}\index{moSolContinue@{moSolContinue}}
Class that describes a stop criterion for a solution-based heuristic.
-{\tt \#include $<$mo\-Sol\-Continue.h$>$}
+{\tt \#include $<$moSolContinue.h$>$}
-Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=4cm]{classmo_sol_continue}
@@ -14,33 +14,33 @@ Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void \bf{init} ()=0
+virtual void {\bf init} ()=0
\begin{CompactList}\small\item\em Procedure which initialises all that the stop criterion needs. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class mo\-Sol\-Continue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class moSolContinue$<$ EOT $>$}
Class that describes a stop criterion for a solution-based heuristic.
-It allows to add an initialisation procedure to an object that is a unary function (\doxyref{eo\-UF}).
+It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}).
-Definition at line 22 of file mo\-Sol\-Continue.h.
+Definition at line 45 of file moSolContinue.h.
\subsection{Member Function Documentation}
-\index{moSolContinue@{mo\-Sol\-Continue}!init@{init}}
-\index{init@{init}!moSolContinue@{mo\-Sol\-Continue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void \bf{mo\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}
+\index{moSolContinue@{moSolContinue}!init@{init}}
+\index{init@{init}!moSolContinue@{moSolContinue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void {\bf moSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}
Procedure which initialises all that the stop criterion needs.
Generally, it allocates some data structures or initialises some counters.
-Implemented in \bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}.
+Implemented in {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Sol\-Continue.h\end{CompactItemize}
+moSolContinue.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s.tex
index 1eb22beb6..bdd3a2231 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s.tex
@@ -1,11 +1,11 @@
-\section{mo\-TS$<$ M $>$ Class Template Reference}
+\section{moTS$<$ M $>$ Class Template Reference}
\label{classmo_t_s}\index{moTS@{moTS}}
Tabu Search (TS).
-{\tt \#include $<$mo\-TS.h$>$}
+{\tt \#include $<$moTS.h$>$}
-Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=5cm]{classmo_t_s}
@@ -14,37 +14,37 @@ Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval)
-\begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item
-\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
+\begin{CompactList}\small\item\em Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item
+{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item
-bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em \doxyref{Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize}
+bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol)
+\begin{CompactList}\small\item\em {\bf Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1}
+typedef M::EOType {\bf EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness \bf{Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca}
+typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865}
+{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865}
\begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item
-\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a}
+{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a}
\begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item
-\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e}
+{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e}
\begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-TS$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moTS$<$ M $>$}
Tabu Search (TS).
@@ -52,17 +52,17 @@ Generic algorithm that describes a tabu search.
-Definition at line 29 of file mo\-TS.h.
+Definition at line 52 of file moTS.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moTS@{mo\-TS}!moTS@{moTS}}
-\index{moTS@{moTS}!moTS@{mo\-TS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e}
+\index{moTS@{moTS}!moTS@{moTS}}
+\index{moTS@{moTS}!moTS@{moTS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e}
-Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes.
+Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes.
-In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} is instanciated.
+In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} is instanciated.
\begin{Desc}
\item[Parameters:]
@@ -71,9 +71,9 @@ In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loo
\end{Desc}
-Definition at line 58 of file mo\-TS.h.\index{moTS@{mo\-TS}!moTS@{moTS}}
-\index{moTS@{moTS}!moTS@{mo\-TS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab}
+Definition at line 81 of file moTS.h.\index{moTS@{moTS}!moTS@{moTS}}
+\index{moTS@{moTS}!moTS@{moTS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab}
Constructor with less parameters.
@@ -83,21 +83,21 @@ The explorer is given in the parameters.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description}
+\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description}
\end{Desc}
-Definition at line 71 of file mo\-TS.h.
+Definition at line 94 of file moTS.h.
\subsection{Member Function Documentation}
-\index{moTS@{mo\-TS}!operator()@{operator()}}
-\index{operator()@{operator()}!moTS@{mo\-TS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-TS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb}
+\index{moTS@{moTS}!operator()@{operator()}}
+\index{operator()@{operator()}!moTS@{moTS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moTS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb}
-\doxyref{Function} which launchs the Tabu Search.
+{\bf Function} which launchs the Tabu Search.
-Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm.
+Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm.
\begin{Desc}
\item[Parameters:]
@@ -108,12 +108,12 @@ Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyr
\item[Returns:]TRUE. \end{Desc}
-Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}.
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
-Definition at line 85 of file mo\-TS.h.
+Definition at line 108 of file moTS.h.
-References mo\-TS$<$ M $>$::cont, mo\-TS$<$ M $>$::full\_\-eval, and mo\-TS$<$ M $>$::move\_\-expl.
+References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, and moTS$<$ M $>$::move\_\-expl.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-TS.h\end{CompactItemize}
+moTS.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
index 30f0a7156..f83eee599 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
@@ -1,11 +1,11 @@
-\section{mo\-TSMove\-Loop\-Expl$<$ M $>$ Class Template Reference}
+\section{moTSMoveLoopExpl$<$ M $>$ Class Template Reference}
\label{classmo_t_s_move_loop_expl}\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}}
Explorer for a Tabu Search algorithm.
-{\tt \#include $<$mo\-TSMove\-Loop\-Expl.h$>$}
+{\tt \#include $<$moTSMoveLoopExpl.h$>$}
-Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
\includegraphics[height=5cm]{classmo_t_s_move_loop_expl}
@@ -14,57 +14,57 @@ Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit)
+{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit)
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-void \bf{operator()} (const \bf{EOT} \&\_\-\_\-old\_\-sol, \bf{EOT} \&\_\-\_\-new\_\-sol)
+void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol)
\begin{CompactList}\small\item\em Procedure which lauches the exploration. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527}
+typedef M::EOType {\bf EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef M::EOType::Fitness \bf{Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018}
+typedef M::EOType::Fitness {\bf Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400}
+{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400}
\begin{CompactList}\small\item\em Move initialisation. \item\end{CompactList}\item
-\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49}
+{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49}
\begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item
-\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c}
+{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c}
\begin{CompactList}\small\item\em Efficient evaluation. \item\end{CompactList}\item
-\bf{mo\-Best\-Impr\-Select}$<$ M $>$ \bf{move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1}
+{\bf moBestImprSelect}$<$ M $>$ {\bf move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1}
\begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\item
-\bf{mo\-Tabu\-List}$<$ M $>$ \& \bf{tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790}
+{\bf moTabuList}$<$ M $>$ \& {\bf tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790}
\begin{CompactList}\small\item\em Tabu list. \item\end{CompactList}\item
-\bf{mo\-Aspir\-Crit}$<$ M $>$ \& \bf{aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f}
+{\bf moAspirCrit}$<$ M $>$ \& {\bf aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f}
\begin{CompactList}\small\item\em Aspiration criterion. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-TSMove\-Loop\-Expl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moTSMoveLoopExpl$<$ M $>$}
Explorer for a Tabu Search algorithm.
-It is used by a \doxyref{mo\-TS}{p.}{classmo_t_s}.
+It is used by a \doxyref{moTS}{p.}{classmo_t_s}.
-Definition at line 30 of file mo\-TSMove\-Loop\-Expl.h.
+Definition at line 53 of file moTSMoveLoopExpl.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
-\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381}
+\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
+\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTSMoveLoopExpl}$<$ M $>$::{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381}
Constructor.
@@ -76,14 +76,14 @@ Constructor.
\end{Desc}
-Definition at line 49 of file mo\-TSMove\-Loop\-Expl.h.
+Definition at line 72 of file moTSMoveLoopExpl.h.
-References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list.
+References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list.
\subsection{Member Function Documentation}
-\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}}
-\index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-\_\-old\_\-sol}, \bf{EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7}
+\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!operator()@{operator()}}
+\index{operator()@{operator()}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moTSMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7}
Procedure which lauches the exploration.
@@ -97,12 +97,12 @@ The exploration continues while the chosen move is not in the tabu list or the a
\end{Desc}
-Implements \bf{eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}.
+Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}.
-Definition at line 69 of file mo\-TSMove\-Loop\-Expl.h.
+Definition at line 92 of file moTSMoveLoopExpl.h.
-References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, mo\-TSMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-select, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list.
+References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, moTSMoveLoopExpl$<$ M $>$::incr\_\-eval, moTSMoveLoopExpl$<$ M $>$::move\_\-init, moTSMoveLoopExpl$<$ M $>$::move\_\-select, moTSMoveLoopExpl$<$ M $>$::next\_\-move, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-TSMove\-Loop\-Expl.h\end{CompactItemize}
+moTSMoveLoopExpl.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.eps
index 43c125a8a..2aee2f1b6 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.eps
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 200
+%%BoundingBox: 0 0 500 138.889
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,7 +19,7 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 3.6 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
@@ -174,7 +174,7 @@
boxfont setfont
1 boundaspect scale
(moTabuList< M >) cw
-(eoBF< A1, A2, R >) cw
+(eoBF< const M &, const M::EOType &, bool >) cw
(eoFunctorBase) cw
(moSimpleMoveTabuList< M >) cw
(moSimpleSolutionTabuList< M >) cw
@@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moTabuList< M >) 0.5 1 box
- (eoBF< A1, A2, R >) 0.5 2 box
+ (eoBF< const M &, const M::EOType &, bool >) 0.5 2 box
(eoFunctorBase) 0.5 3 box
(moSimpleMoveTabuList< M >) 0 0 box
(moSimpleSolutionTabuList< M >) 1 0 box
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.tex
index 89cb23468..872c39af6 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/classmo_tabu_list.tex
@@ -1,48 +1,48 @@
-\section{mo\-Tabu\-List$<$ M $>$ Class Template Reference}
+\section{moTabuList$<$ M $>$ Class Template Reference}
\label{classmo_tabu_list}\index{moTabuList@{moTabuList}}
-Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses.
+Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses.
-{\tt \#include $<$mo\-Tabu\-List.h$>$}
+{\tt \#include $<$moTabuList.h$>$}
-Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_tabu_list}
+\includegraphics[height=3.88889cm]{classmo_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType \bf{EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df}
+typedef M::EOType {\bf EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)=0
+virtual void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)=0
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
-virtual void \bf{update} ()=0
+virtual void {\bf update} ()=0
\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item
-virtual void \bf{init} ()=0
+virtual void {\bf init} ()=0
\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class mo\-Tabu\-List$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class moTabuList$<$ M $>$}
-Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses.
+Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses.
-It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}.
+It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{moTS}{p.}{classmo_t_s}.
-Definition at line 22 of file mo\-Tabu\-List.h.
+Definition at line 45 of file moTabuList.h.
\subsection{Member Function Documentation}
-\index{moTabuList@{mo\-Tabu\-List}!add@{add}}
-\index{add@{add}!moTabuList@{mo\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}
+\index{moTabuList@{moTabuList}!add@{add}}
+\index{add@{add}!moTabuList@{moTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}
Procedure to add a move in the tabu list.
@@ -56,26 +56,26 @@ The two parameters have not to be modified so they are constant parameters.
\end{Desc}
-Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{mo\-Tabu\-List}!update@{update}}
-\index{update@{update}!moTabuList@{mo\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}
+Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{moTabuList}!update@{update}}
+\index{update@{update}!moTabuList@{moTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}
Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{mo\-Tabu\-List}!init@{init}}
-\index{init@{init}!moTabuList@{mo\-Tabu\-List}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}
+Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{moTabuList}!init@{init}}
+\index{init@{init}!moTabuList@{moTabuList}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}
Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}.
+Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-mo\-Tabu\-List.h\end{CompactItemize}
+moTabuList.h\end{CompactItemize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/doxygen.sty b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/doxygen.sty
index f54e6ffad..43432e06f 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/doxygen.sty
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/doxygen.sty
@@ -10,8 +10,8 @@
{\fancyplain{}{\bfseries\rightmark}}
\rhead[\fancyplain{}{\bfseries\leftmark}]
{\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Jul 5 17:08:27 2007 for PARADISEO-MO by Doxygen }}
+\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 25 16:19:07 2007 for PARADISEO-MO by Doxygen }}
\cfoot{}
\newenvironment{Code}
{\footnotesize}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/hierarchy.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/hierarchy.tex
index ae3028808..66deba8dc 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/hierarchy.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/hierarchy.tex
@@ -1,79 +1,89 @@
\section{PARADISEO-MO Class Hierarchy}
This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList}
-\item \contentsline{section}{Empty\-Selection}{\pageref{class_empty_selection}}{}
-\item eo\-Functor\-Base{\tt [external]}\begin{CompactList}
-\item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{}
+\item \contentsline{section}{EmptySelection}{\pageref{class_empty_selection}}{}
+\item eoFunctorBase{\tt [external]}\begin{CompactList}
+\item eoBF$<$ const M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
-\item \contentsline{section}{mo\-No\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{}
+\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{}
+\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{}
\end{CompactList}
-\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{}
-\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{}
-\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{}
-\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{}
+\end{CompactList}
+\item eoBF$<$ const M \&, const M::EOType \&, M::EOType::Fitness $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{}
+\end{CompactList}
+\item eoBF$<$ const M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{}
+\end{CompactList}
+\item eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moAspirCrit$<$ M $>$}{\pageref{classmo_aspir_crit}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{}
+\item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
+\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{}
\end{CompactList}
-\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{}
+\end{CompactList}
+\item eoBF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{}
-\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{}
-\end{CompactList}
-\end{CompactList}
-\item eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{}
+\item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{}
+\item \contentsline{section}{moHCMoveLoopExpl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{}
+\item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{}
+\end{CompactList}
+\end{CompactList}
+\end{CompactList}
+\item eoBF$<$ M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-HCMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{}
-\item \contentsline{section}{mo\-TSMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{}
+\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{}
\end{CompactList}
\end{CompactList}
+\item eoBF$<$ M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moMoveInit$<$ M $>$}{\pageref{classmo_move_init}}{}
\end{CompactList}
-\item eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Move\-Select$<$ M $>$}{\pageref{classmo_move_select}}{}
+\item eoBF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moMoveSelect$<$ M $>$}{\pageref{classmo_move_select}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-Best\-Impr\-Select$<$ M $>$}{\pageref{classmo_best_impr_select}}{}
-\item \contentsline{section}{mo\-First\-Impr\-Select$<$ M $>$}{\pageref{classmo_first_impr_select}}{}
-\item \contentsline{section}{mo\-Rand\-Impr\-Select$<$ M $>$}{\pageref{classmo_rand_impr_select}}{}
+\item \contentsline{section}{moBestImprSelect$<$ M $>$}{\pageref{classmo_best_impr_select}}{}
+\item \contentsline{section}{moFirstImprSelect$<$ M $>$}{\pageref{classmo_first_impr_select}}{}
+\item \contentsline{section}{moRandImprSelect$<$ M $>$}{\pageref{classmo_rand_impr_select}}{}
\end{CompactList}
\end{CompactList}
-\item eo\-UF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{}
+\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{}
+\item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{}
\end{CompactList}
\end{CompactList}
-\item eo\-UF$<$ double \&, bool $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{}
+\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{}
-\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{}
+\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{}
+\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{}
\end{CompactList}
\end{CompactList}
-\item eo\-UF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList}
-\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{}
+\item eoUF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList}
+\item eoMonOp$<$ EOT $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{}
\end{CompactList}
\end{CompactList}
-\item eo\-UF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{}
+\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{}
\end{CompactList}
-\item eo\-UF$<$ EOType \&, bool $>${\tt [external]}\item eo\-UF$<$ M \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{}
+\item eoUF$<$ EOType \&, bool $>${\tt [external]}\item eoUF$<$ M \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{}
\end{CompactList}
-\item eo\-UF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList}
-\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{}
+\item eoUF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList}
+\item eoMonOp$<$ M::EOType $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{}
\begin{CompactList}
-\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{}
-\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{}
-\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{}
+\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{}
+\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{}
+\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{}
\end{CompactList}
\end{CompactList}
\end{CompactList}
\end{CompactList}
-\item eo\-Op$<$ EOType $>${\tt [external]}\begin{CompactList}
-\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\end{CompactList}
+\item eoOp$<$ EOType $>${\tt [external]}\begin{CompactList}
+\item eoMonOp$<$ EOT $>${\tt [external]}\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList}
\end{CompactList}
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/main.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/main.tex
index 8d5a5e7cc..e463f4c2d 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/main.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/main.tex
@@ -1,5 +1,16 @@
-\section{intro}\label{main_intro}
-MO is an extension of the ANSI-C++ compliant evolutionary computation library \doxyref{EO}. \par
- It contains classes for almost any kind of one solution based heuristics.\section{tutorial}\label{main_tutorial}
-\section{install}\label{main_install}
-The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design}
+\section{Introduction}\label{main_Introduction}
+MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par
+ It contains classes for almost any kind of one solution based heuristics.\section{AUTHORS}\label{main_authors}
+\begin{TabularC}{1}
+\hline
+Sebastien CAHON \\\hline
+{\tt Jean-Charles BOISSON} \\\hline
+\end{TabularC}
+\section{LICENCE}\label{main_LICENCE}
+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 {\tt 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.\section{Home Page}\label{main_Paradiseo}
+{\tt http://paradiseo.gforge.inria.fr}\section{Installation}\label{main_Installation}
+The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.
\ No newline at end of file
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/refman.tex b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/refman.tex
index 92947f8e1..8b329b83b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/refman.tex
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/latex/refman.tex
@@ -7,6 +7,7 @@
\usepackage{float}
\usepackage{textcomp}
\usepackage{alltt}
+\usepackage[utf8]{inputenc}
\usepackage{doxygen}
\makeindex
\setcounter{tocdepth}{1}
@@ -17,9 +18,9 @@
\begin{center}
{\Large PARADISEO-MO Reference Manual\\[1ex]\large 0.1 }\\
\vspace*{1cm}
-{\large Generated by Doxygen 1.4.7}\\
+{\large Generated by Doxygen 1.5.2}\\
\vspace*{0.5cm}
-{\small Thu Jul 5 17:08:27 2007}\\
+{\small Tue Sep 25 16:19:07 2007}\\
\end{center}
\end{titlepage}
\clearemptydoublepage
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/EmptySelection.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/EmptySelection.3
index 150071306..683c228d1 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/EmptySelection.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/EmptySelection.3
@@ -1,4 +1,4 @@
-.TH "EmptySelection" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "EmptySelection" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,7 +16,7 @@ Special class that describes the case of no selection.
This class is used as an exception that can be thrown if a solution selector has completly failed.
.PP
-Definition at line 21 of file moMoveSelect.h.
+Definition at line 44 of file moMoveSelect.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAlgo.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAlgo.3
index c17b99982..a4e37517d 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAlgo.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAlgo.3
@@ -1,4 +1,4 @@
-.TH "moAlgo" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moAlgo" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -20,7 +20,7 @@ Description of an algorithm of the paradiseo-mo library.
\fBmoHC\fP, \fBmoTS\fP and \fBmoSA\fP are 3 examples of algorithm of the paradiseo-mo library.
.PP
-Definition at line 21 of file moAlgo.h.
+Definition at line 44 of file moAlgo.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAspirCrit.3
index e9dc2de1e..35558de34 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAspirCrit.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moAspirCrit.3
@@ -1,4 +1,4 @@
-.TH "moAspirCrit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moAspirCrit" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType::Fitness &, bool >\fP.
+Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP.
.PP
Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP.
.PP
@@ -30,7 +30,7 @@ Description of the conditions in which a tabu move could be accepted.
It is only a description... An object that herits from this class is needed to be used in a \fBmoTS\fP. See moNoAspriCrit for example.
.PP
-Definition at line 22 of file moAspirCrit.h.
+Definition at line 45 of file moAspirCrit.h.
.SH "Member Function Documentation"
.PP
.SS "template virtual void \fBmoAspirCrit\fP< M >::init ()\fC [pure virtual]\fP"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moBestImprSelect.3
index 6c0e26734..0c39d02d3 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moBestImprSelect.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moBestImprSelect.3
@@ -1,4 +1,4 @@
-.TH "moBestImprSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moBestImprSelect" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -60,7 +60,7 @@ One of the possible \fBmoMoveSelect\fP.
All neighbors are considered, and the movement which enables the best improvement is selected.
.PP
-Definition at line 22 of file moBestImprSelect.h.
+Definition at line 45 of file moBestImprSelect.h.
.SH "Member Function Documentation"
.PP
.SS "template bool \fBmoBestImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP"
@@ -85,7 +85,7 @@ TRUE if the move does not improve the fitness.
.PP
Implements \fBmoMoveSelect< M >\fP.
.PP
-Definition at line 47 of file moBestImprSelect.h.
+Definition at line 70 of file moBestImprSelect.h.
.PP
References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.
.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP"
@@ -108,7 +108,7 @@ Procedure which saved the best move and fitness.
.PP
Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
-Definition at line 68 of file moBestImprSelect.h.
+Definition at line 91 of file moBestImprSelect.h.
.PP
References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
index 88c4d2d2f..439e59f87 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
@@ -1,4 +1,4 @@
-.TH "moCoolingSchedule" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moCoolingSchedule" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -20,7 +20,7 @@ This class gives the description of a cooling schedule.
It is only a description... An object that herits from this class is needed to be used in a \fBmoSA\fP. See \fBmoExponentialCoolingSchedule\fP or \fBmoLinearCoolingSchedule\fP for example.
.PP
-Definition at line 22 of file moCoolingSchedule.h.
+Definition at line 45 of file moCoolingSchedule.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
index aadd76c73..d787ea181 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
@@ -1,4 +1,4 @@
-.TH "moExponentialCoolingSchedule" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moExponentialCoolingSchedule" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -42,7 +42,7 @@ One of the possible \fBmoCoolingSchedule\fP.
An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.
.PP
-Definition at line 22 of file moExponentialCoolingSchedule.h.
+Definition at line 45 of file moExponentialCoolingSchedule.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "moExponentialCoolingSchedule::moExponentialCoolingSchedule (double __threshold, double __ratio)\fC [inline]\fP"
@@ -58,7 +58,7 @@ Simple constructor.
.PP
.PP
-Definition at line 31 of file moExponentialCoolingSchedule.h.
+Definition at line 54 of file moExponentialCoolingSchedule.h.
.SH "Member Function Documentation"
.PP
.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP"
@@ -81,7 +81,7 @@ if the new temperature (current temperature * ratio) is greater than the thresho
.PP
Implements \fBeoUF< double &, bool >\fP.
.PP
-Definition at line 41 of file moExponentialCoolingSchedule.h.
+Definition at line 64 of file moExponentialCoolingSchedule.h.
.PP
References ratio, and threshold.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
index f3ef3a983..b6699a51a 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
@@ -1,4 +1,4 @@
-.TH "moFirstImprSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moFirstImprSelect" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -64,7 +64,7 @@ One possible \fBmoMoveSelect\fP.
The neighborhood is explored until a move enables an improvment of the current solution.
.PP
-Definition at line 23 of file moFirstImprSelect.h.
+Definition at line 46 of file moFirstImprSelect.h.
.SH "Member Function Documentation"
.PP
.SS "template virtual void \fBmoFirstImprSelect\fP< M >::init (const \fBFitness\fP & __fit)\fC [inline, virtual]\fP"
@@ -75,7 +75,7 @@ It save the current fitness as the initial value for the fitness.
.PP
Implements \fBmoMoveSelect< M >\fP.
.PP
-Definition at line 35 of file moFirstImprSelect.h.
+Definition at line 58 of file moFirstImprSelect.h.
.PP
References moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid.
.SS "template bool \fBmoFirstImprSelect\fP< M >::update (const M & __move, const typename M::EOType::Fitness & __fit)\fC [inline]\fP"
@@ -98,7 +98,7 @@ TRUE if the move does not improve the fitness.
.PP
.PP
-Definition at line 52 of file moFirstImprSelect.h.
+Definition at line 75 of file moFirstImprSelect.h.
.PP
References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid.
.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP"
@@ -121,7 +121,7 @@ Procedure which saved the best move and fitness.
.PP
Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
-Definition at line 76 of file moFirstImprSelect.h.
+Definition at line 99 of file moFirstImprSelect.h.
.PP
References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, and moFirstImprSelect< M >::valid.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moGenSolContinue.3
index 71cadb395..c8d7d106e 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moGenSolContinue.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moGenSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moGenSolContinue" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moGenSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -48,7 +48,7 @@ One possible stop criterion for a solution-based heuristic.
The stop criterion corresponds to a maximum number of iteration.
.PP
-Definition at line 21 of file moGenSolContinue.h.
+Definition at line 44 of file moGenSolContinue.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoGenSolContinue\fP< EOT >::\fBmoGenSolContinue\fP (unsigned int __maxNumGen)\fC [inline]\fP"
@@ -62,7 +62,7 @@ Simple constructor.
.PP
.PP
-Definition at line 30 of file moGenSolContinue.h.
+Definition at line 53 of file moGenSolContinue.h.
.SH "Member Function Documentation"
.PP
.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP"
@@ -85,7 +85,7 @@ TRUE or FALSE according to the current generation number.
.PP
Implements \fBeoUF< const EOT &, bool >\fP.
.PP
-Definition at line 44 of file moGenSolContinue.h.
+Definition at line 67 of file moGenSolContinue.h.
.PP
References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen.
.SS "template void \fBmoGenSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP"
@@ -96,7 +96,7 @@ It can also be used to reset the iteration counter.
.PP
Implements \fBmoSolContinue< EOT >\fP.
.PP
-Definition at line 54 of file moGenSolContinue.h.
+Definition at line 77 of file moGenSolContinue.h.
.PP
References moGenSolContinue< EOT >::numGen.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHC.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHC.3
index dc3a15d1d..38d991e96 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHC.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHC.3
@@ -1,4 +1,4 @@
-.TH "moHC" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moHC" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -60,7 +60,7 @@ Hill Climbing (HC).
Class which describes the algorithm for a hill climbing.
.PP
-Definition at line 26 of file moHC.h.
+Definition at line 49 of file moHC.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
@@ -84,7 +84,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP.
.PP
.PP
-Definition at line 53 of file moHC.h.
+Definition at line 76 of file moHC.h.
.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
Light constructor.
@@ -100,7 +100,7 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM
.PP
.PP
-Definition at line 67 of file moHC.h.
+Definition at line 90 of file moHC.h.
.SH "Member Function Documentation"
.PP
.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
@@ -123,7 +123,7 @@ TRUE.
.PP
Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
-Definition at line 82 of file moHC.h.
+Definition at line 105 of file moHC.h.
.PP
References moHC< M >::full_eval, and moHC< M >::move_expl.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
index 72f274978..4a936236c 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
@@ -1,4 +1,4 @@
-.TH "moHCMoveLoopExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moHCMoveLoopExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -62,7 +62,7 @@ Inherits \fBmoMoveLoopExpl< M >< M >\fP.
.SS "template class moHCMoveLoopExpl< M >"
Iterative explorer used by a \fBmoHC\fP.
.PP
-Definition at line 23 of file moHCMoveLoopExpl.h.
+Definition at line 46 of file moHCMoveLoopExpl.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoHCMoveLoopExpl\fP< M >::\fBmoHCMoveLoopExpl\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select)\fC [inline]\fP"
@@ -84,7 +84,7 @@ All the boxes have to be specified.
.PP
.PP
-Definition at line 43 of file moHCMoveLoopExpl.h.
+Definition at line 66 of file moHCMoveLoopExpl.h.
.SH "Member Function Documentation"
.PP
.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP"
@@ -104,7 +104,7 @@ The exploration starts from an old solution and provides a new solution.
.PP
Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
.PP
-Definition at line 59 of file moHCMoveLoopExpl.h.
+Definition at line 82 of file moHCMoveLoopExpl.h.
.PP
References moHCMoveLoopExpl< M >::incr_eval, moHCMoveLoopExpl< M >::move_init, moHCMoveLoopExpl< M >::move_select, and moHCMoveLoopExpl< M >::next_move.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
index 5afe1b749..f350bc434 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
@@ -1,4 +1,4 @@
-.TH "moImprBestFitAspirCrit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moImprBestFitAspirCrit" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -56,10 +56,10 @@ One of the possible \fBmoAspirCrit\fP.
This criterion is satisfied when a given fitness is the best ever considered.
.PP
-Definition at line 22 of file moImprBestFitAspirCrit.h.
+Definition at line 45 of file moImprBestFitAspirCrit.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline]\fP"
+.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP"
.PP
\fBFunction\fP that indicates if the fit is better that the already saved fit.
.PP
@@ -79,7 +79,9 @@ TRUE the first time and if __fit > best_fit, else FALSE.
.PP
.PP
-Definition at line 52 of file moImprBestFitAspirCrit.h.
+Implements \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP.
+.PP
+Definition at line 75 of file moImprBestFitAspirCrit.h.
.PP
References moImprBestFitAspirCrit< M >::best_fit, and moImprBestFitAspirCrit< M >::first_time.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moItRandNextMove.3
index 9ee8040e1..49acf9417 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moItRandNextMove.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moItRandNextMove.3
@@ -1,4 +1,4 @@
-.TH "moItRandNextMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moItRandNextMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -56,7 +56,7 @@ One of the possible \fBmoNextMove\fP.
This class is a move (\fBmoMove\fP) generator with a bound for the maximum number of iterations.
.PP
-Definition at line 22 of file moItRandNextMove.h.
+Definition at line 45 of file moItRandNextMove.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoItRandNextMove\fP< M >::\fBmoItRandNextMove\fP (\fBmoRandMove\fP< M > & __rand_move, unsigned int __max_iter)\fC [inline]\fP"
@@ -74,10 +74,10 @@ The constructor.
.PP
.PP
-Definition at line 37 of file moItRandNextMove.h.
+Definition at line 60 of file moItRandNextMove.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
Generation of a new move.
.PP
@@ -97,7 +97,9 @@ FALSE if the maximum number of iteration is reached, else TRUE.
.PP
.PP
-Definition at line 52 of file moItRandNextMove.h.
+Implements \fBeoBF< M &, const M::EOType &, bool >\fP.
+.PP
+Definition at line 75 of file moItRandNextMove.h.
.PP
References moItRandNextMove< M >::max_iter, moItRandNextMove< M >::num_iter, and moItRandNextMove< M >::rand_move.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
index 35057d316..98c97bb14 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
@@ -1,4 +1,4 @@
-.TH "moLSCheckPoint" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moLSCheckPoint" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ moLSCheckPoint \- Class which allows a checkpointing system.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP.
+Inherits \fBeoBF< const M &, const M::EOType &, void >\fP.
.PP
.SS "Public Member Functions"
@@ -38,9 +38,9 @@ Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP.
.SS "template class moLSCheckPoint< M >"
Class which allows a checkpointing system.
-Thanks to this class, at each iteration, additionnal function can be used (and not only one).
+Thanks to this class, at each iteration, additionnal functions can be used (and not only one).
.PP
-Definition at line 21 of file moLSCheckPoint.h.
+Definition at line 44 of file moLSCheckPoint.h.
.SH "Member Function Documentation"
.PP
.SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & __move, const typename M::EOType & __sol)\fC [inline]\fP"
@@ -58,7 +58,7 @@ Each saved function is used on the current move and the current solution.
.PP
.PP
-Definition at line 34 of file moLSCheckPoint.h.
+Definition at line 57 of file moLSCheckPoint.h.
.PP
References moLSCheckPoint< M >::func.
.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP"
@@ -74,7 +74,7 @@ The new function is added at the end of the vector.
.PP
.PP
-Definition at line 49 of file moLSCheckPoint.h.
+Definition at line 72 of file moLSCheckPoint.h.
.PP
References moLSCheckPoint< M >::func.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
index 690323095..009a737f3 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
@@ -1,4 +1,4 @@
-.TH "moLinearCoolingSchedule" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moLinearCoolingSchedule" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -42,7 +42,7 @@ One of the possible \fBmoCoolingSchedule\fP.
An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold.
.PP
-Definition at line 22 of file moLinearCoolingSchedule.h.
+Definition at line 45 of file moLinearCoolingSchedule.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "moLinearCoolingSchedule::moLinearCoolingSchedule (double __threshold, double __quantity)\fC [inline]\fP"
@@ -58,7 +58,7 @@ Simple constructor.
.PP
.PP
-Definition at line 31 of file moLinearCoolingSchedule.h.
+Definition at line 54 of file moLinearCoolingSchedule.h.
.SH "Member Function Documentation"
.PP
.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP"
@@ -81,7 +81,7 @@ if the new temperature (current temperature - quantity) is greater than the thre
.PP
Implements \fBeoUF< double &, bool >\fP.
.PP
-Definition at line 41 of file moLinearCoolingSchedule.h.
+Definition at line 64 of file moLinearCoolingSchedule.h.
.PP
References quantity, and threshold.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMove.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMove.3
index 5badf3f88..c28aab479 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMove.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMove.3
@@ -1,4 +1,4 @@
-.TH "moMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -28,7 +28,7 @@ Definition of a move.
A move transforms a solution to another close solution. It describes how a solution can be modified to another one.
.PP
-Definition at line 23 of file moMove.h.
+Definition at line 46 of file moMove.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveExpl.3
index ecd0ce321..188ee6eca 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveExpl.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveExpl.3
@@ -1,4 +1,4 @@
-.TH "moMoveExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moMoveExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Description of a move (\fBmoMove\fP) explorer.
Only a description...See \fBmoMoveLoopExpl\fP.
.PP
-Definition at line 21 of file moMoveExpl.h.
+Definition at line 44 of file moMoveExpl.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
index 4cf88cab3..eb0a44534 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
@@ -1,4 +1,4 @@
-.TH "moMoveIncrEval" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moMoveIncrEval" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness >\fP.
+Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP.
.PP
.SH "Detailed Description"
.PP
@@ -20,7 +20,7 @@ Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness
From a move and a solution, it computes a new fitness that could be associated to the solution if this one is updated.
.PP
-Definition at line 24 of file moMoveIncrEval.h.
+Definition at line 47 of file moMoveIncrEval.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveInit.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveInit.3
index d8373783a..b8490a4d8 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveInit.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveInit.3
@@ -1,4 +1,4 @@
-.TH "moMoveInit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moMoveInit" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ moMoveInit \- Move (\fBmoMove\fP) initializer.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, void >\fP.
+Inherits \fBeoBF< M &, const M::EOType &, void >\fP.
.PP
.SH "Detailed Description"
.PP
@@ -20,7 +20,7 @@ Move (\fBmoMove\fP) initializer.
Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used.
.PP
-Definition at line 22 of file moMoveInit.h.
+Definition at line 45 of file moMoveInit.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
index f9002b1f4..c5967195a 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
@@ -1,4 +1,4 @@
-.TH "moMoveLoopExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moMoveLoopExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Class which describes an iterative explorer.
Only a description... \fBmoHCMoveLoopExpl\fP and \fBmoTSMoveLoopExpl\fP are exemples of class that are a \fBmoMoveLoopExpl\fP.
.PP
-Definition at line 21 of file moMoveLoopExpl.h.
+Definition at line 44 of file moMoveLoopExpl.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveSelect.3
index 8d330d181..381c61390 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveSelect.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moMoveSelect.3
@@ -1,4 +1,4 @@
-.TH "moMoveSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moMoveSelect" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -42,7 +42,7 @@ Class that describes a move selector (\fBmoMove\fP).
It iteratively considers some moves (\fBmoMove\fP) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
.PP
-Definition at line 32 of file moMoveSelect.h.
+Definition at line 55 of file moMoveSelect.h.
.SH "Member Function Documentation"
.PP
.SS "template virtual void \fBmoMoveSelect\fP< M >::init (const \fBFitness\fP & __fit)\fC [pure virtual]\fP"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNextMove.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNextMove.3
index df4e2ba03..4c6462551 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNextMove.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNextMove.3
@@ -1,4 +1,4 @@
-.TH "moNextMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moNextMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP).
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, bool >\fP.
+Inherits \fBeoBF< M &, const M::EOType &, bool >\fP.
.PP
Inherited by \fBmoItRandNextMove< M >\fP.
.PP
@@ -22,7 +22,7 @@ Class which allows to generate a new move (\fBmoMove\fP).
Useful for the explorer (for \fBmoTS\fP or \fBmoHC\fP). Does nothing... An object that herits from this class needs to be designed for being used.
.PP
-Definition at line 22 of file moNextMove.h.
+Definition at line 45 of file moNextMove.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
index be03a8e17..ef8a9315c 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
@@ -1,4 +1,4 @@
-.TH "moNoAspirCrit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moNoAspirCrit" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -32,7 +32,7 @@ One of the possible aspiration criterion (\fBmoAspirCrit\fP).
The simplest : never satisfied.
.PP
-Definition at line 21 of file moNoAspirCrit.h.
+Definition at line 44 of file moNoAspirCrit.h.
.SH "Member Function Documentation"
.PP
.SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & __move, const typename M::EOType::Fitness & __sol)\fC [inline, private]\fP"
@@ -55,7 +55,7 @@ FALSE.
.PP
.PP
-Definition at line 32 of file moNoAspirCrit.h.
+Definition at line 55 of file moNoAspirCrit.h.
.SS "template void \fBmoNoAspirCrit\fP< M >::init ()\fC [inline, private, virtual]\fP"
.PP
Procedure which initialises all that needs a \fBmoNoAspirCrit\fP.
@@ -64,7 +64,7 @@ Nothing...
.PP
Implements \fBmoAspirCrit< M >\fP.
.PP
-Definition at line 43 of file moNoAspirCrit.h.
+Definition at line 66 of file moNoAspirCrit.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandImprSelect.3
index 2b1478122..8edb47cf5 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandImprSelect.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandImprSelect.3
@@ -1,4 +1,4 @@
-.TH "moRandImprSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moRandImprSelect" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -60,7 +60,7 @@ One of the possible \fBmoMove\fP selector (\fBmoMoveSelect\fP).
All the neighbors are considered. One of them that enables an improvment of the objective function is choosen.
.PP
-Definition at line 25 of file moRandImprSelect.h.
+Definition at line 48 of file moRandImprSelect.h.
.SH "Member Function Documentation"
.PP
.SS "template void \fBmoRandImprSelect\fP< M >::init (const \fBFitness\fP & __fit)\fC [inline, virtual]\fP"
@@ -78,7 +78,7 @@ Give a value to the initialise fitness. Clean the move and fitness vectors.
.PP
Implements \fBmoMoveSelect< M >\fP.
.PP
-Definition at line 40 of file moRandImprSelect.h.
+Definition at line 63 of file moRandImprSelect.h.
.PP
References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.
.SS "template bool \fBmoRandImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP"
@@ -103,7 +103,7 @@ TRUE.
.PP
Implements \fBmoMoveSelect< M >\fP.
.PP
-Definition at line 56 of file moRandImprSelect.h.
+Definition at line 79 of file moRandImprSelect.h.
.PP
References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.
.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP"
@@ -128,7 +128,7 @@ One the saved move is randomly chosen.
.PP
Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
-Definition at line 77 of file moRandImprSelect.h.
+Definition at line 100 of file moRandImprSelect.h.
.PP
References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandMove.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandMove.3
index 5841293a5..6ac101545 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandMove.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moRandMove.3
@@ -1,4 +1,4 @@
-.TH "moRandMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moRandMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -20,7 +20,7 @@ Random move generator.
Only a description... An object that herits from this class needs to be designed in order to use a \fBmoSA\fP.
.PP
-Definition at line 21 of file moRandMove.h.
+Definition at line 44 of file moRandMove.h.
.SH "Author"
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSA.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSA.3
index 8370d6380..e89c1fc4b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSA.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSA.3
@@ -1,4 +1,4 @@
-.TH "moSA" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moSA" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -72,7 +72,7 @@ Simulated Annealing (SA).
Class that describes a Simulated Annealing algorithm.
.PP
-Definition at line 30 of file moSA.h.
+Definition at line 53 of file moSA.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
@@ -98,7 +98,7 @@ All the boxes used by a SA need to be given.
.PP
.PP
-Definition at line 58 of file moSA.h.
+Definition at line 81 of file moSA.h.
.SH "Member Function Documentation"
.PP
.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
@@ -121,7 +121,7 @@ TRUE.
.PP
Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
-Definition at line 80 of file moSA.h.
+Definition at line 103 of file moSA.h.
.PP
References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform().
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
index 90020e3fa..1c64bfde1 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
@@ -1,4 +1,4 @@
-.TH "moSimpleMoveTabuList" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moSimpleMoveTabuList" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -74,10 +74,10 @@ Inherits \fBmoTabuList< M >< M >\fP.
.SS "template class moSimpleMoveTabuList< M >"
Class describing a move tabu list with a limited memory.
.PP
-Definition at line 22 of file moSimpleMoveTabuList.h.
+Definition at line 45 of file moSimpleMoveTabuList.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
\fBFunction\fP that indicates if, in a given state, the _move is tabu or not.
.PP
@@ -95,7 +95,9 @@ true or false.
.PP
.PP
-Definition at line 46 of file moSimpleMoveTabuList.h.
+Implements \fBeoBF< const M &, const M::EOType &, bool >\fP.
+.PP
+Definition at line 69 of file moSimpleMoveTabuList.h.
.PP
References moSimpleMoveTabuList< M >::tabuList.
.SS "template void \fBmoSimpleMoveTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP"
@@ -115,7 +117,7 @@ The two parameters have not to be modified so they are constant parameters.
.PP
Implements \fBmoTabuList< M >\fP.
.PP
-Definition at line 60 of file moSimpleMoveTabuList.h.
+Definition at line 83 of file moSimpleMoveTabuList.h.
.PP
References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, moSimpleMoveTabuList< M >::removeMove(), and moSimpleMoveTabuList< M >::tabuList.
.SS "template void \fBmoSimpleMoveTabuList\fP< M >::update ()\fC [inline, virtual]\fP"
@@ -126,7 +128,7 @@ Generally, a counter associated to each saved move is decreased by one.
.PP
Implements \fBmoTabuList< M >\fP.
.PP
-Definition at line 82 of file moSimpleMoveTabuList.h.
+Definition at line 105 of file moSimpleMoveTabuList.h.
.SS "template void \fBmoSimpleMoveTabuList\fP< M >::init ()\fC [inline, virtual]\fP"
.PP
Procedure which initialises the tabu list.
@@ -135,7 +137,7 @@ Can be useful if the data structure needs to be allocated before being used.
.PP
Implements \fBmoTabuList< M >\fP.
.PP
-Definition at line 88 of file moSimpleMoveTabuList.h.
+Definition at line 111 of file moSimpleMoveTabuList.h.
.SS "template void \fBmoSimpleMoveTabuList\fP< M >::removeMove (const M & __move)\fC [inline, private]\fP"
.PP
Procedure that removes a given move from the tabu list (if it is into, else do nothing).
@@ -147,7 +149,7 @@ Procedure that removes a given move from the tabu list (if it is into, else do n
.PP
.PP
-Definition at line 100 of file moSimpleMoveTabuList.h.
+Definition at line 123 of file moSimpleMoveTabuList.h.
.PP
References moSimpleMoveTabuList< M >::tabuList.
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
index c81448eca..7d5f7ffdc 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
@@ -1,4 +1,4 @@
-.TH "moSimpleSolutionTabuList" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moSimpleSolutionTabuList" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -74,7 +74,7 @@ Inherits \fBmoTabuList< M >< M >\fP.
.SS "template class moSimpleSolutionTabuList< M >"
Class describing a solution tabu list with limited length.
.PP
-Definition at line 22 of file moSimpleSolutionTabuList.h.
+Definition at line 45 of file moSimpleSolutionTabuList.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoSimpleSolutionTabuList\fP< M >::\fBmoSimpleSolutionTabuList\fP (unsigned int __size)\fC [inline]\fP"
@@ -88,12 +88,12 @@ Constructor.
.PP
.PP
-Definition at line 34 of file moSimpleSolutionTabuList.h.
+Definition at line 57 of file moSimpleSolutionTabuList.h.
.PP
References moSimpleSolutionTabuList< M >::currentSize.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
\fBFunction\fP that indicates if, in a given state, the _move is tabu or not.
.PP
@@ -111,7 +111,9 @@ true or false.
.PP
.PP
-Definition at line 45 of file moSimpleSolutionTabuList.h.
+Implements \fBeoBF< const M &, const M::EOType &, bool >\fP.
+.PP
+Definition at line 68 of file moSimpleSolutionTabuList.h.
.PP
References moSimpleSolutionTabuList< M >::tabuList.
.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP"
@@ -131,7 +133,7 @@ The two parameters have not to be modified so they are constant parameters.
.PP
Implements \fBmoTabuList< M >\fP.
.PP
-Definition at line 64 of file moSimpleSolutionTabuList.h.
+Definition at line 87 of file moSimpleSolutionTabuList.h.
.PP
References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, moSimpleSolutionTabuList< M >::removeSolution(), and moSimpleSolutionTabuList< M >::tabuList.
.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::update ()\fC [inline, virtual]\fP"
@@ -142,7 +144,7 @@ Generally, a counter associated to each saved move is decreased by one.
.PP
Implements \fBmoTabuList< M >\fP.
.PP
-Definition at line 91 of file moSimpleSolutionTabuList.h.
+Definition at line 114 of file moSimpleSolutionTabuList.h.
.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::init ()\fC [inline, virtual]\fP"
.PP
Procedure which initialises the tabu list.
@@ -151,7 +153,7 @@ Can be useful if the data structure needs to be allocated before being used.
.PP
Implements \fBmoTabuList< M >\fP.
.PP
-Definition at line 97 of file moSimpleSolutionTabuList.h.
+Definition at line 120 of file moSimpleSolutionTabuList.h.
.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::removeSolution (const \fBEOT\fP & __sol)\fC [inline, private]\fP"
.PP
Procedure that removes a given solution from the tabu list (if it is into, else does nothing).
@@ -163,7 +165,7 @@ Procedure that removes a given solution from the tabu list (if it is into, else
.PP
.PP
-Definition at line 109 of file moSimpleSolutionTabuList.h.
+Definition at line 132 of file moSimpleSolutionTabuList.h.
.PP
References moSimpleSolutionTabuList< M >::tabuList.
.PP
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSolContinue.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSolContinue.3
index 685bb7b7d..d646f1a89 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSolContinue.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moSolContinue" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Class that describes a stop criterion for a solution-based heuristic.
It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP).
.PP
-Definition at line 22 of file moSolContinue.h.
+Definition at line 45 of file moSolContinue.h.
.SH "Member Function Documentation"
.PP
.SS "template virtual void \fBmoSolContinue\fP< EOT >::init ()\fC [pure virtual]\fP"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTS.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTS.3
index 725a4c776..a7be701fb 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTS.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTS.3
@@ -1,4 +1,4 @@
-.TH "moTS" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moTS" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -64,7 +64,7 @@ Tabu Search (TS).
Generic algorithm that describes a tabu search.
.PP
-Definition at line 29 of file moTS.h.
+Definition at line 52 of file moTS.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
@@ -92,7 +92,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated.
.PP
.PP
-Definition at line 58 of file moTS.h.
+Definition at line 81 of file moTS.h.
.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
Constructor with less parameters.
@@ -110,7 +110,7 @@ The explorer is given in the parameters.
.PP
.PP
-Definition at line 71 of file moTS.h.
+Definition at line 94 of file moTS.h.
.SH "Member Function Documentation"
.PP
.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
@@ -133,7 +133,7 @@ TRUE.
.PP
Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
-Definition at line 85 of file moTS.h.
+Definition at line 108 of file moTS.h.
.PP
References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
index 961597d11..93f2d5228 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
@@ -1,4 +1,4 @@
-.TH "moTSMoveLoopExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moTSMoveLoopExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -72,7 +72,7 @@ Explorer for a Tabu Search algorithm.
It is used by a \fBmoTS\fP.
.PP
-Definition at line 30 of file moTSMoveLoopExpl.h.
+Definition at line 53 of file moTSMoveLoopExpl.h.
.SH "Constructor & Destructor Documentation"
.PP
.SS "template \fBmoTSMoveLoopExpl\fP< M >::\fBmoTSMoveLoopExpl\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit)\fC [inline]\fP"
@@ -94,7 +94,7 @@ Constructor.
.PP
.PP
-Definition at line 49 of file moTSMoveLoopExpl.h.
+Definition at line 72 of file moTSMoveLoopExpl.h.
.PP
References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list.
.SH "Member Function Documentation"
@@ -116,7 +116,7 @@ The exploration continues while the chosen move is not in the tabu list or the a
.PP
Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
.PP
-Definition at line 69 of file moTSMoveLoopExpl.h.
+Definition at line 92 of file moTSMoveLoopExpl.h.
.PP
References moTSMoveLoopExpl< M >::aspir_crit, moTSMoveLoopExpl< M >::incr_eval, moTSMoveLoopExpl< M >::move_init, moTSMoveLoopExpl< M >::move_select, moTSMoveLoopExpl< M >::next_move, and moTSMoveLoopExpl< M >::tabu_list.
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTabuList.3 b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTabuList.3
index 8e56844ac..842151b5f 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTabuList.3
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/doc/man/man3/moTabuList.3
@@ -1,4 +1,4 @@
-.TH "moTabuList" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
+.TH "moTabuList" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,7 +10,7 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP.
+Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP.
.PP
Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP.
.PP
@@ -46,7 +46,7 @@ Class describing a tabu list that a \fBmoTS\fP uses.
It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \fBmoTS\fP.
.PP
-Definition at line 22 of file moTabuList.h.
+Definition at line 45 of file moTabuList.h.
.SH "Member Function Documentation"
.PP
.SS "template virtual void \fBmoTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [pure virtual]\fP"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/index.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/index.h
index 10ac58f88..b1c9027af 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/index.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/index.h
@@ -1,21 +1,91 @@
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * 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
+ */
+
/** @mainpage Welcome to PARADISEO-Moving Objects
-@section intro Introduction
+@section Introduction
MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
It contains classes for almost any kind of one solution based heuristics.
-@section tutorial Tutorial
+@section authors AUTHORS
+
-@section install Installation
+@section LICENCE
+
+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.
+
+@section Paradiseo Home Page
+
+http://paradiseo.gforge.inria.fr
+
+@section Installation
The installation procedure of the package is detailed in the
README file in the top-directory of the source-tree.
-@section design Overall Design
-
*/
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo
index 81c9fea9f..b6d6df8a3 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo
@@ -1,3 +1,37 @@
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * 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
+ */
+
#ifndef __mo
#define __mo
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo.h
index 58476ce6b..d05c638ba 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/mo.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "mo.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __mo_h
#define __mo_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAlgo.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAlgo.h
index 42bd849a9..3ec262305 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAlgo.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAlgo.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moAlgo.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moAlgo_h
#define __moAlgo_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAspirCrit.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAspirCrit.h
index 99c92727b..cb08aa69b 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAspirCrit.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moAspirCrit.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moAspirCrit.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moAspirCrit_h
#define __moAspirCrit_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moBestImprSelect.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moBestImprSelect.h
index 30c846236..a34418f23 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moBestImprSelect.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moBestImprSelect.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moBestImprSelect.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moBestImprSelect_h
#define __moBestImprSelect_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moCoolingSchedule.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moCoolingSchedule.h
index c73b25c01..f9b3804ab 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moCoolingSchedule.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moCoolingSchedule.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moCoolingSchedule.h"
-
-// (c) OPAC Team, LIFL, 2003-2007
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moCoolingSchedule_h
#define __moCoolingSchedule_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moExponentialCoolingSchedule.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moExponentialCoolingSchedule.h
index e67614951..8398f2519 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moExponentialCoolingSchedule.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moExponentialCoolingSchedule.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moExponentialCoolingSchedule.h"
-
-// (c) OPAC Team, LIFL, 2003-2007
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * 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
+ */
#ifndef __moExponentialCoolingSchedule_h
#define __moExponentialCoolingSchedule_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moFirstImprSelect.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moFirstImprSelect.h
index 6656d5a95..3b0e967d8 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moFirstImprSelect.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moFirstImprSelect.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moFirstImprSelect.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moFirstImprSelect_h
#define __moFirstImprSelect_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moGenSolContinue.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moGenSolContinue.h
index 2bd8ba4e5..f76c1d8d8 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moGenSolContinue.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moGenSolContinue.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "eoGenSolContinue.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moGenSolContinue_h
#define __moGenSolContinue_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHC.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHC.h
index 30d82ed00..e9341988b 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHC.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHC.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moHC.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moHC_h
#define __moHC_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHCMoveLoopExpl.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHCMoveLoopExpl.h
index f9ff78bea..468073dd3 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHCMoveLoopExpl.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moHCMoveLoopExpl.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moHCMoveLoopExpl.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moHCMoveLoopExpl_h
#define __moHCMoveLoopExpl_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moImprBestFitAspirCrit.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moImprBestFitAspirCrit.h
index d0cf06486..feabb9d51 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moImprBestFitAspirCrit.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moImprBestFitAspirCrit.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moImprAspirCrit.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moImprBestFitAspirCrit_h
#define __moImprBestFitAspirCrit_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moItRandNextMove.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moItRandNextMove.h
index ceacc061a..c3301dea6 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moItRandNextMove.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moItRandNextMove.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moNextMove.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moItRandNextMove_h
#define __moItRandNextMove_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLSCheckPoint.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLSCheckPoint.h
index 097208a83..2086935e4 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLSCheckPoint.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLSCheckPoint.h
@@ -1,22 +1,45 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
-// "moLSCheckPoint.h"
-
-// (c) OPAC Team, LIFL, 2003
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
-
-#ifndef __moSolUpdater_h
-#define __moSolUpdater_h
+#ifndef __moLSCheckPoint_h
+#define __moLSCheckPoinr_h
#include
//! Class which allows a checkpointing system.
/*!
- Thanks to this class, at each iteration, additionnal function can be used (and not only one).
+ Thanks to this class, at each iteration, additionnal functions can be used (and not only one).
*/
template < class M > class moLSCheckPoint:public eoBF < const M &, const typename
M::EOType &, void >
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLinearCoolingSchedule.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLinearCoolingSchedule.h
index 62d48c427..b5765af39 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLinearCoolingSchedule.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moLinearCoolingSchedule.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moLinearCoolingSchedule.h"
-
-// (c) OPAC Team, LIFL, 2003-2007
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * 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
+ */
#ifndef __moLinearCoolingSchedule_h
#define __moLinearCoolingSchedule_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMove.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMove.h
index 5c7f41818..bda3350a5 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMove.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMove.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moMove.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moMove_h
#define __moMove_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveExpl.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveExpl.h
index 0905e3186..f547b34fe 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveExpl.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveExpl.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "eoMoveExpl.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moMoveExpl_h
#define __moMoveExpl_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveIncrEval.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveIncrEval.h
index 7dd633141..8106b2194 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveIncrEval.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveIncrEval.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "eoMoveIncrEval.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moMoveIncrEval_h
#define __moMoveIncrEval_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveInit.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveInit.h
index dfba59661..e50802dd6 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveInit.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveInit.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moMoveInit.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moMoveInit_h
#define __moMoveInit_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveLoopExpl.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveLoopExpl.h
index 5d35e8aac..2b168b74a 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveLoopExpl.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveLoopExpl.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moMoveLoopExpl.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moMoveLoopExpl_h
#define __moMoveLoopExpl_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveSelect.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveSelect.h
index 7595ba61d..564e7524d 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveSelect.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moMoveSelect.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moMoveSelect.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moMoveSelect_h
#define __moMoveSelect_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNextMove.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNextMove.h
index 93748fe74..0b5060003 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNextMove.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNextMove.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moNextMove.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moNextMove_h
#define __moNextMove_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNoAspirCrit.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNoAspirCrit.h
index a5e499ccb..234c65cc1 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNoAspirCrit.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moNoAspirCrit.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "eoNoAspirCrit.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moNoAspirCrit_h
#define __moNoAspirCrit_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandImprSelect.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandImprSelect.h
index 4d60e794a..0933a6867 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandImprSelect.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandImprSelect.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moRandImprSelect.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moRandImprSelect_h
#define __moRandImprSelect_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandMove.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandMove.h
index b17de3868..ce93a15ca 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandMove.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moRandMove.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moRandMove.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moRandMove_h
#define __moRandMove_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSA.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSA.h
index 97eaabf8e..d5d764797 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSA.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSA.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moSA.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moSA_h
#define __moSA_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleMoveTabuList.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleMoveTabuList.h
index efa97fe5d..e69350640 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleMoveTabuList.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleMoveTabuList.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moSimpleMoveTabuList.h"
-
-// (c) OPAC Team, LIFL, 2003-2007
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * 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
+ */
#ifndef __moSimpleMoveTabuList_h
#define __moSimpleMoveTabuList_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleSolutionTabuList.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleSolutionTabuList.h
index 82d00b2fa..717587983 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleSolutionTabuList.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSimpleSolutionTabuList.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moSimpleSolutionTabuList.h"
-
-// (c) OPAC Team, LIFL, 2003-2007
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moSimpleSolutionTabuList_h
#define __moSimpleSolutionTabuList_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSolContinue.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSolContinue.h
index 44efdd969..ec42b02a8 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSolContinue.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moSolContinue.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moSolContinue.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moSolContinue_h
#define __moSolContinue_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTS.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTS.h
index 8aa134d5d..657ccd0af 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTS.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTS.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moTS.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moTS_h
#define __moTS_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTSMoveLoopExpl.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTSMoveLoopExpl.h
index 53ed30a74..4639b6855 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTSMoveLoopExpl.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTSMoveLoopExpl.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moTSMoveLoopExpl.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moTSMoveLoopExpl_h
#define __moTSMoveLoopExpl_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTabuList.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTabuList.h
index de550cce9..1fb26bb0b 100755
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTabuList.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/src/moTabuList.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "moTabuList.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef __moTabuList_h
#define __moTabuList_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
index f9151b246..b1da9d935 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "hill_climbing.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
index 13913bdb7..9453f6d58 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "tabu_search.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
index b768b075b..385a6e753 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "simulated_annealing.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp
index 567f53fb6..781da8369 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "city_swap.cpp"
-
-// (c) OPAC Team, LIFL, 2002-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.h
index 784324e1f..9fb337941 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/city_swap.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "city_swap.h"
-
-// (c) OPAC Team, LIFL, 2002-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef city_swap_h
#define city_swap_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp
index c8984e204..57d7e0326 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "edge_xover.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.h
index 3c22e2f8f..b5d3ad2f7 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/edge_xover.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "edge_xover.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef edge_xover_h
#define edge_xover_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.cpp
index 0a0e07fcd..547228232 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "graph.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.h
index 19baf8ac4..83688ad8a 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/graph.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "graph.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef graph_h
#define graph_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/mix.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/mix.h
index 390168d54..5b3e382be 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/mix.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/mix.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "mix.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef mix_h
#define mix_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp
index 54de70705..033b60bb9 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "order_xover.cpp"
-
-// (c) OPAC Team, LIFL, 2002-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.h
index 587c35652..c21b2c7c3 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/order_xover.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "order_xover.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef order_xover_h
#define order_xover_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp
index 53e41a5d4..092e33f32 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "part_route_eval.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "part_route_eval.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h
index 2fbd3b35c..95101852b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "part_route_eval.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef part_route_eval_h
#define part_route_eval_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp
index 9f674916c..bc9de84e4 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "part_two_opt_init.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h
index 406a4c64f..aa8b8b2a2 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "part_two_opt_init.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef part_two_opt_init_h
#define part_two_opt_init_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp
index 3fab484ec..b31162601 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "part_two_opt_next.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "part_two_opt_next.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h
index e9ef5bb4e..4e3a79860 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "part_two_opt_next.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef part_two_opt_next_h
#define part_two_opt_next_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp
index 2c57e70a3..94e10db82 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "partial_mapped_xover.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h
index a128fb9de..0d4129da0 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "partial_mapped_xover.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef partial_mapped_xover_h
#define partial_mapped_xover_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route.h
index 2489b63bc..631f14d32 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef route_h
#define route_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp
index 0d0d6e413..f74d9d7c8 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route_eval.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* TEXT LICENCE
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "route_eval.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.h
index 69b9c7737..94dc5ae66 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_eval.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route_eval.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef route_eval_h
#define route_eval_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.cpp
index f22ca1bf2..233802c37 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route_init.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.h
index 654c1a926..bb8e7e922 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_init.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route_init.h"
-
-// (c) OPAC Team, LIFL, 2002-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef route_init_h
#define route_init_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp
index be4c7fc0c..ef11d1a7a 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route_valid.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "route_valid.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.h
index 90763d7fc..897410cd2 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/route_valid.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "route_valid.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef route_valid_h
#define route_valid_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp
index 9aa779d50..1bc742310 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "two_opt.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.h
index 279a813c9..784e8b804 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef two_opt_h
#define two_opt_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp
index 1b371104b..1a06469ff 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "TwoOptIncrEval.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "two_opt_incr_eval.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h
index 233cb264d..22b7fa225 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "TwoOptIncrEval.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef two_optincr_eval_h
#define two_optincr_eval_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp
index bc464f6ad..b1b196d15 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_init.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "two_opt_init.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h
index b8460f69e..d66458165 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_init.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef two_opt_init_h
#define two_opt_init_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp
index d0b297f51..9c2d18380 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_next.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "two_opt_next.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h
index ac60bc3e6..b6c495db5 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_next.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef two_opt_next_h
#define two_opt_next_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp
index 7db7f6cb7..54e067b7b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_rand.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "two_opt_rand.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h
index 600cf8b77..d013b8667 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_rand.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef two_opt_rand_h
#define two_opt_rand_h
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp
index f5492cde3..550b26451 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_tabu_list.cpp"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#include "two_opt_tabu_list.h"
#include "graph.h"
diff --git a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h
index 29c6c8439..001e9b51b 100644
--- a/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h
+++ b/tags/paradiseo-ix86-1.0/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h
@@ -1,13 +1,36 @@
-// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-
-// "two_opt_tabu_list.h"
-
-// (c) OPAC Team, LIFL, 2003-2006
-
-/* LICENCE TEXT
-
- Contact: paradiseo-help@lists.gforge.inria.fr
-*/
+/*
+ *
+ * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+ * (C) OPAC Team, LIFL, 2002-2007
+ *
+ * Sebastien CAHON
+ *
+ * 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
+ */
#ifndef two_opt_tabu_list_h
#define two_opt_tabu_list_h
eoFunctorBase [external]
eoUF< EOType &, bool > [external]
