index.h
mo.h
moAlgo.h
diff --git a/trunk/paradiseo-mo/doc/latex/annotated.tex b/trunk/paradiseo-mo/doc/latex/annotated.tex
index cef418d52..d9ae06077 100644
--- a/trunk/paradiseo-mo/doc/latex/annotated.tex
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex b/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex
index 4b44303b4..942fea7fc 100644
--- a/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex
+++ b/trunk/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 21 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/trunk/paradiseo-mo/doc/latex/classmo_algo.tex b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex
index bfd2994a6..6564c8f7a 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex
+++ b/trunk/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 21 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/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
index 7a0252d70..da056c4c6 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
index 8349f497a..78dea621f 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
+++ b/trunk/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 22 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/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
index f0598e3a1..1cb7a44d5 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
+++ b/trunk/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 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 22 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.
+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 47 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 68 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/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
index 65e4977be..47648d9d0 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
+++ b/trunk/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 22 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/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
index 728025e98..b572655f6 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
+++ b/trunk/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 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 22 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 31 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.
+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 41 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/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
index 68e591cc4..412bfec33 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
+++ b/trunk/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 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 23 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 35 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.
+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 52 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 76 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/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
index e123e64bb..19c044b84 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
+++ b/trunk/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 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 21 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 30 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.
+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 44 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 54 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/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex
index ef82357b0..b402914eb 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex
+++ b/trunk/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 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 26 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 53 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 67 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.
+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 82 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/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
index 8b96d664a..776f8a638 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
+++ b/trunk/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 23 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 43 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 59 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/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
index a00a3c3cb..b569936e2 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
index c1ffc5c16..6647d77fa 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
+++ b/trunk/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 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 22 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.
+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 52 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/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
index 5f2df0014..3c5267824 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
index b14d59d18..e7abc9a90 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
+++ b/trunk/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 22 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 37 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 52 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/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps
index dfd4f441a..1c276f23e 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
index 9ac583db0..b9d378132 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
+++ b/trunk/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,20 +14,20 @@ 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 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.
@@ -35,15 +35,15 @@ Thanks to this class, at each iteration, additionnal function can be used (and n
-Definition at line 21 of file mo\-LSCheck\-Point.h.
+Definition at line 21 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.
+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 34 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 49 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/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
index 5a239d9f4..59b77e02d 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
+++ b/trunk/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 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 22 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 31 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.
+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 41 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/trunk/paradiseo-mo/doc/latex/classmo_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_move.tex
index 05267ce0e..e178fa21e 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move.tex
+++ b/trunk/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 23 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/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex
index 5d0b1e66b..0e4a7e621 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex
+++ b/trunk/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 21 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/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps
index 1f107a403..bbff52acc 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
index 91421ef4b..85bba26c1 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
+++ b/trunk/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 24 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/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps
index e04209e70..783ab9a81 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex
index 353911436..904ac7911 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex
+++ b/trunk/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 22 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/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
index 1a6c5b997..15968268f 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
+++ b/trunk/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 21 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/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex
index 6a9be3909..82d8378b7 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex
+++ b/trunk/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 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 32 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.
+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/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps
index 08b997f12..dfda1c365 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex
index 7da58dd8d..3fdea7d9d 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex
+++ b/trunk/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 22 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/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
index f5d50a373..8bc333965 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
index 88109d6be..c9169ff46 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
+++ b/trunk/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 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 21 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.
+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 32 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 43 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/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
index 5e7d64978..965d745cd 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
+++ b/trunk/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 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 25 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 40 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.
+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 56 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 77 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/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex
index a35b6919a..665d27245 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex
+++ b/trunk/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 21 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/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex
index 017b05804..a58e3a510 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex
+++ b/trunk/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 30 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 58 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 80 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/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
index b0dcef476..95d9a8476 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
index 729e656e6..d80f3328b 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
+++ b/trunk/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 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 22 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.
+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 46 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 60 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 82 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 88 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 100 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/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
index 06f8e8fc5..c673817e4 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
index 7d0407bd5..9437723d9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
+++ b/trunk/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 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 22 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 34 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.
+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 45 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 64 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 91 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 97 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 109 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/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex
index 3eafbc4e4..bc98d68d9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex
+++ b/trunk/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 22 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/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex
index 1eb22beb6..28299680d 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex
+++ b/trunk/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 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 29 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 58 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 71 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.
+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 85 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/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
index 30f0a7156..2a5d367c6 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
+++ b/trunk/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 30 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 49 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 69 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/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps
index 43c125a8a..2aee2f1b6 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex
index 89cb23468..1ed7c1b47 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex
+++ b/trunk/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 22 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/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty
index f54e6ffad..cca9cf2eb 100644
--- a/trunk/paradiseo-mo/doc/latex/doxygen.sty
+++ b/trunk/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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by Doxygen }}
\cfoot{}
\newenvironment{Code}
{\footnotesize}
diff --git a/trunk/paradiseo-mo/doc/latex/hierarchy.tex b/trunk/paradiseo-mo/doc/latex/hierarchy.tex
index ae3028808..66deba8dc 100644
--- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex
+++ b/trunk/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/trunk/paradiseo-mo/doc/latex/main.tex b/trunk/paradiseo-mo/doc/latex/main.tex
index 8d5a5e7cc..8dba03e9c 100644
--- a/trunk/paradiseo-mo/doc/latex/main.tex
+++ b/trunk/paradiseo-mo/doc/latex/main.tex
@@ -1,5 +1,5 @@
\section{intro}\label{main_intro}
-MO is an extension of the ANSI-C++ compliant evolutionary computation library \doxyref{EO}. \par
+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{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}
diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex
index 92947f8e1..8bfca074c 100644
--- a/trunk/paradiseo-mo/doc/latex/refman.tex
+++ b/trunk/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 Fri Jul 6 17:23:18 2007}\\
\end{center}
\end{titlepage}
\clearemptydoublepage
diff --git a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3
index 150071306..775ecd2a0 100644
--- a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3
index c17b99982..5f53fcb2f 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3
index e9dc2de1e..2b6d6d7b9 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3
+++ b/trunk/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 "6 Jul 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
diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3
index 6c0e26734..d8749d1a2 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.ti -1c
.RI "bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)"
.br
-.RI "\fI\fBFunction\fP that indicates if the current move has not improved the fitness. \fP"
+.RI "\fIFunction that indicates if the current move has not improved the fitness. \fP"
.ti -1c
.RI "void \fBoperator()\fP (M &__move, \fBFitness\fP &__fit) throw (EmptySelection)"
.br
@@ -65,7 +65,7 @@ Definition at line 22 of file moBestImprSelect.h.
.PP
.SS "template bool \fBmoBestImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP that indicates if the current move has not improved the fitness.
+Function that indicates if the current move has not improved the fitness.
.PP
If the given fitness enables an improvment, the move (\fBmoMove\fP) and the fitness linked to this move are saved.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
index 88c4d2d2f..1a4aa6538 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
index aadd76c73..0879a5d03 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP.
.ti -1c
.RI "bool \fBoperator()\fP (double &__temp)"
.br
-.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP"
+.RI "\fIFunction which proceeds to the cooling. \fP"
.in -1c
.SS "Private Attributes"
@@ -63,7 +63,7 @@ Definition at line 31 of file moExponentialCoolingSchedule.h.
.PP
.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP which proceeds to the cooling.
+Function which proceeds to the cooling.
.PP
It decreases the temperature and indicates if it is greater than the threshold.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
index f3ef3a983..718b000a1 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.ti -1c
.RI "bool \fBupdate\fP (const M &__move, const typename M::EOType::Fitness &__fit)"
.br
-.RI "\fI\fBFunction\fP that indicates if the current move has not improved the fitness. \fP"
+.RI "\fIFunction that indicates if the current move has not improved the fitness. \fP"
.ti -1c
.RI "void \fBoperator()\fP (M &__move, \fBFitness\fP &__fit) throw (EmptySelection)"
.br
@@ -80,7 +80,7 @@ Definition at line 35 of file moFirstImprSelect.h.
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"
.PP
-\fBFunction\fP that indicates if the current move has not improved the fitness.
+Function that indicates if the current move has not improved the fitness.
.PP
If the given fitness enables an improvment, the move (\fBmoMove\fP) should be applied to the current solution.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3
index 71cadb395..9f61aa6ed 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &__sol)"
.br
-.RI "\fI\fBFunction\fP that activates the stop criterion. \fP"
+.RI "\fIFunction that activates the stop criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -67,7 +67,7 @@ Definition at line 30 of file moGenSolContinue.h.
.PP
.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP that activates the stop criterion.
+Function that activates the stop criterion.
.PP
Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3
index dc3a15d1d..70f1222c8 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moHC.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -26,7 +26,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)"
.br
-.RI "\fI\fBFunction\fP which launches the HC. \fP"
+.RI "\fIFunction which launches the HC. \fP"
.in -1c
.SS "Private Types"
@@ -105,7 +105,7 @@ Definition at line 67 of file moHC.h.
.PP
.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP which launches the HC.
+Function which launches the HC.
.PP
The HC has to improve a current solution. As the \fBmoSA\fP and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
index 72f274978..fe9ac40f4 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
index 5afe1b749..fd6fbbde8 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -34,7 +34,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &__move, const \fBFitness\fP &__fit)"
.br
-.RI "\fI\fBFunction\fP that indicates if the fit is better that the already saved fit. \fP"
+.RI "\fIFunction that indicates if the fit is better that the already saved fit. \fP"
.in -1c
.SS "Private Attributes"
@@ -59,9 +59,9 @@ This criterion is satisfied when a given fitness is the best ever considered.
Definition at line 22 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.
+Function that indicates if the fit is better that the already saved fit.
.PP
The first time, the function only saved the current move and fitness.
.PP
@@ -78,6 +78,8 @@ TRUE the first time and if __fit > best_fit, else FALSE.
.RE
.PP
+.PP
+Implements \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP.
.PP
Definition at line 52 of file moImprBestFitAspirCrit.h.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3
index 9ee8040e1..056367846 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -77,7 +77,7 @@ The constructor.
Definition at line 37 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
@@ -96,6 +96,8 @@ FALSE if the maximum number of iteration is reached, else TRUE.
.RE
.PP
+.PP
+Implements \fBeoBF< M &, const M::EOType &, bool >\fP.
.PP
Definition at line 52 of file moItRandNextMove.h.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
index 35057d316..cb9dcfc4e 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
+++ b/trunk/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 "6 Jul 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"
@@ -18,7 +18,7 @@ Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP.
.ti -1c
.RI "void \fBoperator()\fP (const M &__move, const typename M::EOType &__sol)"
.br
-.RI "\fI\fBFunction\fP which launches the checkpointing. \fP"
+.RI "\fIFunction which launches the checkpointing. \fP"
.ti -1c
.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)"
.br
@@ -45,7 +45,7 @@ Definition at line 21 of file moLSCheckPoint.h.
.PP
.SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & __move, const typename M::EOType & __sol)\fC [inline]\fP"
.PP
-\fBFunction\fP which launches the checkpointing.
+Function which launches the checkpointing.
.PP
Each saved function is used on the current move and the current solution.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
index 690323095..d0879534f 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP.
.ti -1c
.RI "bool \fBoperator()\fP (double &__temp)"
.br
-.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP"
+.RI "\fIFunction which proceeds to the cooling. \fP"
.in -1c
.SS "Private Attributes"
@@ -63,7 +63,7 @@ Definition at line 31 of file moLinearCoolingSchedule.h.
.PP
.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP which proceeds to the cooling.
+Function which proceeds to the cooling.
.PP
It decreases the temperature and indicates if it is greater than the threshold.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3
index 5badf3f88..3232ee1ce 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moMove.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3
index ecd0ce321..6090b07c8 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
index 4cf88cab3..e6263650a 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
+++ b/trunk/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 "6 Jul 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
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3
index d8373783a..c96403f6b 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3
+++ b/trunk/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 "6 Jul 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
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
index f9002b1f4..3c53f0b3a 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3
index 8d330d181..f01d62530 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -32,7 +32,7 @@ Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBm
.ti -1c
.RI "virtual bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)=0"
.br
-.RI "\fI\fBFunction\fP which updates the best solutions. \fP"
+.RI "\fIFunction which updates the best solutions. \fP"
.in -1c
.SH "Detailed Description"
.PP
@@ -61,7 +61,7 @@ In order to know the fitness of the solution, for which the neighborhood will be
Implemented in \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP.
.SS "template virtual bool \fBmoMoveSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [pure virtual]\fP"
.PP
-\fBFunction\fP which updates the best solutions.
+Function which updates the best solutions.
.PP
\fBParameters:\fP
.RS 4
diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3
index df4e2ba03..4b70f19a3 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3
+++ b/trunk/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 "6 Jul 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
diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
index be03a8e17..854cccf66 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -18,7 +18,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &__move, const typename M::EOType::Fitness &__sol)"
.br
-.RI "\fI\fBFunction\fP which describes the aspiration criterion behaviour. \fP"
+.RI "\fIFunction which describes the aspiration criterion behaviour. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -37,7 +37,7 @@ Definition at line 21 of file moNoAspirCrit.h.
.PP
.SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & __move, const typename M::EOType::Fitness & __sol)\fC [inline, private]\fP"
.PP
-\fBFunction\fP which describes the aspiration criterion behaviour.
+Function which describes the aspiration criterion behaviour.
.PP
Does nothing.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3
index 2b1478122..76197a989 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.ti -1c
.RI "bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)"
.br
-.RI "\fI\fBFunction\fP that updates the fitness and move vectors. \fP"
+.RI "\fIFunction that updates the fitness and move vectors. \fP"
.ti -1c
.RI "void \fBoperator()\fP (M &__move, \fBFitness\fP &__fit) throw (EmptySelection)"
.br
@@ -83,7 +83,7 @@ Definition at line 40 of file moRandImprSelect.h.
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"
.PP
-\fBFunction\fP that updates the fitness and move vectors.
+Function that updates the fitness and move vectors.
.PP
if a move give a better fitness than the initial fitness, it is saved and the fitness too.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3
index 5841293a5..567e72041 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3
index 8370d6380..b21d90d0c 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moSA.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
index 90020e3fa..1e47ab9ae 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoTabuList< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)"
.br
-.RI "\fI\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. \fP"
+.RI "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP"
.ti -1c
.RI "void \fBadd\fP (const M &__move, const \fBEOT\fP &__sol)"
.br
@@ -77,9 +77,9 @@ Class describing a move tabu list with a limited memory.
Definition at line 22 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.
+Function that indicates if, in a given state, the _move is tabu or not.
.PP
\fBParameters:\fP
.RS 4
@@ -94,6 +94,8 @@ true or false.
.RE
.PP
+.PP
+Implements \fBeoBF< const M &, const M::EOType &, bool >\fP.
.PP
Definition at line 46 of file moSimpleMoveTabuList.h.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
index c81448eca..560960857 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoTabuList< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)"
.br
-.RI "\fI\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. \fP"
+.RI "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP"
.ti -1c
.RI "void \fBadd\fP (const M &__move, const \fBEOT\fP &__sol)"
.br
@@ -93,9 +93,9 @@ Definition at line 34 of file moSimpleSolutionTabuList.h.
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.
+Function that indicates if, in a given state, the _move is tabu or not.
.PP
\fBParameters:\fP
.RS 4
@@ -110,6 +110,8 @@ true or false.
.RE
.PP
+.PP
+Implements \fBeoBF< const M &, const M::EOType &, bool >\fP.
.PP
Definition at line 45 of file moSimpleSolutionTabuList.h.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3
index 685bb7b7d..1d8d40e8a 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3
index 725a4c776..aa81de64e 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moTS.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -26,7 +26,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)"
.br
-.RI "\fI\fBFunction\fP which launchs the Tabu Search. \fP"
+.RI "\fIFunction which launchs the Tabu Search. \fP"
.in -1c
.SS "Private Types"
@@ -115,7 +115,7 @@ Definition at line 71 of file moTS.h.
.PP
.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP which launchs the Tabu Search.
+Function which launchs the Tabu Search.
.PP
Algorithm of the tabu search. As a \fBmoSA\fP or a \fBmoHC\fP, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.
.PP
diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
index 961597d11..ae467fe08 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
+++ b/trunk/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 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3
index 8e56844ac..19fa9d5b7 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3
+++ b/trunk/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 "6 Jul 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
diff --git a/trunk/paradiseo-mo/doc/mo.doxyfile b/trunk/paradiseo-mo/doc/mo.doxyfile
index 9c63e3962..b4ab87d46 100644
--- a/trunk/paradiseo-mo/doc/mo.doxyfile
+++ b/trunk/paradiseo-mo/doc/mo.doxyfile
@@ -1076,7 +1076,7 @@ SKIP_FUNCTION_MACROS = YES
# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.
-TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html
+TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=http://eodev.sourceforge.net/eo/doc/html
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
eoFunctorBase [external]
