Welcome to PARADISEO-Moving Objects
Class List
Class Hierarchy
-
CitySwap
-
EdgeXover
EmptySelection
-
moAlgo< EOT >
-
moAlgo< M::EOType >
+
eoFunctorBase [external]
-
moAspirCrit< M >
-
-
moComparator< EOT >
-
-
moCoolingSchedule
-
-
moLSCheckPoint< M >
-
moMove< EOT >
-
moMove< Route >
-
-
moMoveExpl< M >
-
-
moMoveLoopExpl< M >
+
eoBF< const EOT &, const EOT &, bool > [external]
+
+
eoBF< const M &, const M::EOType &, bool > [external]
+
+
eoBF< const M &, const M::EOType &, M::EOType::Fitness > [external]
+
+
eoBF< const M &, const M::EOType &, void > [external]
+
eoBF< const M &, const M::EOType::Fitness &, bool > [external]
+
+
eoBF< const M::EOType &, M::EOType &, void > [external]
+
+
eoBF< M &, const M::EOType &, bool > [external]
+
+
eoBF< M &, const M::EOType &, void > [external]
+
+
eoBF< M &, M::EOType::Fitness &, void > [external]
+
+
eoUF< const EOT &, bool > [external]
+
+
eoUF< double &, bool > [external]
+
+
eoUF< EOT &, bool > [external]
+
+
eoUF< EOT &, void > [external]
+
+
eoUF< EOType &, bool > [external]
+
eoUF< M &, void > [external]
+
+
eoUF< M::EOType &, bool > [external]
+
-
moMoveIncrEval< M >
-
moMoveIncrEval< TwoOpt >
-
Class Members
-
Namespace List
-
-
Namespace Members
-
File List
-
-
city_swap.cpp
-
city_swap.h
-
edge_xover.cpp
-
edge_xover.h
-
graph.cpp
-
graph.h
-
hill_climbing.cpp
+
File List
+
diff --git a/trunk/paradiseo-mo/doc/latex/annotated.tex b/trunk/paradiseo-mo/doc/latex/annotated.tex
index b48188e7b..d2ebcce06 100644
--- a/trunk/paradiseo-mo/doc/latex/annotated.tex
+++ b/trunk/paradiseo-mo/doc/latex/annotated.tex
@@ -1,7 +1,5 @@
-\section{ParadisEO-MOMovingObjects Class List}
+\section{PARADISEO-MO Class List}
Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList}
-\item\contentsline{section}{{\bf CitySwap} (Its swaps two vertices randomly choosen )}{\pageref{class_city_swap}}{}
-\item\contentsline{section}{{\bf EdgeXover} (Edge Crossover )}{\pageref{class_edge_xover}}{}
\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}}{}
@@ -39,17 +37,4 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be
\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}}{}
-\item\contentsline{section}{{\bf OrderXover} (Order Crossover )}{\pageref{class_order_xover}}{}
-\item\contentsline{section}{{\bf PartialMappedXover} (Partial Mapped Crossover )}{\pageref{class_partial_mapped_xover}}{}
-\item\contentsline{section}{{\bf PartRouteEval} (Route Evaluator )}{\pageref{class_part_route_eval}}{}
-\item\contentsline{section}{{\bf PartTwoOptInit} (It sets the first couple of edges )}{\pageref{class_part_two_opt_init}}{}
-\item\contentsline{section}{{\bf PartTwoOptNext} (It updates a couple of edges )}{\pageref{class_part_two_opt_next}}{}
-\item\contentsline{section}{{\bf RouteEval} (Route Evaluator )}{\pageref{class_route_eval}}{}
-\item\contentsline{section}{{\bf RouteInit} }{\pageref{class_route_init}}{}
-\item\contentsline{section}{{\bf TwoOpt} }{\pageref{class_two_opt}}{}
-\item\contentsline{section}{{\bf TwoOptIncrEval} }{\pageref{class_two_opt_incr_eval}}{}
-\item\contentsline{section}{{\bf TwoOptInit} (It sets the first couple of edges )}{\pageref{class_two_opt_init}}{}
-\item\contentsline{section}{{\bf TwoOptNext} (It updates a couple of edges )}{\pageref{class_two_opt_next}}{}
-\item\contentsline{section}{{\bf TwoOptRand} }{\pageref{class_two_opt_rand}}{}
-\item\contentsline{section}{{\bf TwoOptTabuList} (The table of tabu movements, i.e )}{\pageref{class_two_opt_tabu_list}}{}
\end{CompactList}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex
index f6caacbe7..6564c8f7a 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex
@@ -5,6 +5,12 @@ Description of an algorithm of the paradiseo-mo library.
{\tt \#include $<$moAlgo.h$>$}
+Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H]
+\begin{center}
+\leavevmode
+\includegraphics[height=4cm]{classmo_algo}
+\end{center}
+\end{figure}
\subsection{Detailed Description}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
index fbf0b26ef..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 109.29
+%%BoundingBox: 0 0 500 119.76
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 4.575 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moAspirCrit< M >) cw
+(eoBF< const M &, const M::EOType::Fitness &, bool >) cw
+(eoFunctorBase) cw
(moImprBestFitAspirCrit< M >) cw
(moNoAspirCrit< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -188,11 +190,21 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moAspirCrit< M >) 0.5 1 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
% ----- relations -----
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+1 0.5 3 in
solid
1 0.5 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
index af40895ad..78dea621f 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
@@ -8,7 +8,7 @@ Description of the conditions in which a tabu move could be accepted.
Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_aspir_crit}
+\includegraphics[height=3.35329cm]{classmo_aspir_crit}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps
index f9c367972..e1504ce28 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 259.74
+%%BoundingBox: 0 0 500 303.03
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.925 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moBestImprSelect< M >) cw
(moMoveSelect< M >) cw
+(eoBF< M &, M::EOType::Fitness &, void >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moBestImprSelect< M >) 0 0 box
(moMoveSelect< M >) 0 1 box
+ (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 bc5e36915..42525f20e 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
@@ -8,7 +8,7 @@ One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_best_impr_select}
+\includegraphics[height=4cm]{classmo_best_impr_select}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -24,7 +24,7 @@ void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_sele
\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 Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection)
\begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -58,7 +58,7 @@ Definition at line 22 of file moBestImprSelect.h.
\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}
-Function that indicates if the current move has not improved the fitness.
+{\bf Function} that indicates if the current move has not improved the fitness.
If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) and the fitness linked to this move are saved.
@@ -77,7 +77,7 @@ Definition at line 47 of file moBestImprSelect.h.
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]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da}
+\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.
@@ -94,6 +94,8 @@ Procedure which saved the best move and fitness.
\end{Desc}
+Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+
Definition at line 68 of file moBestImprSelect.h.
References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps b/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps
index ed564a84f..f30e4da78 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_comparator.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 242.424
+%%BoundingBox: 0 0 500 303.03
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moComparator< EOT >) cw
+(eoBF< const EOT &, const EOT &, bool >) cw
+(eoFunctorBase) cw
(moFitComparator< EOT >) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -187,10 +189,20 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moComparator< EOT >) 0 1 box
+ (eoBF< const EOT &, const EOT &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
(moFitComparator< EOT >) 0 0 box
% ----- relations -----
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
solid
1 0 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex b/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex
index 4f7fdff71..0ad2cef86 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_comparator.tex
@@ -8,7 +8,7 @@ Template for classes which need to compare two EOT and indicate if the first is
Inheritance diagram for moComparator$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_comparator}
+\includegraphics[height=4cm]{classmo_comparator}
\end{center}
\end{figure}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps
index a1d0c2d59..099ff0bb2 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 101.523
+%%BoundingBox: 0 0 500 203.046
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 4.925 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moCoolingSchedule) cw
+(eoUF< double &, bool >) cw
+(eoFunctorBase) cw
(moExponentialCoolingSchedule) cw
(moLinearCoolingSchedule) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -188,11 +190,21 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moCoolingSchedule) 0.5 1 box
+ (eoUF< double &, bool >) 0.5 2 box
+ (eoFunctorBase) 0.5 3 box
(moExponentialCoolingSchedule) 0 0 box
(moLinearCoolingSchedule) 1 0 box
% ----- relations -----
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+1 0.5 3 in
solid
1 0.5 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
index 1a48c27d7..47648d9d0 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
@@ -8,7 +8,7 @@ This class gives the description of a cooling schedule.
Inheritance diagram for moCoolingSchedule::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_cooling_schedule}
+\includegraphics[height=4cm]{classmo_cooling_schedule}
\end{center}
\end{figure}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps
index 9a4b2773b..92ecef949 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 203.046
+%%BoundingBox: 0 0 500 406.091
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.23125 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moExponentialCoolingSchedule) cw
(moCoolingSchedule) cw
+(eoUF< double &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moExponentialCoolingSchedule) 0 0 box
(moCoolingSchedule) 0 1 box
+ (eoUF< double &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 e4b4643d9..3bf1211a8 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
@@ -8,7 +8,7 @@ One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_exponential_cooling_schedule}
+\includegraphics[height=4cm]{classmo_exponential_cooling_schedule}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -17,7 +17,7 @@ Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H]
{\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 Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
@@ -58,10 +58,10 @@ Definition at line 31 of file moExponentialCoolingSchedule.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db}
-Function which proceeds to the cooling.
+{\bf Function} which proceeds to the cooling.
It decreases the temperature and indicates if it is greater than the threshold.
@@ -74,6 +74,8 @@ 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 eoUF$<$ double \&, bool $>$}.
+
Definition at line 41 of file moExponentialCoolingSchedule.h.
References ratio, and threshold.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps
index 04ffcb96d..7057473a9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 258.065
+%%BoundingBox: 0 0 500 303.03
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.9375 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moFirstImprSelect< M >) cw
(moMoveSelect< M >) cw
+(eoBF< M &, M::EOType::Fitness &, void >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moFirstImprSelect< M >) 0 0 box
(moMoveSelect< M >) 0 1 box
+ (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 c09a27412..45653d427 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
@@ -8,7 +8,7 @@ One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_first_impr_select}
+\includegraphics[height=4cm]{classmo_first_impr_select}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_first_impr_select_64763ce
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 Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection)
\begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -73,7 +73,7 @@ References moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $
\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}
-Function that indicates if the current move has not improved the fitness.
+{\bf Function} that indicates if the current move has not improved the fitness.
If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) should be applied to the current solution.
@@ -90,7 +90,7 @@ Definition at line 52 of file moFirstImprSelect.h.
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]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95}
+\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.
@@ -107,6 +107,8 @@ Procedure which saved the best move and fitness.
\end{Desc}
+Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+
Definition at line 76 of file moFirstImprSelect.h.
References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps
index 802516e3a..5c41e19f2 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 242.424
+%%BoundingBox: 0 0 500 303.03
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moFitComparator< EOT >) cw
(moComparator< EOT >) cw
+(eoBF< const EOT &, const EOT &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moFitComparator< EOT >) 0 0 box
(moComparator< EOT >) 0 1 box
+ (eoBF< const EOT &, const EOT &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex
index c58ab9d97..52d69e550 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_comparator.tex
@@ -8,15 +8,14 @@ Comparison according to the fitness.
Inheritance diagram for moFitComparator$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_fit_comparator}
+\includegraphics[height=4cm]{classmo_fit_comparator}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-bool {\bf operator()} (const EOT \&\_\-solution1, const EOT \&\_\-solution2)\label{classmo_fit_comparator_c920d5a49deb16710daf1e5fcde6b16c}
-
-\end{CompactItemize}
+bool {\bf operator()} (const EOT \&\_\-solution1, const EOT \&\_\-solution2)
+\begin{CompactList}\small\item\em {\bf Function} which makes the comparison and gives the result. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
@@ -30,6 +29,27 @@ An EOT is better than an other if its fitness is better.
Definition at line 20 of file moFitComparator.h.
+\subsection{Member Function Documentation}
+\index{moFitComparator@{moFitComparator}!operator()@{operator()}}
+\index{operator()@{operator()}!moFitComparator@{moFitComparator}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitComparator}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution1}, const EOT \& {\em \_\-solution2})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_comparator_c920d5a49deb16710daf1e5fcde6b16c}
+
+
+{\bf Function} which makes the comparison and gives the result.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em \_\-solution1}]The first solution. \item[{\em \_\-solution2}]The second solution. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]true if the fitness of the first solution is better than the second solution, false else. \end{Desc}
+
+
+Implements {\bf eoBF$<$ const EOT \&, const EOT \&, bool $>$}.
+
+Definition at line 30 of file moFitComparator.h.
+
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
moFitComparator.h\end{CompactItemize}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps
index fba9a3dd0..020df214d 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 239.521
+%%BoundingBox: 0 0 500 441.989
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moFitSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
+(eoUF< const EOT &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moFitSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
+ (eoUF< const EOT &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex
index 339ea379b..ef837c7dd 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex
@@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic.
Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_fit_sol_continue}
+\includegraphics[height=4cm]{classmo_fit_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8b
{\bf moFitSolContinue} ({\bf Fitness} \_\-\_\-fitness)
\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item
bool {\bf operator()} (const EOT \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item
void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -65,10 +65,10 @@ Definition at line 33 of file moFitSolContinue.h.
\subsection{Member Function Documentation}
\index{moFitSolContinue@{moFitSolContinue}!operator()@{operator()}}
\index{operator()@{operator()}!moFitSolContinue@{moFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27}
-Function that activates the stopping criterion.
+{\bf Function} that activates the stopping criterion.
Indicates if the fitness threshold has not yet been reached.
@@ -81,6 +81,8 @@ Indicates if the fitness threshold has not yet been reached.
\item[Returns:]true or false according to the value of the fitness. \end{Desc}
+Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+
Definition at line 43 of file moFitSolContinue.h.
References moFitSolContinue$<$ EOT $>$::fitness.\index{moFitSolContinue@{moFitSolContinue}!init@{init}}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps
index c9e65107d..c73c60ba3 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 227.273
+%%BoundingBox: 0 0 500 441.989
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moGenSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
+(eoUF< const EOT &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moGenSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
+ (eoUF< const EOT &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 bb62d1690..ad11108c8 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
@@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic.
Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_gen_sol_continue}
+\includegraphics[height=4cm]{classmo_gen_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -17,7 +17,7 @@ Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H]
{\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 Function that activates the stop criterion. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that activates the stop criterion. \item\end{CompactList}\item
void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -62,10 +62,10 @@ Definition at line 30 of file moGenSolContinue.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61}
+\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}
-Function that activates the stop criterion.
+{\bf Function} that activates the stop criterion.
Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.
@@ -78,6 +78,8 @@ 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 eoUF$<$ const EOT \&, bool $>$}.
+
Definition at line 44 of file moGenSolContinue.h.
References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps b/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps
index 648f11f20..184d2041a 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 268.456
+%%BoundingBox: 0 0 500 271.739
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,13 +19,13 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
-/cols 1 def
+/rows 5 def
+/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,10 @@ boxfont setfont
1 boundaspect scale
(moHC< M >) cw
(moAlgo< M::EOType >) cw
+(eoMonOp< M::EOType >) cw
+(eoOp< EOType >) cw
+(eoUF< M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
- (moHC< M >) 0 0 box
- (moAlgo< M::EOType >) 0 1 box
+ (moHC< M >) 0.5 0 box
+ (moAlgo< M::EOType >) 0.5 1 box
+ (eoMonOp< M::EOType >) 0.5 2 box
+ (eoOp< EOType >) 0 3 box
+ (eoUF< M::EOType &, bool >) 1 3 box
+ (eoFunctorBase) 1 4 box
% ----- relations -----
solid
-0 0 0 out
+0 0.5 0 out
solid
-1 0 1 in
+1 0.5 1 in
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+0 1 3 conn
+solid
+1 0 3 in
+solid
+1 1 3 in
+solid
+0 1 3 out
+solid
+1 1 4 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex
index 43d27ff2b..3bb303687 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex
@@ -8,18 +8,18 @@ Hill Climbing (HC).
Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_h_c}
+\includegraphics[height=5cm]{classmo_h_c}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, eoEvalFunc$<$ {\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 moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, eoEvalFunc$<$ {\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 Function which launches the HC. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} which launches the HC. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
@@ -35,7 +35,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd
{\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
-eoEvalFunc$<$ {\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}
@@ -49,12 +49,12 @@ Class which describes the algorithm for a hill climbing.
-Definition at line 26 of file moHC.h.
+Definition at line 25 of file moHC.h.
\subsection{Constructor \& Destructor Documentation}
\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}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7}
+\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.
@@ -68,9 +68,9 @@ All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{
\end{Desc}
-Definition at line 53 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}}
+Definition at line 52 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}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65}
+\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.
@@ -84,15 +84,15 @@ This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl
\end{Desc}
-Definition at line 67 of file moHC.h.
+Definition at line 66 of file moHC.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010}
+\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}
-Function which launches the HC.
+{\bf Function} which launches the HC.
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.
@@ -105,7 +105,9 @@ The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a}
\item[Returns:]TRUE. \end{Desc}
-Definition at line 82 of file moHC.h.
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+
+Definition at line 81 of file moHC.h.
References moHC$<$ M $>$::full\_\-eval, and moHC$<$ M $>$::move\_\-expl.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps
index 1383bbf1b..1240e010d 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 346.821
+%%BoundingBox: 0 0 500 327.869
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.44167 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 3 def
+/rows 5 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -176,6 +176,8 @@ boxfont setfont
(moHCMoveLoopExpl< M >) cw
(moMoveLoopExpl< M >) cw
(moMoveExpl< M >) cw
+(eoBF< const M::EOType &, M::EOType &, void >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,6 +192,8 @@ boundx scalefactor div boundy scalefactor div scale
(moHCMoveLoopExpl< M >) 0 0 box
(moMoveLoopExpl< M >) 0 1 box
(moMoveExpl< M >) 0 2 box
+ (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box
+ (eoFunctorBase) 0 4 box
% ----- relations -----
@@ -201,3 +205,11 @@ solid
0 0 1 out
solid
1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
+solid
+0 0 3 out
+solid
+1 0 4 in
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 3065c7226..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
@@ -8,7 +8,7 @@ Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}.
Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=3cm]{classmo_h_c_move_loop_expl}
+\includegraphics[height=5cm]{classmo_h_c_move_loop_expl}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -75,7 +75,7 @@ Definition at line 43 of file moHCMoveLoopExpl.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb}
+\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,6 +89,8 @@ The exploration starts from an old solution and provides a new solution.
\end{Desc}
+Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}.
+
Definition at line 59 of file moHCMoveLoopExpl.h.
References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps
index 1073e2446..d8ed217c9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 268.456
+%%BoundingBox: 0 0 500 271.739
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,13 +19,13 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
-/cols 1 def
+/rows 5 def
+/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,10 @@ boxfont setfont
1 boundaspect scale
(moILS< M >) cw
(moAlgo< M::EOType >) cw
+(eoMonOp< M::EOType >) cw
+(eoOp< EOType >) cw
+(eoUF< M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
- (moILS< M >) 0 0 box
- (moAlgo< M::EOType >) 0 1 box
+ (moILS< M >) 0.5 0 box
+ (moAlgo< M::EOType >) 0.5 1 box
+ (eoMonOp< M::EOType >) 0.5 2 box
+ (eoOp< EOType >) 0 3 box
+ (eoUF< M::EOType &, bool >) 1 3 box
+ (eoFunctorBase) 1 4 box
% ----- relations -----
solid
-0 0 0 out
+0 0.5 0 out
solid
-1 0 1 in
+1 0.5 1 in
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+0 1 3 conn
+solid
+1 0 3 in
+solid
+1 1 3 in
+solid
+0 1 3 out
+solid
+1 1 4 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex
index 4e47a90c4..89b4f05cb 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_i_l_s.tex
@@ -8,22 +8,22 @@ Iterated Local Search (ILS).
Inheritance diagram for moILS$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_i_l_s}
+\includegraphics[height=5cm]{classmo_i_l_s}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \&\_\-\_\-algo, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \&\_\-\_\-algo, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em Generic constructor. \item\end{CompactList}\item
-{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
-{\bf moILS} ({\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} $>$ \&\_\-\_\-moTS\_\-continue, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
-\begin{CompactList}\small\item\em Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
-{\bf moILS} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-moSA\_\-continue, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, eoMonOp$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\bf moILS} ({\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} $>$ \&\_\-\_\-moTS\_\-continue, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
\begin{CompactList}\small\item\em Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
+{\bf moILS} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-moSA\_\-continue, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
+\begin{CompactList}\small\item\em Constructor for using a \doxyref{moSA}{p.}{classmo_s_a} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em Function which launches the ILS. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} which launches the ILS. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
@@ -45,10 +45,10 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_i_l_s_8c464a9eae064a78eff75d4c7
{\bf moComparator}$<$ {\bf EOT} $>$ \& {\bf acceptance\_\-criterion}\label{classmo_i_l_s_295f6d0342c67bd3dc4cb82e2adc26be}
\begin{CompactList}\small\item\em The acceptance criterion. \item\end{CompactList}\item
-eoMonOp$<$ {\bf EOT} $>$ \& {\bf perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2}
+{\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\bf perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2}
\begin{CompactList}\small\item\em The perturbation generator. \item\end{CompactList}\item
-eoEvalFunc$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_i_l_s_8000f02fac668d51026e458c9febce7c}
+{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_i_l_s_8000f02fac668d51026e458c9febce7c}
\begin{CompactList}\small\item\em The full evaluation function. \item\end{CompactList}\end{CompactItemize}
@@ -67,7 +67,7 @@ Definition at line 25 of file moILS.h.
\subsection{Constructor \& Destructor Documentation}
\index{moILS@{moILS}!moILS@{moILS}}
\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-algo}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_f7f2fc1f905954d78edcec0e3ca53551}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-algo}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_f7f2fc1f905954d78edcec0e3ca53551}
Generic constructor.
@@ -83,7 +83,7 @@ Generic constructor using a \doxyref{moAlgo}{p.}{classmo_algo}
Definition at line 46 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}}
\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\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 moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c4ebdab294ee1085ddcb9bf2a6882cf0}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\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 moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c4ebdab294ee1085ddcb9bf2a6882cf0}
Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}{p.}{classmo_algo}.
@@ -97,7 +97,7 @@ Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}
Definition at line 62 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}}
\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\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 \_\-\_\-moTS\_\-continue}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_d27e3435b8f6592091431fde6f185769}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\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 \_\-\_\-moTS\_\-continue}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_d27e3435b8f6592091431fde6f185769}
Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}.
@@ -111,10 +111,10 @@ Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}
Definition at line 82 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}}
\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-moSA\_\-continue}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, eoMonOp$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_292acc5218e8f148e8b174f183820696}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-moSA\_\-continue}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_292acc5218e8f148e8b174f183820696}
-Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}.
+Constructor for using a \doxyref{moSA}{p.}{classmo_s_a} for the \doxyref{moAlgo}{p.}{classmo_algo}.
\begin{Desc}
\item[Parameters:]
@@ -128,10 +128,10 @@ Definition at line 102 of file moILS.h.
\subsection{Member Function Documentation}
\index{moILS@{moILS}!operator()@{operator()}}
\index{operator()@{operator()}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moILS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_b3954a77b43fee31122d2a210b2a82d7}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moILS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_i_l_s_b3954a77b43fee31122d2a210b2a82d7}
-Function which launches the ILS.
+{\bf Function} which launches the ILS.
The ILS has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a}, the \doxyref{moTS}{p.}{classmo_t_s} and the \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionnary algorithm.
@@ -144,6 +144,8 @@ The ILS has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a
\item[Returns:]TRUE. \end{Desc}
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+
Definition at line 119 of file moILS.h.
References moILS$<$ M $>$::acceptance\_\-criterion, moILS$<$ M $>$::algo, moILS$<$ M $>$::cont, moILS$<$ M $>$::full\_\-eval, and moILS$<$ M $>$::perturbation.
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 41cee35a0..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 218.579
+%%BoundingBox: 0 0 500 239.521
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.2875 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moImprBestFitAspirCrit< M >) cw
(moAspirCrit< M >) cw
+(eoBF< const M &, const M::EOType::Fitness &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moImprBestFitAspirCrit< M >) 0 0 box
(moAspirCrit< M >) 0 1 box
+ (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 5d9b8e803..fdc60cdaf 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
@@ -8,7 +8,7 @@ One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}.
Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_impr_best_fit_aspir_crit}
+\includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -27,7 +27,7 @@ void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9
\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 Function that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
@@ -53,10 +53,10 @@ Definition at line 22 of file moImprBestFitAspirCrit.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b}
+\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}
-Function that indicates if the fit is better that the already saved fit.
+{\bf Function} that indicates if the fit is better that the already saved fit.
The first time, the function only saved the current move and fitness.
@@ -69,6 +69,8 @@ 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}
+Implements {\bf eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>$}.
+
Definition at line 52 of file moImprBestFitAspirCrit.h.
References moImprBestFitAspirCrit$<$ M $>$::best\_\-fit, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time.
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 bc4ea56dc..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 245.399
+%%BoundingBox: 0 0 500 316.206
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.0375 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moItRandNextMove< M >) cw
(moNextMove< M >) cw
+(eoBF< M &, const M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moItRandNextMove< M >) 0 0 box
(moNextMove< M >) 0 1 box
+ (eoBF< M &, const M::EOType &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 f74e8150a..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
@@ -8,7 +8,7 @@ One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}.
Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_it_rand_next_move}
+\includegraphics[height=4cm]{classmo_it_rand_next_move}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -57,7 +57,7 @@ Definition at line 22 of file moItRandNextMove.h.
The constructor.
-Parameters only for initialising the attributes.
+{\bf Parameters} only for initialising the attributes.
\begin{Desc}
\item[Parameters:]
@@ -71,7 +71,7 @@ Definition at line 37 of file moItRandNextMove.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102}
+\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,6 +87,8 @@ 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}
+Implements {\bf eoBF$<$ M \&, const M::EOType \&, bool $>$}.
+
Definition at line 52 of file moItRandNextMove.h.
References moItRandNextMove$<$ M $>$::max\_\-iter, moItRandNextMove$<$ M $>$::num\_\-iter, and moItRandNextMove$<$ M $>$::rand\_\-move.
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 13bd383b8..4f8c5e09f 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
@@ -5,17 +5,23 @@ Class which allows a checkpointing system.
{\tt \#include $<$moLSCheckPoint.h$>$}
+Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H]
+\begin{center}
+\leavevmode
+\includegraphics[height=3cm]{classmo_l_s_check_point}
+\end{center}
+\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
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} (eoBF$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f)
+\begin{CompactList}\small\item\em {\bf Function} which launches the checkpointing. \item\end{CompactList}\item
+void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f)
\begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-std::vector$<$ eoBF$<$ 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}
@@ -37,7 +43,7 @@ Definition at line 21 of file moLSCheckPoint.h.
\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}
-Function which launches the checkpointing.
+{\bf Function} which launches the checkpointing.
Each saved function is used on the current move and the current solution.
@@ -52,7 +58,7 @@ Definition at line 34 of file moLSCheckPoint.h.
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 (eoBF$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6}
+\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.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps
index 35d64af4d..3e62629a9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 238.095
+%%BoundingBox: 0 0 500 476.19
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.1 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.05 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moLinearCoolingSchedule) cw
(moCoolingSchedule) cw
+(eoUF< double &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moLinearCoolingSchedule) 0 0 box
(moCoolingSchedule) 0 1 box
+ (eoUF< double &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 971b3203b..130374224 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
@@ -8,7 +8,7 @@ One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_linear_cooling_schedule}
+\includegraphics[height=4cm]{classmo_linear_cooling_schedule}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -17,7 +17,7 @@ Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H]
{\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 Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
@@ -58,10 +58,10 @@ Definition at line 31 of file moLinearCoolingSchedule.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3}
-Function which proceeds to the cooling.
+{\bf Function} which proceeds to the cooling.
It decreases the temperature and indicates if it is greater than the threshold.
@@ -74,6 +74,8 @@ 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 eoUF$<$ double \&, bool $>$}.
+
Definition at line 41 of file moLinearCoolingSchedule.h.
References quantity, and threshold.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_move.tex
index 61a06c1fb..e178fa21e 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move.tex
@@ -5,6 +5,12 @@ Definition of a move.
{\tt \#include $<$moMove.h$>$}
+Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H]
+\begin{center}
+\leavevmode
+\includegraphics[height=3cm]{classmo_move}
+\end{center}
+\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps
index 708dd0b50..18fb8889f 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 173.41
+%%BoundingBox: 0 0 500 163.934
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 3 def
+/rows 5 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moMoveExpl< M >) cw
+(eoBF< const M::EOType &, M::EOType &, void >) cw
+(eoFunctorBase) cw
(moMoveLoopExpl< M >) cw
(moHCMoveLoopExpl< M >) cw
(moTSMoveLoopExpl< M >) cw
@@ -189,12 +191,22 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moMoveExpl< M >) 0.5 2 box
+ (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box
+ (eoFunctorBase) 0.5 4 box
(moMoveLoopExpl< M >) 0.5 1 box
(moHCMoveLoopExpl< M >) 0 0 box
(moTSMoveLoopExpl< M >) 1 0 box
% ----- relations -----
+solid
+0 0.5 2 out
+solid
+1 0.5 3 in
+solid
+0 0.5 3 out
+solid
+1 0.5 4 in
solid
1 0.5 1.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex
index 0d2a1554f..0e4a7e621 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex
@@ -8,7 +8,7 @@ Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer.
Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=3cm]{classmo_move_expl}
+\includegraphics[height=4.59016cm]{classmo_move_expl}
\end{center}
\end{figure}
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 b191f77fd..85bba26c1 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
@@ -5,6 +5,12 @@
{\tt \#include $<$moMoveIncrEval.h$>$}
+Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H]
+\begin{center}
+\leavevmode
+\includegraphics[height=3cm]{classmo_move_incr_eval}
+\end{center}
+\end{figure}
\subsection{Detailed Description}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex
index 1f1daefa6..904ac7911 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex
@@ -5,6 +5,12 @@ Move (\doxyref{moMove}{p.}{classmo_move}) initializer.
{\tt \#include $<$moMoveInit.h$>$}
+Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H]
+\begin{center}
+\leavevmode
+\includegraphics[height=3cm]{classmo_move_init}
+\end{center}
+\end{figure}
\subsection{Detailed Description}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps
index 76326be37..c6a78b5b1 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 173.41
+%%BoundingBox: 0 0 500 163.934
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 3 def
+/rows 5 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moMoveLoopExpl< M >) cw
(moMoveExpl< M >) cw
+(eoBF< const M::EOType &, M::EOType &, void >) cw
+(eoFunctorBase) cw
(moHCMoveLoopExpl< M >) cw
(moTSMoveLoopExpl< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -190,6 +192,8 @@ boundx scalefactor div boundy scalefactor div scale
(moMoveLoopExpl< M >) 0.5 1 box
(moMoveExpl< M >) 0.5 2 box
+ (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box
+ (eoFunctorBase) 0.5 4 box
(moHCMoveLoopExpl< M >) 0 0 box
(moTSMoveLoopExpl< M >) 1 0 box
@@ -200,6 +204,14 @@ solid
solid
1 0.5 2 in
solid
+0 0.5 2 out
+solid
+1 0.5 3 in
+solid
+0 0.5 3 out
+solid
+1 0.5 4 in
+solid
1 0.5 0.25 out
solid
0 1 1 conn
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 c9e640147..15968268f 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
@@ -8,7 +8,7 @@ Class which describes an iterative explorer.
Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=3cm]{classmo_move_loop_expl}
+\includegraphics[height=4.59016cm]{classmo_move_loop_expl}
\end{center}
\end{figure}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps
index 86a37c002..b61e2bf9f 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 83.8574
+%%BoundingBox: 0 0 500 101.01
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 5.9625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 4.95 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 3 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moMoveSelect< M >) cw
+(eoBF< M &, M::EOType::Fitness &, void >) cw
+(eoFunctorBase) cw
(moBestImprSelect< M >) cw
(moFirstImprSelect< M >) cw
(moRandImprSelect< M >) cw
@@ -189,12 +191,22 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moMoveSelect< M >) 1 1 box
+ (eoBF< M &, M::EOType::Fitness &, void >) 1 2 box
+ (eoFunctorBase) 1 3 box
(moBestImprSelect< M >) 0 0 box
(moFirstImprSelect< M >) 1 0 box
(moRandImprSelect< M >) 2 0 box
% ----- relations -----
+solid
+0 1 1 out
+solid
+1 1 2 in
+solid
+0 1 2 out
+solid
+1 1 3 in
solid
1 1 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex
index b9693bcee..5a128a357 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex
@@ -8,7 +8,7 @@ Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}).
Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_move_select}
+\includegraphics[height=2.82828cm]{classmo_move_select}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_move_select_8148ccc0e6fbd
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 Function which updates the best solutions. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
@@ -59,7 +59,7 @@ Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_
\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}
-Function which updates the best solutions.
+{\bf Function} which updates the best solutions.
\begin{Desc}
\item[Parameters:]
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps
index d9586a593..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 245.399
+%%BoundingBox: 0 0 500 316.206
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.0375 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moNextMove< M >) cw
+(eoBF< M &, const M::EOType &, bool >) cw
+(eoFunctorBase) cw
(moItRandNextMove< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -187,10 +189,20 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moNextMove< M >) 0 1 box
+ (eoBF< M &, const M::EOType &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
(moItRandNextMove< M >) 0 0 box
% ----- relations -----
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
solid
1 0 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex
index 764315620..3fdea7d9d 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex
@@ -8,7 +8,7 @@ Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}).
Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_next_move}
+\includegraphics[height=4cm]{classmo_next_move}
\end{center}
\end{figure}
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 4a1de4c86..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 291.971
+%%BoundingBox: 0 0 500 239.521
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.7125 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moNoAspirCrit< M >) cw
(moAspirCrit< M >) cw
+(eoBF< const M &, const M::EOType::Fitness &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moNoAspirCrit< M >) 0 0 box
(moAspirCrit< M >) 0 1 box
+ (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 220d5f3d8..e338ac1b4 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
@@ -8,14 +8,14 @@ One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspi
Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_no_aspir_crit}
+\includegraphics[height=4cm]{classmo_no_aspir_crit}
\end{center}
\end{figure}
\subsection*{Private Member Functions}
\begin{CompactItemize}
\item
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
+\begin{CompactList}\small\item\em {\bf Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item
void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize}
@@ -37,7 +37,7 @@ Definition at line 21 of file moNoAspirCrit.h.
\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}
-Function which describes the aspiration criterion behaviour.
+{\bf Function} which describes the aspiration criterion behaviour.
Does nothing.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps
index 6c532ffcd..67d7d5048 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 193.237
+%%BoundingBox: 0 0 500 386.473
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.5875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.29375 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moNoFitImprSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
+(eoUF< const EOT &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moNoFitImprSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
+ (eoUF< const EOT &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex
index 17d24521a..84d1a2396 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex
@@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic.
Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_no_fit_impr_sol_continue}
+\includegraphics[height=4cm]{classmo_no_fit_impr_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184
{\bf moNoFitImprSolContinue} (unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement)
\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item
bool {\bf operator()} (const EOT \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item
void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -74,10 +74,10 @@ Definition at line 33 of file moNoFitImprSolContinue.h.
\subsection{Member Function Documentation}
\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!operator()@{operator()}}
\index{operator()@{operator()}!moNoFitImprSolContinue@{moNoFitImprSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed}
-Function that activates the stopping criterion.
+{\bf Function} that activates the stopping criterion.
Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). \begin{Desc}
\item[Parameters:]
@@ -88,6 +88,8 @@ Indicates if the fitness has not been improved since a given number of iteration
\item[Returns:]true or false. \end{Desc}
+Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+
Definition at line 43 of file moNoFitImprSolContinue.h.
References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, and moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!init@{init}}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps
index 74d2fc0f6..fe55210a4 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 251.572
+%%BoundingBox: 0 0 500 303.03
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.9875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moRandImprSelect< M >) cw
(moMoveSelect< M >) cw
+(eoBF< M &, M::EOType::Fitness &, void >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moRandImprSelect< M >) 0 0 box
(moMoveSelect< M >) 0 1 box
+ (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 8fa7df0f8..640633c84 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
@@ -8,7 +8,7 @@ One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMove
Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_rand_impr_select}
+\includegraphics[height=4cm]{classmo_rand_impr_select}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb
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
+\begin{CompactList}\small\item\em {\bf Function} that updates the fitness and move vectors. \item\end{CompactList}\item
void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection)
\begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -77,7 +77,7 @@ References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::ve
\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}
-Function that updates the fitness and move vectors.
+{\bf Function} that updates the fitness and move vectors.
if a move give a better fitness than the initial fitness, it is saved and the fitness too.
@@ -96,7 +96,7 @@ Definition at line 56 of file moRandImprSelect.h.
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]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55}
+\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.
@@ -115,9 +115,11 @@ One the saved move is randomly chosen.
\end{Desc}
+Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+
Definition at line 77 of file moRandImprSelect.h.
-References moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ 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
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex
index 87275c96c..665d27245 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex
@@ -5,6 +5,12 @@ Random move generator.
{\tt \#include $<$moRandMove.h$>$}
+Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H]
+\begin{center}
+\leavevmode
+\includegraphics[height=3cm]{classmo_rand_move}
+\end{center}
+\end{figure}
\subsection{Detailed Description}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps b/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps
index 90945c761..efa0100f9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 268.456
+%%BoundingBox: 0 0 500 271.739
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,13 +19,13 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
-/cols 1 def
+/rows 5 def
+/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,10 @@ boxfont setfont
1 boundaspect scale
(moSA< M >) cw
(moAlgo< M::EOType >) cw
+(eoMonOp< M::EOType >) cw
+(eoOp< EOType >) cw
+(eoUF< M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
- (moSA< M >) 0 0 box
- (moAlgo< M::EOType >) 0 1 box
+ (moSA< M >) 0.5 0 box
+ (moAlgo< M::EOType >) 0.5 1 box
+ (eoMonOp< M::EOType >) 0.5 2 box
+ (eoOp< EOType >) 0 3 box
+ (eoUF< M::EOType &, bool >) 1 3 box
+ (eoFunctorBase) 1 4 box
% ----- relations -----
solid
-0 0 0 out
+0 0.5 0 out
solid
-1 0 1 in
+1 0.5 1 in
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+0 1 3 conn
+solid
+1 0 3 in
+solid
+1 1 3 in
+solid
+0 1 3 out
+solid
+1 1 4 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex
index 374ffc7fb..a58e3a510 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex
@@ -8,13 +8,13 @@ Simulated Annealing (SA).
Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_s_a}
+\includegraphics[height=5cm]{classmo_s_a}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, eoEvalFunc$<$ {\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)
\begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize}
@@ -45,7 +45,7 @@ double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4}
{\bf moCoolingSchedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6}
\begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item
-eoEvalFunc$<$ {\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}
@@ -64,7 +64,7 @@ Definition at line 30 of file moSA.h.
\subsection{Constructor \& Destructor Documentation}
\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}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9}
+\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.
@@ -83,7 +83,7 @@ Definition at line 58 of file moSA.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5}
+\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.
@@ -99,9 +99,11 @@ As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the S
\item[Returns:]TRUE. \end{Desc}
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+
Definition at line 80 of file moSA.h.
-References moSA$<$ M $>$::cont, moSA$<$ M $>$::cool\_\-sched, moSA$<$ M $>$::full\_\-eval, moSA$<$ M $>$::incr\_\-eval, moSA$<$ M $>$::init\_\-temp, and moSA$<$ M $>$::move\_\-rand.
+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
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 624cb75de..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 213.904
+%%BoundingBox: 0 0 500 277.778
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.3375 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moSimpleMoveTabuList< M >) cw
(moTabuList< M >) cw
+(eoBF< const M &, const M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moSimpleMoveTabuList< M >) 0 0 box
(moTabuList< M >) 0 1 box
+ (eoBF< const M &, const M::EOType &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 0349b3de0..0d6402705 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
@@ -8,7 +8,7 @@ Class describing a move tabu list with a limited memory.
Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_simple_move_tabu_list}
+\includegraphics[height=4cm]{classmo_simple_move_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -24,7 +24,7 @@ typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e
\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 Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
void {\bf update} ()
@@ -62,10 +62,10 @@ Definition at line 22 of file moSimpleMoveTabuList.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a}
+\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}
-Function that indicates if, in a given state, the \_\-move is tabu or not.
+{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not.
\begin{Desc}
\item[Parameters:]
@@ -76,6 +76,8 @@ Function that indicates if, in a given state, the \_\-move is tabu or not.
\item[Returns:]true or false. \end{Desc}
+Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}.
+
Definition at line 46 of file moSimpleMoveTabuList.h.
References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}}
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 e46012fd0..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 200
+%%BoundingBox: 0 0 500 277.778
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.5 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moSimpleSolutionTabuList< M >) cw
(moTabuList< M >) cw
+(eoBF< const M &, const M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moSimpleSolutionTabuList< M >) 0 0 box
(moTabuList< M >) 0 1 box
+ (eoBF< const M &, const M::EOType &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
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 1de062a76..a81499907 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
@@ -8,7 +8,7 @@ Class describing a solution tabu list with limited length.
Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_simple_solution_tabu_list}
+\includegraphics[height=4cm]{classmo_simple_solution_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b
{\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 Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item
void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
void {\bf update} ()
@@ -80,10 +80,10 @@ References moSimpleSolutionTabuList$<$ M $>$::currentSize.
\subsection{Member Function Documentation}
\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]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047}
+\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}
-Function that indicates if, in a given state, the \_\-move is tabu or not.
+{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not.
\begin{Desc}
\item[Parameters:]
@@ -94,6 +94,8 @@ Function that indicates if, in a given state, the \_\-move is tabu or not.
\item[Returns:]true or false. \end{Desc}
+Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}.
+
Definition at line 45 of file moSimpleSolutionTabuList.h.
References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps
index 34ec5563d..3914bf1d9 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 48.3092
+%%BoundingBox: 0 0 500 96.6184
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 10.35 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 5.175 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 4 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moSolContinue< EOT >) cw
+(eoUF< const EOT &, bool >) cw
+(eoFunctorBase) cw
(moFitSolContinue< EOT >) cw
(moGenSolContinue< EOT >) cw
(moNoFitImprSolContinue< EOT >) cw
@@ -190,6 +192,8 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moSolContinue< EOT >) 1.5 1 box
+ (eoUF< const EOT &, bool >) 1.5 2 box
+ (eoFunctorBase) 1.5 3 box
(moFitSolContinue< EOT >) 0 0 box
(moGenSolContinue< EOT >) 1 0 box
(moNoFitImprSolContinue< EOT >) 2 0 box
@@ -197,6 +201,14 @@ boundx scalefactor div boundy scalefactor div scale
% ----- relations -----
+solid
+0 1.5 1 out
+solid
+1 1.5 2 in
+solid
+0 1.5 2 out
+solid
+1 1.5 3 in
solid
1 1.5 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex
index a4f7f0a52..e573dca89 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex
@@ -8,7 +8,7 @@ Class that describes a stop criterion for a solution-based heuristic.
Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=1.35266cm]{classmo_sol_continue}
+\includegraphics[height=2.70531cm]{classmo_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -23,7 +23,7 @@ virtual void {\bf init} ()=0
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 (eoUF).
+It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}).
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps
index ab211e5df..944e80b1e 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 194.175
+%%BoundingBox: 0 0 500 388.35
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.575 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.2875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,8 @@ boxfont setfont
1 boundaspect scale
(moSteadyFitSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
+(eoUF< const EOT &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale
(moSteadyFitSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
+ (eoUF< const EOT &, bool >) 0 2 box
+ (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -195,3 +199,11 @@ solid
0 0 0 out
solid
1 0 1 in
+solid
+0 0 1 out
+solid
+1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex
index 43efce92e..217779653 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex
@@ -8,7 +8,7 @@ One possible stopping criterion for a solution-based heuristic.
Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_steady_fit_sol_continue}
+\includegraphics[height=4cm]{classmo_steady_fit_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -23,7 +23,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721
{\bf moSteadyFitSolContinue} (unsigned int \_\-\_\-maxNumberOfIterations, unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement)
\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item
bool {\bf operator()} (const EOT \&\_\-\_\-sol)
-\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item
+\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item
void {\bf init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
@@ -80,10 +80,10 @@ Definition at line 34 of file moSteadyFitSolContinue.h.
\subsection{Member Function Documentation}
\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!operator()@{operator()}}
\index{operator()@{operator()}!moSteadyFitSolContinue@{moSteadyFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3}
-Function that activates the stopping criterion.
+{\bf Function} that activates the stopping criterion.
Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations).
@@ -96,6 +96,8 @@ Indicates if the fitness has not been improved since a number of iterations (aft
\item[Returns:]true or false. \end{Desc}
+Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+
Definition at line 46 of file moSteadyFitSolContinue.h.
References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, moSteadyFitSolContinue$<$ EOT $>$::fitness, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterations, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!init@{init}}
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps b/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps
index 7f23b6aef..a62652ad5 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 268.456
+%%BoundingBox: 0 0 500 271.739
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,13 +19,13 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 2 def
-/cols 1 def
+/rows 5 def
+/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,6 +175,10 @@ boxfont setfont
1 boundaspect scale
(moTS< M >) cw
(moAlgo< M::EOType >) cw
+(eoMonOp< M::EOType >) cw
+(eoOp< EOType >) cw
+(eoUF< M::EOType &, bool >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
- (moTS< M >) 0 0 box
- (moAlgo< M::EOType >) 0 1 box
+ (moTS< M >) 0.5 0 box
+ (moAlgo< M::EOType >) 0.5 1 box
+ (eoMonOp< M::EOType >) 0.5 2 box
+ (eoOp< EOType >) 0 3 box
+ (eoUF< M::EOType &, bool >) 1 3 box
+ (eoFunctorBase) 1 4 box
% ----- relations -----
solid
-0 0 0 out
+0 0.5 0 out
solid
-1 0 1 in
+1 0.5 1 in
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+0 1 3 conn
+solid
+1 0 3 in
+solid
+1 1 3 in
+solid
+0 1 3 out
+solid
+1 1 4 in
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex
index cceaa8d92..d548f3f3a 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex
@@ -8,18 +8,18 @@ Tabu Search (TS).
Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_t_s}
+\includegraphics[height=5cm]{classmo_t_s}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\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, eoEvalFunc$<$ {\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, eoEvalFunc$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval)
+{\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 Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em {\bf Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
@@ -38,7 +38,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f8
{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a}
\begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item
-eoEvalFunc$<$ {\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}
@@ -57,7 +57,7 @@ Definition at line 29 of file moTS.h.
\subsection{Constructor \& Destructor Documentation}
\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}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e}
+\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{moTS}{p.}{classmo_t_s} specifying all the boxes.
@@ -73,7 +73,7 @@ In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl
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}, eoEvalFunc$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab}
+\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.
@@ -92,10 +92,10 @@ Definition at line 71 of file moTS.h.
\subsection{Member Function Documentation}
\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]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb}
+\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}
-Function which launchs the Tabu Search.
+{\bf Function} which launchs the Tabu Search.
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.
@@ -108,6 +108,8 @@ Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref
\item[Returns:]TRUE. \end{Desc}
+Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+
Definition at line 85 of file moTS.h.
References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, and moTS$<$ M $>$::move\_\-expl.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps
index d8324527a..fd31fc02a 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps
+++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 352.941
+%%BoundingBox: 0 0 500 327.869
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.41667 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 3 def
+/rows 5 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -176,6 +176,8 @@ boxfont setfont
(moTSMoveLoopExpl< M >) cw
(moMoveLoopExpl< M >) cw
(moMoveExpl< M >) cw
+(eoBF< const M::EOType &, M::EOType &, void >) cw
+(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,6 +192,8 @@ boundx scalefactor div boundy scalefactor div scale
(moTSMoveLoopExpl< M >) 0 0 box
(moMoveLoopExpl< M >) 0 1 box
(moMoveExpl< M >) 0 2 box
+ (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box
+ (eoFunctorBase) 0 4 box
% ----- relations -----
@@ -201,3 +205,11 @@ solid
0 0 1 out
solid
1 0 2 in
+solid
+0 0 2 out
+solid
+1 0 3 in
+solid
+0 0 3 out
+solid
+1 0 4 in
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 5960c57c6..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
@@ -8,7 +8,7 @@ Explorer for a Tabu Search algorithm.
Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=3cm]{classmo_t_s_move_loop_expl}
+\includegraphics[height=5cm]{classmo_t_s_move_loop_expl}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
@@ -83,7 +83,7 @@ References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, and moTSMoveLoopExpl$<$ M $
\subsection{Member Function Documentation}
\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]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7}
+\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,6 +97,8 @@ The exploration continues while the chosen move is not in the tabu list or the a
\end{Desc}
+Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}.
+
Definition at line 69 of file moTSMoveLoopExpl.h.
References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, moTSMoveLoopExpl$<$ M $>$::incr\_\-eval, moTSMoveLoopExpl$<$ M $>$::move\_\-init, moTSMoveLoopExpl$<$ M $>$::move\_\-select, moTSMoveLoopExpl$<$ M $>$::next\_\-move, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list.
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps
index 63ca07c99..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 100
+%%BoundingBox: 0 0 500 138.889
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 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
/yspacing 0 def
-/rows 2 def
+/rows 4 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,6 +174,8 @@
boxfont setfont
1 boundaspect scale
(moTabuList< M >) cw
+(eoBF< const M &, const M::EOType &, bool >) cw
+(eoFunctorBase) cw
(moSimpleMoveTabuList< M >) cw
(moSimpleSolutionTabuList< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -188,11 +190,21 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moTabuList< M >) 0.5 1 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
% ----- relations -----
+solid
+0 0.5 1 out
+solid
+1 0.5 2 in
+solid
+0 0.5 2 out
+solid
+1 0.5 3 in
solid
1 0.5 0.25 out
solid
diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex
index 5cc19f839..1ed7c1b47 100644
--- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex
+++ b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex
@@ -8,7 +8,7 @@ Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses.
Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2cm]{classmo_tabu_list}
+\includegraphics[height=3.88889cm]{classmo_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
@@ -65,7 +65,7 @@ Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}, and {\bf TwoOptTabuList} \doxyref{}{p.}{class_two_opt_tabu_list_c460034b7debe7198c6df046855155da}.\index{moTabuList@{moTabuList}!init@{init}}
+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}
@@ -74,7 +74,7 @@ Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}, and {\bf TwoOptTabuList} \doxyref{}{p.}{class_two_opt_tabu_list_2d3101e6045700b0e32f5e82672a175e}.
+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
diff --git a/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty
index 380517dc0..cff826bea 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 Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by Doxygen }}
+\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 25 16:25:46 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 018b31b01..a8e65d556 100644
--- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex
+++ b/trunk/paradiseo-mo/doc/latex/hierarchy.tex
@@ -1,36 +1,34 @@
-\section{ParadisEO-MOMovingObjects Class Hierarchy}
+\section{PARADISEO-MO Class Hierarchy}
This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList}
-\item \contentsline{section}{CitySwap}{\pageref{class_city_swap}}{}
-\item \contentsline{section}{EdgeXover}{\pageref{class_edge_xover}}{}
\item \contentsline{section}{EmptySelection}{\pageref{class_empty_selection}}{}
-\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{}
-\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{}
+\item eoFunctorBase{\tt [external]}\begin{CompactList}
+\item eoBF$<$ const EOT \&, const EOT \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moComparator$<$ EOT $>$}{\pageref{classmo_comparator}}{}
\begin{CompactList}
-\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{}
-\item \contentsline{section}{moILS$<$ M $>$}{\pageref{classmo_i_l_s}}{}
-\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{}
-\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{}
+\item \contentsline{section}{moFitComparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{}
\end{CompactList}
+\end{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}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{}
+\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{}
+\end{CompactList}
+\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}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{}
\end{CompactList}
-\item \contentsline{section}{moComparator$<$ EOT $>$}{\pageref{classmo_comparator}}{}
-\begin{CompactList}
-\item \contentsline{section}{moFitComparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{}
-\end{CompactList}
-\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{}
-\begin{CompactList}
-\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{}
-\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{}
-\end{CompactList}
-\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{}
-\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{}
-\item \contentsline{section}{moMove$<$ Route $>$}{\pageref{classmo_move}}{}
-\begin{CompactList}
-\item \contentsline{section}{TwoOpt}{\pageref{class_two_opt}}{}
\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}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{}
@@ -39,37 +37,25 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg
\item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{}
\end{CompactList}
\end{CompactList}
-\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{}
-\item \contentsline{section}{moMoveIncrEval$<$ TwoOpt $>$}{\pageref{classmo_move_incr_eval}}{}
-\begin{CompactList}
-\item \contentsline{section}{TwoOptIncrEval}{\pageref{class_two_opt_incr_eval}}{}
\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}{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}}{}
-\item \contentsline{section}{moMoveInit$<$ TwoOpt $>$}{\pageref{classmo_move_init}}{}
-\begin{CompactList}
-\item \contentsline{section}{PartTwoOptInit}{\pageref{class_part_two_opt_init}}{}
-\item \contentsline{section}{TwoOptInit}{\pageref{class_two_opt_init}}{}
\end{CompactList}
+\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}{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}
-\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{}
-\begin{CompactList}
-\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{}
-\end{CompactList}
-\item \contentsline{section}{moNextMove$<$ TwoOpt $>$}{\pageref{classmo_next_move}}{}
-\begin{CompactList}
-\item \contentsline{section}{PartTwoOptNext}{\pageref{class_part_two_opt_next}}{}
-\item \contentsline{section}{TwoOptNext}{\pageref{class_two_opt_next}}{}
-\end{CompactList}
-\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{}
-\item \contentsline{section}{moRandMove$<$ TwoOpt $>$}{\pageref{classmo_rand_move}}{}
-\begin{CompactList}
-\item \contentsline{section}{TwoOptRand}{\pageref{class_two_opt_rand}}{}
\end{CompactList}
+\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList}
\item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{}
\begin{CompactList}
\item \contentsline{section}{moFitSolContinue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{}
@@ -77,18 +63,37 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg
\item \contentsline{section}{moNoFitImprSolContinue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{}
\item \contentsline{section}{moSteadyFitSolContinue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{}
\end{CompactList}
-\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{}
+\end{CompactList}
+\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{}
\begin{CompactList}
-\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{}
-\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{}
+\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{}
+\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{}
\end{CompactList}
-\item \contentsline{section}{moTabuList$<$ TwoOpt $>$}{\pageref{classmo_tabu_list}}{}
+\end{CompactList}
+\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 eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList}
+\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{}
+\end{CompactList}
+\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 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}{TwoOptTabuList}{\pageref{class_two_opt_tabu_list}}{}
+\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{}
+\item \contentsline{section}{moILS$<$ M $>$}{\pageref{classmo_i_l_s}}{}
+\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{}
+\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{}
\end{CompactList}
-\item \contentsline{section}{OrderXover}{\pageref{class_order_xover}}{}
-\item \contentsline{section}{PartialMappedXover}{\pageref{class_partial_mapped_xover}}{}
-\item \contentsline{section}{PartRouteEval}{\pageref{class_part_route_eval}}{}
-\item \contentsline{section}{RouteEval}{\pageref{class_route_eval}}{}
-\item \contentsline{section}{RouteInit}{\pageref{class_route_init}}{}
+\end{CompactList}
+\end{CompactList}
+\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 3ce1b6114..8aed09f85 100644
--- a/trunk/paradiseo-mo/doc/latex/main.tex
+++ b/trunk/paradiseo-mo/doc/latex/main.tex
@@ -1,5 +1,12 @@
-\section{Introduction}\label{main_intro}
-MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par
- It contains classes for almost any kind of one solution based heuristics.\section{Tutorial}\label{main_tutorial}
-\section{Installation}\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{Overall Design}\label{main_design}
+\section{Introduction}\label{main_Introduction}
+MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par
+ It contains classes for almost any kind of one solution based heuristics.\section{AUTHORS}\label{main_authors}
+\begin{TabularC}{1}
+\hline
+Sebastien CAHON \\\hline
+{\tt Jean-Charles BOISSON} \\\hline
+\end{TabularC}
+\section{LICENCE}\label{main_LICENCE}
+\section{Home Page}\label{main_Paradiseo}
+{\tt http://paradiseo.gforge.inria.fr}\section{Installation}\label{main_Installation}
+The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.
\ No newline at end of file
diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex
index 08441c13f..e45c14d62 100644
--- a/trunk/paradiseo-mo/doc/latex/refman.tex
+++ b/trunk/paradiseo-mo/doc/latex/refman.tex
@@ -16,11 +16,11 @@
\begin{titlepage}
\vspace*{7cm}
\begin{center}
-{\Large ParadisEO-MOMovingObjects Reference Manual\\[1ex]\large 1.0 }\\
+{\Large PARADISEO-MO Reference Manual\\[1ex]\large 0.1 }\\
\vspace*{1cm}
{\large Generated by Doxygen 1.5.2}\\
\vspace*{0.5cm}
-{\small Thu Sep 20 11:30:28 2007}\\
+{\small Tue Sep 25 16:25:46 2007}\\
\end{center}
\end{titlepage}
\clearemptydoublepage
@@ -30,18 +30,12 @@
\pagenumbering{arabic}
\chapter{Welcome to PARADISEO-Moving Objects }
\label{index}\input{main}
-\chapter{ParadisEO-MOMovingObjects Namespace Index}
-\input{namespaces}
-\chapter{ParadisEO-MOMovingObjects Hierarchical Index}
+\chapter{PARADISEO-MO Hierarchical Index}
\input{hierarchy}
-\chapter{ParadisEO-MOMovingObjects Class Index}
+\chapter{PARADISEO-MO Class Index}
\input{annotated}
-\chapter{ParadisEO-MOMovingObjects Namespace Documentation}
-\input{namespace_graph}
-\chapter{ParadisEO-MOMovingObjects Class Documentation}
-\input{class_city_swap}
-\include{class_edge_xover}
-\include{class_empty_selection}
+\chapter{PARADISEO-MO Class Documentation}
+\input{class_empty_selection}
\include{classmo_algo}
\include{classmo_aspir_crit}
\include{classmo_best_impr_select}
@@ -78,18 +72,5 @@
\include{classmo_tabu_list}
\include{classmo_t_s}
\include{classmo_t_s_move_loop_expl}
-\include{class_order_xover}
-\include{class_partial_mapped_xover}
-\include{class_part_route_eval}
-\include{class_part_two_opt_init}
-\include{class_part_two_opt_next}
-\include{class_route_eval}
-\include{class_route_init}
-\include{class_two_opt}
-\include{class_two_opt_incr_eval}
-\include{class_two_opt_init}
-\include{class_two_opt_next}
-\include{class_two_opt_rand}
-\include{class_two_opt_tabu_list}
\printindex
\end{document}
diff --git a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3
index b180dac12..c6bde461f 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "EmptySelection" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -20,4 +20,4 @@ Definition at line 21 of file moMoveSelect.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3
index 7c804c380..4dd81ad69 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moAlgo" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moAlgo \- Description of an algorithm of the paradiseo-mo library.
.PP
\fC#include
\fP
.PP
+Inherits \fBeoMonOp< EOT >\fP.
+.PP
.SH "Detailed Description"
.PP
@@ -22,4 +24,4 @@ Definition at line 21 of file moAlgo.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3
index 557c88d1a..286b4a21f 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moAspirCrit" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP.
+.PP
Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP.
.PP
.SS "Public Member Functions"
@@ -41,4 +43,4 @@ Implemented in \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3
index 6a8550809..a1edfe69a 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moBestImprSelect" 3 "25 Sep 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 "\fIFunction that indicates if the current move has not improved the fitness. \fP"
+.RI "\fI\fBFunction\fP 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
-Function that indicates if the current move has not improved the fitness.
+\fBFunction\fP 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
@@ -88,7 +88,7 @@ Implements \fBmoMoveSelect< M >\fP.
Definition at line 47 of file moBestImprSelect.h.
.PP
References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.
-.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP"
+.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP"
.PP
Procedure which saved the best move and fitness.
.PP
@@ -105,6 +105,8 @@ Procedure which saved the best move and fitness.
.RE
.PP
+.PP
+Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
Definition at line 68 of file moBestImprSelect.h.
.PP
@@ -112,4 +114,4 @@ References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, an
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
index f8eb17ebe..34ed0e61a 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moCoolingSchedule" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moCoolingSchedule \- This class gives the description of a cooling schedule.
.PP
\fC#include \fP
.PP
+Inherits \fBeoUF< double &, bool >\fP.
+.PP
Inherited by \fBmoExponentialCoolingSchedule\fP, and \fBmoLinearCoolingSchedule\fP.
.PP
.SH "Detailed Description"
@@ -22,4 +24,4 @@ Definition at line 22 of file moCoolingSchedule.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
index f5b65f427..a3188b4d9 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moExponentialCoolingSchedule" 3 "25 Sep 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 "\fIFunction which proceeds to the cooling. \fP"
+.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP"
.in -1c
.SS "Private Attributes"
@@ -61,9 +61,9 @@ Simple constructor.
Definition at line 31 of file moExponentialCoolingSchedule.h.
.SH "Member Function Documentation"
.PP
-.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline]\fP"
+.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP"
.PP
-Function which proceeds to the cooling.
+\fBFunction\fP which proceeds to the cooling.
.PP
It decreases the temperature and indicates if it is greater than the threshold.
.PP
@@ -78,6 +78,8 @@ if the new temperature (current temperature * ratio) is greater than the thresho
.RE
.PP
+.PP
+Implements \fBeoUF< double &, bool >\fP.
.PP
Definition at line 41 of file moExponentialCoolingSchedule.h.
.PP
@@ -85,4 +87,4 @@ References ratio, and threshold.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
index dda667197..6a11400c7 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moFirstImprSelect" 3 "25 Sep 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 "\fIFunction that indicates if the current move has not improved the fitness. \fP"
+.RI "\fI\fBFunction\fP 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
-Function that indicates if the current move has not improved the fitness.
+\fBFunction\fP 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
@@ -101,7 +101,7 @@ TRUE if the move does not improve the fitness.
Definition at line 52 of file moFirstImprSelect.h.
.PP
References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid.
-.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP"
+.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP"
.PP
Procedure which saved the best move and fitness.
.PP
@@ -118,6 +118,8 @@ Procedure which saved the best move and fitness.
.RE
.PP
+.PP
+Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
Definition at line 76 of file moFirstImprSelect.h.
.PP
@@ -125,4 +127,4 @@ References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move,
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3
index fb7562987..c2c42dd5e 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3
+++ b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moFitSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moFitSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &__sol)"
.br
-.RI "\fIFunction that activates the stopping criterion. \fP"
+.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -69,9 +69,9 @@ Basic constructor.
Definition at line 33 of file moFitSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP"
.PP
-Function that activates the stopping criterion.
+\fBFunction\fP that activates the stopping criterion.
.PP
Indicates if the fitness threshold has not yet been reached.
.PP
@@ -86,6 +86,8 @@ true or false according to the value of the fitness.
.RE
.PP
+.PP
+Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 43 of file moFitSolContinue.h.
.PP
@@ -102,4 +104,4 @@ Definition at line 57 of file moFitSolContinue.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3
index d071e1b7d..023d19a8d 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moGenSolContinue" 3 "25 Sep 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 "\fIFunction that activates the stop criterion. \fP"
+.RI "\fI\fBFunction\fP that activates the stop criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -65,9 +65,9 @@ Simple constructor.
Definition at line 30 of file moGenSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP"
.PP
-Function that activates the stop criterion.
+\fBFunction\fP 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
@@ -82,6 +82,8 @@ TRUE or FALSE according to the current generation number.
.RE
.PP
+.PP
+Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 44 of file moGenSolContinue.h.
.PP
@@ -100,4 +102,4 @@ References moGenSolContinue< EOT >::numGen.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3
index 1d1f713c7..9abd07847 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moHC" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, eoEvalFunc< \fBEOT\fP > &__full_eval)"
+.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)"
.br
.RI "\fIFull constructor. \fP"
.ti -1c
-.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, eoEvalFunc< \fBEOT\fP > &__full_eval)"
+.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)"
.br
.RI "\fILight constructor. \fP"
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)"
.br
-.RI "\fIFunction which launches the HC. \fP"
+.RI "\fI\fBFunction\fP which launches the HC. \fP"
.in -1c
.SS "Private Types"
@@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIComplete exploration of the neighborhood. \fP"
.ti -1c
-.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP"
+.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP"
.br
.RI "\fIA full evaluation function. \fP"
.in -1c
@@ -60,10 +60,10 @@ Hill Climbing (HC).
Class which describes the algorithm for a hill climbing.
.PP
-Definition at line 26 of file moHC.h.
+Definition at line 25 of file moHC.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
+.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
Full constructor.
.PP
@@ -84,8 +84,8 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP.
.PP
.PP
-Definition at line 53 of file moHC.h.
-.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
+Definition at line 52 of file moHC.h.
+.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
Light constructor.
.PP
@@ -100,12 +100,12 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM
.PP
.PP
-Definition at line 67 of file moHC.h.
+Definition at line 66 of file moHC.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
-Function which launches the HC.
+\fBFunction\fP 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
@@ -121,10 +121,12 @@ TRUE.
.PP
.PP
-Definition at line 82 of file moHC.h.
+Implements \fBeoUF< M::EOType &, bool >\fP.
+.PP
+Definition at line 81 of file moHC.h.
.PP
References moHC< M >::full_eval, and moHC< M >::move_expl.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
index 5e39357ce..2cd3fe87e 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moHCMoveLoopExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -87,7 +87,7 @@ All the boxes have to be specified.
Definition at line 43 of file moHCMoveLoopExpl.h.
.SH "Member Function Documentation"
.PP
-.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP"
+.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP"
.PP
Procedure which launches the explorer.
.PP
@@ -101,6 +101,8 @@ The exploration starts from an old solution and provides a new solution.
.RE
.PP
+.PP
+Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
.PP
Definition at line 59 of file moHCMoveLoopExpl.h.
.PP
@@ -108,4 +110,4 @@ References moHCMoveLoopExpl< M >::incr_eval, moHCMoveLoopExpl< M >::move_init, m
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
index 88bd421fa..e88777845 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moImprBestFitAspirCrit" 3 "25 Sep 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 "\fIFunction that indicates if the fit is better that the already saved fit. \fP"
+.RI "\fI\fBFunction\fP 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
-Function that indicates if the fit is better that the already saved fit.
+\fBFunction\fP 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
@@ -85,4 +87,4 @@ References moImprBestFitAspirCrit< M >::best_fit, and moImprBestFitAspirCrit< M
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3
index 1222715d9..459274ce3 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moItRandNextMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -63,7 +63,7 @@ Definition at line 22 of file moItRandNextMove.h.
.PP
The constructor.
.PP
-Parameters only for initialising the attributes.
+\fBParameters\fP only for initialising the attributes.
.PP
\fBParameters:\fP
.RS 4
@@ -77,7 +77,7 @@ Parameters only for initialising the attributes.
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
@@ -103,4 +105,4 @@ References moItRandNextMove< M >::max_iter, moItRandNextMove< M >::num_iter, and
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
index 4f45f9ee7..17e5de91c 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moLSCheckPoint" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,15 +10,17 @@ moLSCheckPoint \- Class which allows a checkpointing system.
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< const M &, const M::EOType &, void >\fP.
+.PP
.SS "Public Member Functions"
.in +1c
.ti -1c
.RI "void \fBoperator()\fP (const M &__move, const typename M::EOType &__sol)"
.br
-.RI "\fIFunction which launches the checkpointing. \fP"
+.RI "\fI\fBFunction\fP which launches the checkpointing. \fP"
.ti -1c
-.RI "void \fBadd\fP (eoBF< const M &, const typename M::EOType &, void > &__f)"
+.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)"
.br
.RI "\fIProcedure which add a new function to the function vector. \fP"
.in -1c
@@ -26,7 +28,7 @@ moLSCheckPoint \- Class which allows a checkpointing system.
.in +1c
.ti -1c
-.RI "std::vector< eoBF< const M &, const typename M::EOType &, void > * > \fBfunc\fP"
+.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunc\fP"
.br
.RI "\fIvector of function \fP"
.in -1c
@@ -43,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
-Function which launches the checkpointing.
+\fBFunction\fP which launches the checkpointing.
.PP
Each saved function is used on the current move and the current solution.
.PP
@@ -59,7 +61,7 @@ Each saved function is used on the current move and the current solution.
Definition at line 34 of file moLSCheckPoint.h.
.PP
References moLSCheckPoint< M >::func.
-.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP"
+.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP"
.PP
Procedure which add a new function to the function vector.
.PP
@@ -78,4 +80,4 @@ References moLSCheckPoint< M >::func.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
index c85b8d177..c8314c9bf 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moLinearCoolingSchedule" 3 "25 Sep 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 "\fIFunction which proceeds to the cooling. \fP"
+.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP"
.in -1c
.SS "Private Attributes"
@@ -61,9 +61,9 @@ Simple constructor.
Definition at line 31 of file moLinearCoolingSchedule.h.
.SH "Member Function Documentation"
.PP
-.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline]\fP"
+.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP"
.PP
-Function which proceeds to the cooling.
+\fBFunction\fP which proceeds to the cooling.
.PP
It decreases the temperature and indicates if it is greater than the threshold.
.PP
@@ -78,6 +78,8 @@ if the new temperature (current temperature - quantity) is greater than the thre
.RE
.PP
+.PP
+Implements \fBeoUF< double &, bool >\fP.
.PP
Definition at line 41 of file moLinearCoolingSchedule.h.
.PP
@@ -85,4 +87,4 @@ References quantity, and threshold.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3
index ef64528a3..53375366c 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moMove \- Definition of a move.
.PP
\fC#include \fP
.PP
+Inherits \fBeoUF< EOT &, void >\fP.
+.PP
.SS "Public Types"
.in +1c
@@ -30,4 +32,4 @@ Definition at line 23 of file moMove.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3
index 27b34bfd5..32d421e0f 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moMoveExpl \- Description of a move (\fBmoMove\fP) explorer.
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
+.PP
Inherited by \fBmoMoveLoopExpl< M >\fP.
.PP
.SH "Detailed Description"
@@ -24,4 +26,4 @@ Definition at line 21 of file moMoveExpl.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
index b9cd0a2d6..880642625 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveIncrEval" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP.
+.PP
.SH "Detailed Description"
.PP
@@ -22,4 +24,4 @@ Definition at line 24 of file moMoveIncrEval.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3
index c137282c7..1236af218 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveInit" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moMoveInit \- Move (\fBmoMove\fP) initializer.
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< M &, const M::EOType &, void >\fP.
+.PP
.SH "Detailed Description"
.PP
@@ -22,4 +24,4 @@ Definition at line 22 of file moMoveInit.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
index ab1d57a2e..76967a5b7 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveLoopExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -26,4 +26,4 @@ Definition at line 21 of file moMoveLoopExpl.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3
index b7fc81be7..eb557b317 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveSelect" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moMoveSelect \- Class that describes a move selector (\fBmoMove\fP).
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
+.PP
Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP.
.PP
.SS "Public Types"
@@ -30,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 "\fIFunction which updates the best solutions. \fP"
+.RI "\fI\fBFunction\fP which updates the best solutions. \fP"
.in -1c
.SH "Detailed Description"
.PP
@@ -59,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
-Function which updates the best solutions.
+\fBFunction\fP which updates the best solutions.
.PP
\fBParameters:\fP
.RS 4
@@ -79,4 +81,4 @@ Implemented in \fBmoBestImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3
index e3fbfbc82..dbb9dc42c 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moNextMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP).
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< M &, const M::EOType &, bool >\fP.
+.PP
Inherited by \fBmoItRandNextMove< M >\fP.
.PP
.SH "Detailed Description"
@@ -24,4 +26,4 @@ Definition at line 22 of file moNextMove.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
index f7ac8b395..f4b026952 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moNoAspirCrit" 3 "25 Sep 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 "\fIFunction which describes the aspiration criterion behaviour. \fP"
+.RI "\fI\fBFunction\fP 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
-Function which describes the aspiration criterion behaviour.
+\fBFunction\fP which describes the aspiration criterion behaviour.
.PP
Does nothing.
.PP
@@ -68,4 +68,4 @@ Definition at line 43 of file moNoAspirCrit.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3
index 68bdba67d..1008df771 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3
+++ b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moNoFitImprSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moNoFitImprSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &__sol)"
.br
-.RI "\fIFunction that activates the stopping criterion. \fP"
+.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -81,9 +81,9 @@ Basic constructor.
Definition at line 33 of file moNoFitImprSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP"
.PP
-Function that activates the stopping criterion.
+\fBFunction\fP that activates the stopping criterion.
.PP
Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations).
.PP
@@ -98,6 +98,8 @@ true or false.
.RE
.PP
+.PP
+Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 43 of file moNoFitImprSolContinue.h.
.PP
@@ -116,4 +118,4 @@ References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< E
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3
index 88d44862c..09cd94de0 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moRandImprSelect" 3 "25 Sep 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 "\fIFunction that updates the fitness and move vectors. \fP"
+.RI "\fI\fBFunction\fP 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
-Function that updates the fitness and move vectors.
+\fBFunction\fP 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
@@ -106,7 +106,7 @@ Implements \fBmoMoveSelect< M >\fP.
Definition at line 56 of file moRandImprSelect.h.
.PP
References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.
-.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP"
+.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP"
.PP
The move selection.
.PP
@@ -125,11 +125,13 @@ One the saved move is randomly chosen.
.RE
.PP
+.PP
+Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
Definition at line 77 of file moRandImprSelect.h.
.PP
-References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.
+References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3
index 104b70a1d..1bceef195 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moRandMove" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moRandMove \- Random move generator.
.PP
\fC#include \fP
.PP
+Inherits \fBeoUF< M &, void >\fP.
+.PP
.SH "Detailed Description"
.PP
@@ -22,4 +24,4 @@ Definition at line 21 of file moRandMove.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3
index cf69b90c7..39dd04ae2 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSA" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, eoEvalFunc< \fBEOT\fP > &__full_eval)"
+.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)"
.br
.RI "\fISA constructor. \fP"
.ti -1c
@@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIThe cooling schedule. \fP"
.ti -1c
-.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP"
+.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP"
.br
.RI "\fIA full evaluation function. \fP"
.in -1c
@@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm.
Definition at line 30 of file moSA.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
+.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
SA constructor.
.PP
@@ -101,7 +101,7 @@ All the boxes used by a SA need to be given.
Definition at line 58 of file moSA.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
function that launches the SA algorithm.
.PP
@@ -118,11 +118,13 @@ TRUE.
.RE
.PP
+.PP
+Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
Definition at line 80 of file moSA.h.
.PP
-References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand.
+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().
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
index e70b99a11..a1d95aa50 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSimpleMoveTabuList" 3 "25 Sep 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 "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP"
+.RI "\fI\fBFunction\fP 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
-Function that indicates if, in a given state, the _move is tabu or not.
+\fBFunction\fP 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
@@ -155,4 +157,4 @@ Referenced by moSimpleMoveTabuList< M >::add().
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
index 327986a8b..82ae46b37 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSimpleSolutionTabuList" 3 "25 Sep 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 "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP"
+.RI "\fI\fBFunction\fP 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
-Function that indicates if, in a given state, the _move is tabu or not.
+\fBFunction\fP 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
@@ -171,4 +173,4 @@ Referenced by moSimpleSolutionTabuList< M >::add().
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3
index c405d240e..bda7e8afe 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moSolContinue \- Class that describes a stop criterion for a solution-based heur
.PP
\fC#include \fP
.PP
+Inherits \fBeoUF< const EOT &, bool >\fP.
+.PP
Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP.
.PP
.SS "Public Member Functions"
@@ -26,7 +28,7 @@ Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmo
.SS "template 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 (eoUF).
+It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP).
.PP
Definition at line 22 of file moSolContinue.h.
.SH "Member Function Documentation"
@@ -41,4 +43,4 @@ Implemented in \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fB
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3
index d1a430265..6e6cf540f 100644
--- a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3
+++ b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moSteadyFitSolContinue" 3 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSteadyFitSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &__sol)"
.br
-.RI "\fIFunction that activates the stopping criterion. \fP"
+.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -91,9 +91,9 @@ Basic constructor.
Definition at line 34 of file moSteadyFitSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP"
.PP
-Function that activates the stopping criterion.
+\fBFunction\fP that activates the stopping criterion.
.PP
Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations).
.PP
@@ -108,6 +108,8 @@ true or false.
.RE
.PP
+.PP
+Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 46 of file moSteadyFitSolContinue.h.
.PP
@@ -126,4 +128,4 @@ References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3
index 990f2e4ba..e1449aa89 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moTS" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)"
+.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)"
.br
.RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP"
.ti -1c
-.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)"
+.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)"
.br
.RI "\fIConstructor with less parameters. \fP"
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)"
.br
-.RI "\fIFunction which launchs the Tabu Search. \fP"
+.RI "\fI\fBFunction\fP which launchs the Tabu Search. \fP"
.in -1c
.SS "Private Types"
@@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIStop criterion. \fP"
.ti -1c
-.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP"
+.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP"
.br
.RI "\fIFull evaluation function. \fP"
.in -1c
@@ -67,7 +67,7 @@ Generic algorithm that describes a tabu search.
Definition at line 29 of file moTS.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
+.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
Constructor of a \fBmoTS\fP specifying all the boxes.
.PP
@@ -93,7 +93,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated.
.PP
Definition at line 58 of file moTS.h.
-.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
+.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP"
.PP
Constructor with less parameters.
.PP
@@ -113,9 +113,9 @@ The explorer is given in the parameters.
Definition at line 71 of file moTS.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP"
+.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP"
.PP
-Function which launchs the Tabu Search.
+\fBFunction\fP 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
@@ -130,6 +130,8 @@ TRUE.
.RE
.PP
+.PP
+Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
Definition at line 85 of file moTS.h.
.PP
@@ -137,4 +139,4 @@ References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
index 25b5b624b..19aae91bc 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moTSMoveLoopExpl" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -99,7 +99,7 @@ Definition at line 49 of file moTSMoveLoopExpl.h.
References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list.
.SH "Member Function Documentation"
.PP
-.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP"
+.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP"
.PP
Procedure which lauches the exploration.
.PP
@@ -113,6 +113,8 @@ The exploration continues while the chosen move is not in the tabu list or the a
.RE
.PP
+.PP
+Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
.PP
Definition at line 69 of file moTSMoveLoopExpl.h.
.PP
@@ -120,4 +122,4 @@ References moTSMoveLoopExpl< M >::aspir_crit, moTSMoveLoopExpl< M >::incr_eval,
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3
index cbc9bcd7d..33e8c6fdf 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 "20 Sep 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moTabuList" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,6 +10,8 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses.
.PP
\fC#include \fP
.PP
+Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP.
+.PP
Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP.
.PP
.SS "Public Types"
@@ -69,15 +71,15 @@ Procedure that updates the tabu list content.
.PP
Generally, a counter associated to each saved move is decreased by one.
.PP
-Implemented in \fBmoSimpleMoveTabuList< M >\fP, \fBmoSimpleSolutionTabuList< M >\fP, and \fBTwoOptTabuList\fP.
+Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP.
.SS "template virtual void \fBmoTabuList\fP< M >::init ()\fC [pure virtual]\fP"
.PP
Procedure which initialises the tabu list.
.PP
Can be useful if the data structure needs to be allocated before being used.
.PP
-Implemented in \fBmoSimpleMoveTabuList< M >\fP, \fBmoSimpleSolutionTabuList< M >\fP, and \fBTwoOptTabuList\fP.
+Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for PARADISEO-MO from the source code.
diff --git a/trunk/paradiseo-mo/doc/mo.doxytag b/trunk/paradiseo-mo/doc/mo.doxytag
index cd684b20c..da9a46106 100644
--- a/trunk/paradiseo-mo/doc/mo.doxytag
+++ b/trunk/paradiseo-mo/doc/mo.doxytag
@@ -4,10 +4,11 @@
main
Welcome to PARADISEO-Moving Objects
main
- intro
- tutorial
- install
- design
+ Paradiseo
+ authors
+ Introduction
+ LICENCE
+ Installation
EmptySelection
@@ -17,11 +18,13 @@
moAlgo
classmo_algo.html
EOT
+ eoMonOp< EOT >
moAspirCrit
classmo_aspir_crit.html
M
+ eoBF< const M &, const M::EOType::Fitness &, bool >
virtual void
init
@@ -89,10 +92,12 @@
moComparator
classmo_comparator.html
EOT
+ eoBF< const EOT &, const EOT &, bool >
moCoolingSchedule
classmo_cooling_schedule.html
+ eoUF< double &, bool >
moExponentialCoolingSchedule
@@ -624,6 +629,7 @@
moLSCheckPoint
classmo_l_s_check_point.html
M
+ eoBF< const M &, const M::EOType &, void >
void
operator()
@@ -650,6 +656,7 @@
moMove
classmo_move.html
EOT
+ eoUF< EOT &, void >
EOT
EOType
@@ -662,16 +669,19 @@
moMoveExpl
classmo_move_expl.html
M
+ eoBF< const M::EOType &, M::EOType &, void >
moMoveIncrEval
classmo_move_incr_eval.html
M
+ eoBF< const M &, const M::EOType &, M::EOType::Fitness >
moMoveInit
classmo_move_init.html
M
+ eoBF< M &, const M::EOType &, void >
moMoveLoopExpl
@@ -683,6 +693,7 @@
moMoveSelect
classmo_move_select.html
M
+ eoBF< M &, M::EOType::Fitness &, void >
M::EOType::Fitness
Fitness
@@ -709,6 +720,7 @@
moNextMove
classmo_next_move.html
M
+ eoBF< M &, const M::EOType &, bool >
moNoAspirCrit
@@ -851,6 +863,7 @@
moRandMove
classmo_rand_move.html
M
+ eoUF< M &, void >
moSA
@@ -1084,6 +1097,7 @@
moSolContinue
classmo_sol_continue.html
EOT
+ eoUF< const EOT &, bool >
virtual void
init
@@ -1172,6 +1186,7 @@
moTabuList
classmo_tabu_list.html
M
+ eoBF< const M &, const M::EOType &, bool >
M::EOType
EOT
diff --git a/trunk/paradiseo-mo/src/index.h b/trunk/paradiseo-mo/src/index.h
index 10ac58f88..50486cb68 100644
--- a/trunk/paradiseo-mo/src/index.h
+++ b/trunk/paradiseo-mo/src/index.h
@@ -1,21 +1,33 @@
/** @mainpage Welcome to PARADISEO-Moving Objects
-@section intro Introduction
+@section Introduction
MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
It contains classes for almost any kind of one solution based heuristics.
-@section tutorial Tutorial
+@section authors AUTHORS
+
-@section install Installation
+@section LICENCE
+
+@section Paradiseo Home Page
+
+http://paradiseo.gforge.inria.fr
+
+@section Installation
The installation procedure of the package is detailed in the
README file in the top-directory of the source-tree.
-@section design Overall Design
-
*/
diff --git a/trunk/paradiseo-mo/src/moFitComparator.h b/trunk/paradiseo-mo/src/moFitComparator.h
index 8b0ab6493..37bb059d0 100644
--- a/trunk/paradiseo-mo/src/moFitComparator.h
+++ b/trunk/paradiseo-mo/src/moFitComparator.h
@@ -20,6 +20,13 @@ template
class moFitComparator: public moComparator
{
public:
+
+ //! Function which makes the comparison and gives the result.
+ /*!
+ \param _solution1 The first solution.
+ \param _solution2 The second solution.
+ \return true if the fitness of the first solution is better than the second solution, false else.
+ */
bool operator()(const EOT& _solution1, const EOT& _solution2)
{
return _solution1.fitness()>_solution2.fitness();
1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/class_empty_selection.html b/trunk/paradiseo-mo/doc/html/class_empty_selection.html
index 4cd26fe1e..01d0129f7 100644
--- a/trunk/paradiseo-mo/doc/html/class_empty_selection.html
+++ b/trunk/paradiseo-mo/doc/html/class_empty_selection.html
@@ -1,6 +1,6 @@
-
