From c0aa650dbff938f4f163142da6466e7959ca374a Mon Sep 17 00:00:00 2001 From: legrand Date: Thu, 5 Jul 2007 11:46:12 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@543 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/doc/html/annotated.html | 46 ++- .../doc/html/class_empty_selection.html | 16 +- trunk/paradiseo-mo/doc/html/classes.html | 18 +- trunk/paradiseo-mo/doc/html/classmo_algo.html | 18 +- .../doc/html/classmo_aspir_crit-members.html | 22 +- .../doc/html/classmo_aspir_crit.html | 28 +- .../doc/html/classmo_aspir_crit.png | Bin 1805 -> 1233 bytes .../classmo_best_impr_select-members.html | 16 +- .../doc/html/classmo_best_impr_select.html | 30 +- .../doc/html/classmo_cooling_schedule.html | 18 +- ..._exponential_cooling_schedule-members.html | 16 +- .../classmo_exponential_cooling_schedule.html | 26 +- .../classmo_first_impr_select-members.html | 16 +- .../doc/html/classmo_first_impr_select.html | 30 +- .../classmo_gen_sol_continue-members.html | 16 +- .../doc/html/classmo_gen_sol_continue.html | 22 +- .../doc/html/classmo_h_c-members.html | 20 +- trunk/paradiseo-mo/doc/html/classmo_h_c.html | 28 +- .../classmo_h_c_move_loop_expl-members.html | 16 +- .../doc/html/classmo_h_c_move_loop_expl.html | 20 +- ...ssmo_impr_best_fit_aspir_crit-members.html | 23 +- .../classmo_impr_best_fit_aspir_crit.html | 36 ++- .../html/classmo_impr_best_fit_aspir_crit.png | Bin 1309 -> 905 bytes .../classmo_it_rand_next_move-members.html | 23 +- .../doc/html/classmo_it_rand_next_move.html | 34 +-- .../doc/html/classmo_it_rand_next_move.png | Bin 1033 -> 847 bytes .../html/classmo_l_s_check_point-members.html | 22 +- .../doc/html/classmo_l_s_check_point.html | 26 +- ...assmo_linear_cooling_schedule-members.html | 16 +- .../html/classmo_linear_cooling_schedule.html | 26 +- .../html/classmo_linear_cooling_schedule.png | Bin 859 -> 859 bytes .../doc/html/classmo_move-members.html | 16 +- trunk/paradiseo-mo/doc/html/classmo_move.html | 16 +- .../doc/html/classmo_move_expl.html | 22 +- .../doc/html/classmo_move_incr_eval.html | 22 +- .../doc/html/classmo_move_init.html | 24 +- .../doc/html/classmo_move_loop_expl.html | 18 +- .../doc/html/classmo_move_select-members.html | 16 +- .../doc/html/classmo_move_select.html | 28 +- .../doc/html/classmo_next_move.html | 28 +- .../doc/html/classmo_next_move.png | Bin 1050 -> 861 bytes .../html/classmo_no_aspir_crit-members.html | 22 +- .../doc/html/classmo_no_aspir_crit.html | 36 ++- .../doc/html/classmo_no_aspir_crit.png | Bin 1254 -> 782 bytes .../classmo_rand_impr_select-members.html | 16 +- .../doc/html/classmo_rand_impr_select.html | 32 +-- .../doc/html/classmo_rand_move-members.html | 16 +- .../doc/html/classmo_rand_move.html | 18 +- .../doc/html/classmo_s_a-members.html | 20 +- trunk/paradiseo-mo/doc/html/classmo_s_a.html | 20 +- ...classmo_simple_move_tabu_list-members.html | 23 +- .../html/classmo_simple_move_tabu_list.html | 36 ++- .../html/classmo_simple_move_tabu_list.png | Bin 1368 -> 883 bytes ...smo_simple_solution_tabu_list-members.html | 23 +- .../classmo_simple_solution_tabu_list.html | 34 +-- .../classmo_simple_solution_tabu_list.png | Bin 1376 -> 906 bytes .../html/classmo_sol_continue-members.html | 16 +- .../doc/html/classmo_sol_continue.html | 16 +- .../doc/html/classmo_t_s-members.html | 22 +- trunk/paradiseo-mo/doc/html/classmo_t_s.html | 55 ++-- .../classmo_t_s_move_loop_expl-members.html | 16 +- .../doc/html/classmo_t_s_move_loop_expl.html | 18 +- .../doc/html/classmo_tabu_list-members.html | 22 +- .../doc/html/classmo_tabu_list.html | 30 +- .../doc/html/classmo_tabu_list.png | Bin 1770 -> 1364 bytes trunk/paradiseo-mo/doc/html/doxygen.css | 2 +- trunk/paradiseo-mo/doc/html/files.html | 13 +- trunk/paradiseo-mo/doc/html/functions.html | 262 ++++-------------- .../paradiseo-mo/doc/html/functions_func.html | 149 ++-------- .../paradiseo-mo/doc/html/functions_type.html | 46 +-- .../paradiseo-mo/doc/html/functions_vars.html | 134 +++------ trunk/paradiseo-mo/doc/html/hierarchy.html | 59 ++-- trunk/paradiseo-mo/doc/html/index.html | 5 +- .../doc/html/index_8h-source.html | 13 +- trunk/paradiseo-mo/doc/html/main.html | 13 +- trunk/paradiseo-mo/doc/html/mo_8h-source.html | 13 +- .../doc/html/mo_algo_8h-source.html | 15 +- .../doc/html/mo_aspir_crit_8h-source.html | 17 +- .../html/mo_best_impr_select_8h-source.html | 47 ++-- .../html/mo_cooling_schedule_8h-source.html | 15 +- ...xponential_cooling_schedule_8h-source.html | 25 +- .../html/mo_first_impr_select_8h-source.html | 51 ++-- .../html/mo_gen_sol_continue_8h-source.html | 29 +- .../doc/html/mo_h_c_8h-source.html | 41 ++- .../html/mo_h_c_move_loop_expl_8h-source.html | 51 ++-- ...mo_impr_best_fit_aspir_crit_8h-source.html | 41 ++- .../html/mo_it_rand_next_move_8h-source.html | 39 ++- .../html/mo_l_s_check_point_8h-source.html | 27 +- .../mo_linear_cooling_schedule_8h-source.html | 25 +- .../doc/html/mo_move_8h-source.html | 17 +- .../doc/html/mo_move_expl_8h-source.html | 15 +- .../doc/html/mo_move_incr_eval_8h-source.html | 15 +- .../doc/html/mo_move_init_8h-source.html | 15 +- .../doc/html/mo_move_loop_expl_8h-source.html | 15 +- .../doc/html/mo_move_select_8h-source.html | 23 +- .../doc/html/mo_next_move_8h-source.html | 15 +- .../doc/html/mo_no_aspir_crit_8h-source.html | 19 +- .../html/mo_rand_impr_select_8h-source.html | 51 ++-- .../doc/html/mo_rand_move_8h-source.html | 15 +- .../doc/html/mo_s_a_8h-source.html | 67 +++-- .../mo_simple_move_tabu_list_8h-source.html | 63 +++-- ...o_simple_solution_tabu_list_8h-source.html | 67 +++-- .../doc/html/mo_sol_continue_8h-source.html | 17 +- .../doc/html/mo_t_s_8h-source.html | 213 ++++++-------- .../html/mo_t_s_move_loop_expl_8h-source.html | 67 +++-- .../doc/html/mo_tabu_list_8h-source.html | 23 +- trunk/paradiseo-mo/doc/html/search.idx | Bin 342580 -> 341793 bytes trunk/paradiseo-mo/doc/html/search.php | 8 +- trunk/paradiseo-mo/doc/html/tabs.css | 4 +- trunk/paradiseo-mo/doc/html/tree.html | 113 ++++---- trunk/paradiseo-mo/doc/latex/annotated.tex | 62 ++--- .../doc/latex/class_empty_selection.tex | 8 +- trunk/paradiseo-mo/doc/latex/classmo_algo.tex | 14 +- .../doc/latex/classmo_aspir_crit.eps | 8 +- .../doc/latex/classmo_aspir_crit.tex | 26 +- .../doc/latex/classmo_best_impr_select.tex | 60 ++-- .../doc/latex/classmo_cooling_schedule.tex | 12 +- .../classmo_exponential_cooling_schedule.tex | 44 +-- .../doc/latex/classmo_first_impr_select.tex | 70 ++--- .../doc/latex/classmo_gen_sol_continue.tex | 58 ++-- trunk/paradiseo-mo/doc/latex/classmo_h_c.tex | 62 ++--- .../doc/latex/classmo_h_c_move_loop_expl.tex | 52 ++-- .../classmo_impr_best_fit_aspir_crit.eps | 8 +- .../classmo_impr_best_fit_aspir_crit.tex | 44 ++- .../doc/latex/classmo_it_rand_next_move.eps | 8 +- .../doc/latex/classmo_it_rand_next_move.tex | 52 ++-- .../doc/latex/classmo_l_s_check_point.tex | 40 +-- .../latex/classmo_linear_cooling_schedule.tex | 44 +-- trunk/paradiseo-mo/doc/latex/classmo_move.tex | 14 +- .../doc/latex/classmo_move_expl.tex | 18 +- .../doc/latex/classmo_move_incr_eval.tex | 12 +- .../doc/latex/classmo_move_init.tex | 16 +- .../doc/latex/classmo_move_loop_expl.tex | 14 +- .../doc/latex/classmo_move_select.tex | 42 +-- .../doc/latex/classmo_next_move.eps | 8 +- .../doc/latex/classmo_next_move.tex | 18 +- .../doc/latex/classmo_no_aspir_crit.eps | 8 +- .../doc/latex/classmo_no_aspir_crit.tex | 44 +-- .../doc/latex/classmo_rand_impr_select.tex | 72 ++--- .../doc/latex/classmo_rand_move.tex | 14 +- trunk/paradiseo-mo/doc/latex/classmo_s_a.tex | 54 ++-- .../latex/classmo_simple_move_tabu_list.eps | 8 +- .../latex/classmo_simple_move_tabu_list.tex | 88 +++--- .../classmo_simple_solution_tabu_list.eps | 8 +- .../classmo_simple_solution_tabu_list.tex | 96 ++++--- .../doc/latex/classmo_sol_continue.tex | 24 +- trunk/paradiseo-mo/doc/latex/classmo_t_s.tex | 81 +++--- .../doc/latex/classmo_t_s_move_loop_expl.tex | 56 ++-- .../doc/latex/classmo_tabu_list.eps | 8 +- .../doc/latex/classmo_tabu_list.tex | 48 ++-- trunk/paradiseo-mo/doc/latex/doxygen.sty | 4 +- trunk/paradiseo-mo/doc/latex/hierarchy.tex | 106 ++++--- trunk/paradiseo-mo/doc/latex/main.tex | 2 +- trunk/paradiseo-mo/doc/latex/refman.tex | 5 +- .../doc/man/man3/EmptySelection.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moAlgo.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 | 4 +- .../doc/man/man3/moBestImprSelect.3 | 6 +- .../doc/man/man3/moCoolingSchedule.3 | 2 +- .../man/man3/moExponentialCoolingSchedule.3 | 6 +- .../doc/man/man3/moFirstImprSelect.3 | 6 +- .../doc/man/man3/moGenSolContinue.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moHC.3 | 6 +- .../doc/man/man3/moHCMoveLoopExpl.3 | 2 +- .../doc/man/man3/moImprBestFitAspirCrit.3 | 10 +- .../doc/man/man3/moItRandNextMove.3 | 6 +- .../doc/man/man3/moLSCheckPoint.3 | 8 +- .../doc/man/man3/moLinearCoolingSchedule.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moMove.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 | 2 +- .../doc/man/man3/moMoveIncrEval.3 | 4 +- trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 | 4 +- .../doc/man/man3/moMoveLoopExpl.3 | 2 +- .../paradiseo-mo/doc/man/man3/moMoveSelect.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moNextMove.3 | 4 +- .../paradiseo-mo/doc/man/man3/moNoAspirCrit.3 | 6 +- .../doc/man/man3/moRandImprSelect.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moRandMove.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moSA.3 | 2 +- .../doc/man/man3/moSimpleMoveTabuList.3 | 10 +- .../doc/man/man3/moSimpleSolutionTabuList.3 | 10 +- .../paradiseo-mo/doc/man/man3/moSolContinue.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moTS.3 | 32 +-- .../doc/man/man3/moTSMoveLoopExpl.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moTabuList.3 | 4 +- 185 files changed, 2199 insertions(+), 2796 deletions(-) diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index eda66607a..189fb822f 100644 --- a/trunk/paradiseo-mo/doc/html/annotated.html +++ b/trunk/paradiseo-mo/doc/html/annotated.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class List - +
-
+
-
+

PARADISEO-MO Class List

Here are the classes, structs, unions and interfaces with brief descriptions: - + - - + + - - - - + + + + - + - + - - - - + + + + - +
EmptySelectionSpecial class that describes the case of no selection
moAlgo< EOT >Description of an algorithm of the paradiseo-mo library
moAspirCrit< M >Description of the conditions in which a tabu move could be accepted
moBestImprSelect< M >One of the possible moMoveSelect
moBestImprSelect< M >One of the possible moMoveSelect
moCoolingScheduleThis class gives the description of a cooling schedule
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moGenSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moHC< M >Hill Climbing (HC)
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moLSCheckPoint< M >Class which allows a checkpointing system
moMove< EOT >Definition of a move
moMoveExpl< M >Description of a move (moMove) explorer
moMoveExpl< M >Description of a move (moMove) explorer
moMoveIncrEval< M >(generally) Efficient evaluation function based a move and a solution
moMoveInit< M >Move (moMove) initializer
moMoveInit< M >Move (moMove) initializer
moMoveLoopExpl< M >Class which describes an iterative explorer
moMoveSelect< M >Class that describes a move selector (moMove)
moNextMove< M >Class which allows to generate a new move (moMove)
moNoAspirCrit< M >One of the possible aspiration criterion (moAspirCrit)
moRandImprSelect< M >One of the possible moMove selector (moMoveSelect)
moMoveSelect< M >Class that describes a move selector (moMove)
moNextMove< M >Class which allows to generate a new move (moMove)
moNoAspirCrit< M >One of the possible aspiration criterion (moAspirCrit)
moRandImprSelect< M >One of the possible moMove selector (moMoveSelect)
moRandMove< M >Random move generator
moSA< M >Simulated Annealing (SA)
moSimpleMoveTabuList< M >Class describing a move tabu list with a limited memory
moSimpleSolutionTabuList< M >Class describing a solution tabu list with limited length
moSolContinue< EOT >Class that describes a stop criterion for a solution-based heuristic
moTabuList< M >Class describing a tabu list that a moTS uses
moTabuList< M >Class describing a tabu list that a moTS uses
moTS< M >Tabu Search (TS)
moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm
-
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_empty_selection.html b/trunk/paradiseo-mo/doc/html/class_empty_selection.html index e01abaacd..1e0736df3 100644 --- a/trunk/paradiseo-mo/doc/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/doc/html/class_empty_selection.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: EmptySelection Class Reference - +
-
+
-
+

EmptySelection Class Reference

Special class that describes the case of no selection. More...

@@ -47,8 +45,8 @@ This class is used as an exception that can be thrown if a solution selector has

Definition at line 21 of file moMoveSelect.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classes.html b/trunk/paradiseo-mo/doc/html/classes.html index 793bb4f20..d72bede06 100644 --- a/trunk/paradiseo-mo/doc/html/classes.html +++ b/trunk/paradiseo-mo/doc/html/classes.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Alphabetical List - +
-
+
-
+

PARADISEO-MO Class Index

A | B | C | E | F | G | H | I | L | M | N | R | S | T

  A  
@@ -47,8 +45,8 @@
  G  
moMoveInit   moTabuList   
moGenSolContinue   moMoveLoopExpl   moTS   
  H  
moMoveSelect   moTSMoveLoopExpl   

A | B | C | E | F | G | H | I | L | M | N | R | S | T

-


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo.html b/trunk/paradiseo-mo/doc/html/classmo_algo.html index 5f0f0d73b..263e63d0a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moAlgo< EOT > Class Template Reference - +
-
+
-
+

moAlgo< EOT > Class Template Reference

Description of an algorithm of the paradiseo-mo library. More...

@@ -52,14 +50,14 @@ Description of an algorithm of the paradiseo-mo library.

-moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library. +moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library.

Definition at line 21 of file moAlgo.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html index 5ade4a317..5be3dd011 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moAspirCrit< M > Member List

This is the complete list of members for moAspirCrit< M >, including all inherited members.

- + - - + + -
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()=0moAspirCrit< M > [pure virtual]
operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html index 3214433d9..cf8677a78 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moAspirCrit< M > Class Template Reference - +
-
+
-
-

moAspirCrit< M > Class Template Reference

Description of the conditions in which a tabu move could be accepted. + +

moAspirCrit< M > Class Template Reference

Description of the conditions in which a tabu move could be accepted. More...

#include <moAspirCrit.h> @@ -38,10 +36,10 @@

Inheritance diagram for moAspirCrit< M >:

-eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -56,7 +54,7 @@ Description of the conditions in which a tabu move could be accepted.

-It is only a description... An object that herits from this class is needed to be used in a moTS. See moNoAspriCrit for example. +It is only a description... An object that herits from this class is needed to be used in a moTS. See moNoAspriCrit for example.

@@ -88,8 +86,8 @@ Implemented in moAspirCrit.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png index b57b8778692c145f9b6876cca861b2d4e4130e15..e6cefe1bfc95c5549aef2ed609a360dc8c7c1e9c 100644 GIT binary patch delta 1200 zcmeC>yU3~78Q|y6%O%Cdz`(%k>ERN@z`&RRWFKH*29mcwKe;$j(YT%^-P6S}q+-t7 zxw(0B3}_vlU4hRfeoA03|YvAMh;Eag#U zwf3d=R=*m-)i;Nf&J1+w~WW-o#9Ws>mM)Nd-Zv^ll0_I##?@D(a+_%Rj6t^*OC3Z!9Ck; z{I9NFxLhJ{wdUnF=E|M^-phme?#}X8Uwk}e#@VSKUL3T`U6Y&pr6Q_<&13;1?+fvj zr^7i|tM*Gh(0(QKt9ak62i&g&fBpUZIjg0pl=JTMW{wP9#whQGYeEaQvOt*iNNf=E z3SY@|{j0nGd}dw1_;7Hh=v&A6;vlc)^WS}{-NLl>^QL7Eu}F+dXSE1EycFZQB8i+|-Wf=@)A4I*=l_*J1blGha=vH?2!C&sditeqrY`uQJBD z*~rX#bm2*-SpQG@xBScf>-8crAGR;ZyV}WAcV**W#uqLP=dRe7ST*}ks=fC7)0Qbd zf@-EGKfFoLes%rGA=?bEG!N_C41FWh!!r?T5+T8_Bv1L_fE&Py?LHp5P5d< z(@d4M^Gmw7-Aq5(68-JDX2d4N`gSez7iNW4`;TAnww_Z`s%5mJd7E2NnbfCDz0Yqp z|FMjWOPUp>T|B$h|FVJ5+TeCsr{iTArscOD@I_7Pa62-icACm>o%hGX9;sy9akEHV zwuCqDi9pq5zl8^bF9=>+XRCYp$J<*5f}VTsn-|H?Qkk9Ec<}NCZ|_27;ghoEJ~{P| zUHpT66szw&V9wa>lwUI|MR(=&!-w_cQkLvwx7)i#c=BB_37eK@7Z3jrm{e<~qCRcO zu7$l%6Q3te{p{`^e2ML~n#uFszT4D!pIzAblD%q%?H{o(!EC~eR#T0>WVhs3&SaR& obz!F6s&ftDpSTvf{AcJeJHp;BBRL&d1~GWLviZ5Jb4q9e02EU_0RR91 literal 1805 zcmbtVdpML?7@x|+Ql`SDsVK{=ZRx8fLYQ)ou~WuvG1F9bYSD->j3HFS64q|`lv`y- z=`qw;V=jzow@mqJLhcRHVAdcEq1(((wfE=QXaCqg&N;vHKIgpWch38J-;;R|>!GW& zK?eqd>3Z&W#lc|93)NVtu|nN@=c8Y#hxG@&{oGV4l^Uv4!t(ONd1~~&35CMMpHw62 z=`tz~>kHdA)_V*F)2#4xb@GcZnJV>(duF@FOvd4U;cpwv;4B{kiAEh5q5_zlHRzgQZnw2q$?_}*+bYRCwgs@B!3op#)Q=keZA4)B;+QL@@H-$l?g=3?pYJTTB> z9z6ZIMQFX9;5@{3aGGXW$ypjlSL)-r+3ct@+c7_E#DF-e*ut_qzfB`hLg#!k(ZdN@hn3bPjVKRS2;k*Yg z=jwh_3Mni}3ectss%?QHi!3Hqc^d6_;?yvUDky6#61mA|I26Qd`_{y4Ft!zbCFKCl zoMta><7OWjoYC%i#qk68)aNgP%so(9z0hsU`lBXg*2J)E)`JsjQq5d>Bza+QVStbv zCu!i!=Dw|a8>x5>Om9iP5~lyRpteNQ=e5`yZG+pROO|N5Pt^*jsY*=+jzoQ7w27*n z7PIk3l9!cZZwc7o1m7sIuNOIzT82L%D9YN$lL)EW;dLdImX_sT7}Dss&^7RD z_gB&q8kGm0Dx@9UH&Iu75xdBZKT@gz+C7Kwpgi;9amo~`bD%L`Ge|cEFBnbEhYsWOntr0u^Q5XL9;$k^UCA87>INvY)%-YIX zycYGj>BuIN3e^9GinNj$)m;T~$rOGeCSO$>n^t1_)ejhh_s2Kh!i=+BuJ;@rgnM3% z+_vz5$wTnj%C);mk_ieHN$^G2E!|?bbY5#NE(I8lH0}J_R%d_jDNWPjoLX8?Obg>i zza_cBz&NGQ9-q}6kZgjyVWZuD^~ljSjoSuUgOQm>;h(ZI2K>X9HFq+QIU6cR{J{2~ zWD~${;+;=sVgVPwVmm^9ULqBXm^|mtUnr=yc)fMn05VPpoPNX3fCT1qaPU$mF^NC# zJMYjgGFlx@r`k-&XoB8tvISmt6^9y=&@qc^{VeQB7wOXD34$Y^ybh$@lMJ)Wru0It zuCwa8Tv*9Fb#M#|;x?sQ^^k6&Q$|@Mb8DUZEcJ&wL`Z1EXg}#XAGA}LT!ewRlP3&u zdtN`}RRhEja3@>oo59!^8$=Lr02di$=OM4Yx+OLp&zof}B|VJq!zT=WdFfQ+JY7O~ z6(96QaO@ovP>mPS(xiS_G(V4SytoJ^T>HMZOYVrEaXaY_jOQ$|RH?+-$Q=$vyx3{1 z - + PARADISEO-MO: Member List - +
- - +
-
+

moBestImprSelect< M > Member List

This is the complete list of members for moBestImprSelect< M >, including all inherited members.

@@ -41,8 +39,8 @@ -
best_fitmoBestImprSelect< M > [private]
best_movemoBestImprSelect< M > [private]
update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html index 29fab49e5..ebec5f9fe 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moBestImprSelect< M > Class Template Reference - +
-
+
-
-

moBestImprSelect< M > Class Template Reference

One of the possible moMoveSelect. + +

moBestImprSelect< M > Class Template Reference

One of the possible moMoveSelect. More...

#include <moBestImprSelect.h> @@ -56,7 +54,7 @@ void  Procedure which initialise the exploration.
bool 
update (const M &__move, const Fitness &__fit) - Function that indicates if the current move has not improved the fitness.
Function that indicates if the current move has not improved the fitness.
void operator() (M &__move, Fitness &__fit) throw (EmptySelection)  Procedure which saved the best move and fitness.
@@ -78,7 +76,7 @@ M moMoveSelect. +One of the possible moMoveSelect.

All neighbors are considered, and the movement which enables the best improvement is selected.

@@ -113,16 +111,16 @@ template<class M>

-Function that indicates if the current move has not improved the fitness. +Function that indicates if the current move has not improved the fitness.

-If the given fitness enables an improvment, the move (moMove) and the fitness linked to this move are saved.

+If the given fitness enables an improvment, the move (moMove) and the fitness linked to this move are saved.

Parameters:
__move a move.
__fit a fitness linked to the move.
-
Returns:
TRUE if the move does not improve the fitness.
+
Returns:
TRUE if the move does not improve the fitness.

Implements moMoveSelect< M >. @@ -170,7 +168,7 @@ Procedure which saved the best move and fitness.

Exceptions:
- +
EmptySelection if no move has improved the fitness.
EmptySelection if no move has improved the fitness.
@@ -184,8 +182,8 @@ References moBest


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html index cccd64ccd..4e67a90cf 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moCoolingSchedule Class Reference - +
-
+
-
+

moCoolingSchedule Class Reference

This class gives the description of a cooling schedule. More...

@@ -49,14 +47,14 @@


Detailed Description

This class gives the description of a cooling schedule.

-It is only a description... An object that herits from this class is needed to be used in a moSA. See moExponentialCoolingSchedule or moLinearCoolingSchedule for example. +It is only a description... An object that herits from this class is needed to be used in a moSA. See moExponentialCoolingSchedule or moLinearCoolingSchedule for example.

Definition at line 22 of file moCoolingSchedule.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html index c6db4fba0..e6a50ae97 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moExponentialCoolingSchedule Member List

This is the complete list of members for moExponentialCoolingSchedule, including all inherited members.

@@ -38,8 +36,8 @@ -
functor_category()eoUF< double &, bool > [static]
moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
thresholdmoExponentialCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html index 569a4d197..a314e6aea 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moExponentialCoolingSchedule Class Reference - +
-
+
-
-

moExponentialCoolingSchedule Class Reference

One of the possible moCoolingSchedule. + +

moExponentialCoolingSchedule Class Reference

One of the possible moCoolingSchedule. More...

#include <moExponentialCoolingSchedule.h> @@ -50,7 +48,7 @@  Simple constructor.
bool operator() (double &__temp) - Function which proceeds to the cooling.
Function which proceeds to the cooling.

Private Attributes

double threshold @@ -62,7 +60,7 @@ double  The decreasing factor of the temperature.

Detailed Description

-One of the possible moCoolingSchedule. +One of the possible moCoolingSchedule.

An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.

@@ -126,7 +124,7 @@ Definition at line

-Function which proceeds to the cooling. +Function which proceeds to the cooling.

It decreases the temperature and indicates if it is greater than the threshold.

Parameters:
@@ -134,7 +132,7 @@ It decreases the temperature and indicates if it is greater than the threshold.< __temp the current temperature.
-
Returns:
if the new temperature (current temperature * ratio) is greater than the threshold.
+
Returns:
if the new temperature (current temperature * ratio) is greater than the threshold.

Implements eoUF< double &, bool >. @@ -146,8 +144,8 @@ References moExponentialCoolingSchedule.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html index f353fb31f..28a6ba1b4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moFirstImprSelect< M > Member List

This is the complete list of members for moFirstImprSelect< M >, including all inherited members.

@@ -43,8 +41,8 @@ -
best_fitmoFirstImprSelect< M > [private]
best_movemoFirstImprSelect< M > [private]
validmoFirstImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html index 50f41412b..865ee64d7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moFirstImprSelect< M > Class Template Reference - +
-
+
-
-

moFirstImprSelect< M > Class Template Reference

One possible moMoveSelect. + +

moFirstImprSelect< M > Class Template Reference

One possible moMoveSelect. More...

#include <moFirstImprSelect.h> @@ -55,7 +53,7 @@ typedef M::EOType::Fitness  Procedure which initialise the exploration.
bool update (const M &__move, const typename M::EOType::Fitness &__fit) - Function that indicates if the current move has not improved the fitness.
Function that indicates if the current move has not improved the fitness.
void operator() (M &__move, Fitness &__fit) throw (EmptySelection)  Procedure which saved the best move and fitness.
@@ -81,7 +79,7 @@ M moMoveSelect. +One possible moMoveSelect.

The neighborhood is explored until a move enables an improvment of the current solution.

@@ -146,16 +144,16 @@ template<class M>

-Function that indicates if the current move has not improved the fitness. +Function that indicates if the current move has not improved the fitness.

-If the given fitness enables an improvment, the move (moMove) should be applied to the current solution.

+If the given fitness enables an improvment, the move (moMove) should be applied to the current solution.

Parameters:
__move a move.
__fit a fitness linked to the move.
-
Returns:
TRUE if the move does not improve the fitness.
+
Returns:
TRUE if the move does not improve the fitness.

Definition at line 52 of file moFirstImprSelect.h. @@ -201,7 +199,7 @@ Procedure which saved the best move and fitness.

Exceptions:
- +
EmptySelection if no move has improved the fitness.
EmptySelection if no move has improved the fitness.
@@ -215,8 +213,8 @@ References moFir


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html index b391ac3cd..be244c1b2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moGenSolContinue< EOT > Member List

This is the complete list of members for moGenSolContinue< EOT >, including all inherited members.

@@ -39,8 +37,8 @@ -
functor_category()eoUF< const EOT &, bool > [static]
init()moGenSolContinue< EOT > [inline, virtual]
operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html index a2692098e..988a30d93 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moGenSolContinue< EOT > Class Template Reference - +
-
+
-
+

moGenSolContinue< EOT > Class Template Reference

One possible stop criterion for a solution-based heuristic. More...

@@ -50,7 +48,7 @@  Simple constructor.
bool operator() (const EOT &__sol) - Function that activates the stop criterion.
Function that activates the stop criterion.
void init ()  Procedure which allows to initialise the generation counter.
@@ -126,7 +124,7 @@ template<class EOT>

-Function that activates the stop criterion. +Function that activates the stop criterion.

Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.

Parameters:
@@ -134,7 +132,7 @@ Increments the counter and returns TRUE if the current number of iteration is lo __sol the current solution.
-
Returns:
TRUE or FALSE according to the current generation number.
+
Returns:
TRUE or FALSE according to the current generation number.

Implements eoUF< const EOT &, bool >. @@ -175,8 +173,8 @@ References moGenS


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html index e370ecd8d..d00a7c70d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moHC< M > Member List

This is the complete list of members for moHC< M >, including all inherited members.

- + @@ -39,7 +37,7 @@ - + @@ -48,8 +46,8 @@ -
className() consteoMonOp< M::EOType > [virtual]
className() const eoMonOp< M::EOType > [virtual]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
Fitness typedefmoHC< M > [private]
full_evalmoHC< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
getType() const eoOp< EOType >
moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
move_explmoHC< M > [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.html b/trunk/paradiseo-mo/doc/html/classmo_h_c.html index 2895f70fd..39fb4f2e2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moHC< M > Class Template Reference - +
-
+
-
+

moHC< M > Class Template Reference

Hill Climbing (HC). More...

@@ -55,7 +53,7 @@  Light constructor.
bool operator() (EOT &__sol) - Function which launches the HC.
Function which launches the HC.

Private Types

typedef M::EOType EOT @@ -134,7 +132,7 @@ template<class M>

Full constructor.

-All the boxes are given in order the HC to use a moHCMoveLoopExpl.

+All the boxes are given in order the HC to use a moHCMoveLoopExpl.

Parameters:
@@ -179,7 +177,7 @@ template<class M>

Light constructor.

-This constructor allow to use another moMoveExpl (generally not a moHCMoveLoopExpl).

+This constructor allow to use another moMoveExpl (generally not a moHCMoveLoopExpl).

Parameters:
__move_init a move initialiser.
@@ -211,15 +209,15 @@ template<class M>

-Function which launches the HC. +Function which launches the HC.

-The HC has to improve a current solution. As the moSA and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.

+The HC has to improve a current solution. As the moSA and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.

Parameters:
__move_expl a complete explorer.
__sol a current solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.

Implements eoUF< M::EOType &, bool >. @@ -231,8 +229,8 @@ References moHC< M >::fu


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html index 757b28ab0..e06601116 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moHCMoveLoopExpl< M > Member List

This is the complete list of members for moHCMoveLoopExpl< M >, including all inherited members.

@@ -42,8 +40,8 @@ -
EOT typedefmoHCMoveLoopExpl< M > [private]
Fitness typedefmoHCMoveLoopExpl< M > [private]
operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline, virtual]
~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html index 419fb9eac..a05546ee2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moHCMoveLoopExpl< M > Class Template Reference - +
-
+
-
-

moHCMoveLoopExpl< M > Class Template Reference

Iterative explorer used by a moHC. + +

moHCMoveLoopExpl< M > Class Template Reference

Iterative explorer used by a moHC. More...

#include <moHCMoveLoopExpl.h> @@ -83,7 +81,7 @@ typedef M::EOType::Fitness template<class M>
class moHCMoveLoopExpl< M > -Iterative explorer used by a
moHC. +Iterative explorer used by a moHC.

@@ -193,8 +191,8 @@ References moHC


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html index c6f8bfce4..98d439ad1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moImprBestFitAspirCrit< M > Member List

This is the complete list of members for moImprBestFitAspirCrit< M >, including all inherited members.

- + - - + + + -
best_fitmoImprBestFitAspirCrit< M > [private]
first_timemoImprBestFitAspirCrit< M > [private]
Fitness typedefmoImprBestFitAspirCrit< M >
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moImprBestFitAspirCrit< M > [inline, virtual]
moImprBestFitAspirCrit()moImprBestFitAspirCrit< M > [inline]
operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline]
moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html index cc1d928d8..7fe66076f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moImprBestFitAspirCrit< M > Class Template Reference - +
-
+
-
-

moImprBestFitAspirCrit< M > Class Template Reference

One of the possible moAspirCrit. + +

moImprBestFitAspirCrit< M > Class Template Reference

One of the possible moAspirCrit. More...

#include <moImprBestFitAspirCrit.h> @@ -38,9 +36,9 @@

Inheritance diagram for moImprBestFitAspirCrit< M >:

-moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -60,7 +58,7 @@ void  - + @@ -75,7 +73,7 @@ bool  - +
 Initialisation procedure.
bool operator() (const M &__move, const Fitness &__fit)
 Function that indicates if the fit is better that the already saved fit.
 Function that indicates if the fit is better that the already saved fit.

Private Attributes

Fitness best_fit
moAspirCrit. +One of the possible moAspirCrit.

This criterion is satisfied when a given fitness is the best ever considered.

@@ -103,14 +101,14 @@ template<class M>

) [inline, virtual] [inline]

-Function that indicates if the fit is better that the already saved fit. +Function that indicates if the fit is better that the already saved fit.

The first time, the function only saved the current move and fitness.

Parameters:
@@ -119,10 +117,8 @@ The first time, the function only saved the current move and fitness.

__fit a fitnes linked to the move.

-
Returns:
TRUE the first time and if __fit > best_fit, else FALSE.
+
Returns:
TRUE the first time and if __fit > best_fit, else FALSE.
-

-Implements eoBF< const M &, const M::EOType::Fitness &, bool >.

Definition at line 52 of file moImprBestFitAspirCrit.h.

@@ -131,8 +127,8 @@ References moImprBestFitAspirCrit.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png index 9cb9fec170c3e9eeb1355d4cccde67b34ec76d9a..76e0473f0a9fceeca4263f73d5ff9205790d6b34 100644 GIT binary patch delta 869 zcmV-r1DgDu3W*0HiBL{Q4GJ0x0000DNk~Le000250002M1Oos70DvAY$&n#5e*+&$ zL_t(|ob8%jlAACL$I;6^Te^WcL8rY?pK|{r)cUY7!4RBXr(suW2OA^*EQEF-|MB!^ zjQyH^&qK_?{~a6=sXC=H`f2d`l*%Y=eNTc@q!9%i(?3EUNdr6_1rRGrVK{z zMmlypBEADlDv(pLez>P1o{zzDjQbDqRE{n9cn^Li z$5mC#sPof^R)yvmiJqy7Pn&}s{8I3+*MEn7^f${ z)M9lpodT~4$crZke*hx{oI-*Wuf)RFL8b@x1YIRHfcxNpj80I5gl0HL$t@oO*c}IR znzF|vjR67lmLM!(nQjchf#eu8fkFEQp41a8&vF5$3asRPa0Z4YVwBWu!Dvq<*wcXU z2yFgP8nB!+BhKL6h{FP25r7E~ literal 1309 zcmeAS@N?(olHy`uVBq!ia0y~yU~~hr53n!;$*%P4n}C!=fKQ0)|NsAi%>Vxn%%7hy z0muU50|yRNANv0U$Ym@E@(X5gcy=R=fq`YSr;B4q#hkZu0_QC<;5qg%b>8ed3U{U7 z#AVEX_Rl?HlG;)QEiaMXll{}#ytwNxwFLgG{T z*>Pr+SM2l}mLrp2|FQ*I&APb1>7skB!Mwl6O4`}VYk$7K6l-fx_uqE*gMC&Be}4V5 zlYY3aD&ftdG@!DBFBT_!2{ibnAyF&RV+Yp_6Mn(klU~oT%Q?2@noN%zP@b2jS&F{Lj zg|e4b_k1m@JH4W}Mq2)<+do$2lfD0vUO#MARn~g;=FiG#hOLfe`w~K~Gd$=j+~%5b zJ*i5wcST=Ert&A_^Tliban9V6v`V2a>U*1@RCcS((##3Y*LJ$C+QwsjscECiguI24 zPRq|obZR9R1B2<>n(W6b#HQ+)&0=+LJUpwP+s#q4=jt+Lb=JzG9xImTGhVVi*K?C6 zHsa8x9_1*OoYOKwTfSTrjyE>yIcB)MN4)UNmZT-6GMgnc%p_F*nLd4XY*fO&3cf}raKI~zjKZR+^PPgPI zlP>?zBwoA&Y6zinFzRrg=Z56=Hl?`zJt z-+S-gWj{iIk@zdY=6CN)zMuOO|1X>$ykj-dvOKVm|7;z5cl;Y2Ab9Z)ZFneOmZwt?eC`Z&&4> z8!f8)-CDIiq_1wQ17S~30-_kjg9=vU$rSqz%&nrFH-8Am?a=UHj zTsiky<%!2VQ_eDOk#$eDG45N^o%YbN_`(^pg~gvY?)aOr?sZYEj+w<rqSiX$?nA{#?TZ6JdV_0&;kxGHWUzpr})bO7C zzh$l|+v0AZdHx35m>F_%WtK3w$3=aa6IEH5b4$+ViQ}=5&Jy>_Sy68aWnQsebg|jj zXIQASY{$}x?5YpM(qtO@d77qGR6qJ!sN{LcxlN7xN48{Q%Bjo)GZJRq%vA7@nHe>& z*(bBoXRg~@#e_*Lmln@C!l0k1qmr!pi2Zr;C7mg$$vO)@Jy^KO(RtO$4f3B9l7q}7 zo>?@V`OCWaT*1jH?FzCIlXKV9PxAYfCe!SQ-7EKjCd6_ zFXp<@`K9ZQ2VMW9ezr7rUB8V-e{k||p<|*S@5=7h1p0UWzGW4=5#jcaaq5EXa~XfN Rt^mt222WQ%mvv4FO#m^ZbiM!p diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html index 9785ce42f..aab85bf70 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
-
+

moItRandNextMove< M > Member List

This is the complete list of members for moItRandNextMove< M >, including all inherited members.

- + - + + - + -
EOT typedefmoItRandNextMove< M > [private]
functor_category()eoBF< M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
max_itermoItRandNextMove< M > [private]
moItRandNextMove(moRandMove< M > &__rand_move, unsigned int __max_iter)moItRandNextMove< M > [inline]
num_itermoItRandNextMove< M > [private]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline, virtual]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
moNextMove::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
rand_movemoItRandNextMove< M > [private]
~eoBF()eoBF< M &, const M::EOType &, bool > [virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html index 405f98630..e8fc731b8 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moItRandNextMove< M > Class Template Reference - +
-
+
-
-

moItRandNextMove< M > Class Template Reference

One of the possible moNextMove. + +

moItRandNextMove< M > Class Template Reference

One of the possible moNextMove. More...

#include <moItRandNextMove.h> @@ -38,9 +36,9 @@

Inheritance diagram for moItRandNextMove< M >:

-moNextMove< M > -eoBF< M &, const M::EOType &, bool > -eoFunctorBase +moNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -74,9 +72,9 @@ unsigned int  - +
template<class M>
class moItRandNextMove< M > -One of the possible
moNextMove. +One of the possible moNextMove.

-This class is a move (moMove) generator with a bound for the maximum number of iterations. +This class is a move (moMove) generator with a bound for the maximum number of iterations.

@@ -145,7 +143,7 @@ template<class M>

) [inline, virtual] [inline]
@@ -161,10 +159,8 @@ If the maximum number is not already reached, the current move is forgotten and __sol the current solution. -
Returns:
FALSE if the maximum number of iteration is reached, else TRUE.
+
Returns:
FALSE if the maximum number of iteration is reached, else TRUE.
-

-Implements eoBF< M &, const M::EOType &, bool >.

Definition at line 52 of file moItRandNextMove.h.

@@ -173,8 +169,8 @@ References moItR


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png index 52d789f145d7d145d603b66de936fa5f1454de94..3ec8c97619d16e8806ce6a43826759ca7495f7da 100644 GIT binary patch delta 811 zcmV+`1JwM92+sx~iBL{Q4GJ0x0000DNk~Le0001+0002M1Oos70O1A$8D7I?62ss`TeW1O7nG9}MqmmQ@ZHy=Bb*&Wm> zNi?$>J3ySz>?_T2j+?|So*3ua+oayt;NE}V829%6eq-FtGwV3VInHs8bDZNogIoN$ zc<*oHZ;sMTp5O+t%b5kR6_Sl;kZS(u*Cq-^tXCH z29flwm7Z{$5rhpaE?t>t6`e*ZxWH}%NWUOBetnWk>clABz^|tovKk*Sz(uxX*TlOZ zZbdmo?aHm7&sD*ee=#amY{7}T+DPmUtDwIjUf{&3f>YiJx5>bal{_KnT~%YB)Bg!d zykn@tKI1B<;xw%-j$MHU_rN=YV<$t@(L^1z7=+ElPL6ZzBxNPDn$i5;NoF})C8eo* pWH#e2-n-YE;~Y1MTRSoS0f_7$W0x)+lK=n!07*qoM6N<$0fMbWhs^*0 delta 998 zcmV0002M1Oos704^vvNRc5ke*>RM zL_t(|obB6LlA|yT08sm9zAfEAoM39^Lj9HdA7QW-F9Fh!I76q9tC!$5JY*~B1Qp@$ zY3+CTGo97kcKcxifM$zIFa8I+H>mW|a_Bgl=6L7mkR>F-+yj`q5wpz$c+7A+gR@{Z zlJw-W0ghWXY5xoywt-`}(-0eVf4%44=`Hqr_%`m|mO0NeKwT~lvQc8%wmBE@K+Zk4 z-lPxl&VJW=H+fFT#N0!Y=e*to^sYP~-`sZF?RVQ}zDItkeZ98(r`o@6*R*f9uS?oj z&2zWicH3>Y-FDk;x7~JotbOKZ|Epeaar;a=mm8>5x=6n#TD>5S%{R&AfAf49{r>7X zG{ft0SM09jkV)Qiy$peJU_LRD4w@D<12S~m=F|Sx)={}K#^r*}CgW@Ith1p}TDufK z%*p!^<*%vExs8&l2+#MtDO-28)={Q9=P=b0iygAFK}$?>%4TDe0JUIK>`B(Uv#n~R zM`(A%8jsijZQNi>r2**ye;S*#Hc1kHA2$!MYMq_=oz1w$J#}*qy{&83*risrViT1* zT2rIlj(c^zwY*5S;AK=@Z=2b|s9n|@ZNWF!+cFT^EHrxpEDt14`E0;!;zW_>w?$v` z9PA{v^8EXDq`JMRg>Mz>cG?H3`iobX&GR1rdXBqi>8JcJar+APf0^%*&-`rgskYb0 zu4P{}&)s(0ZMWTa+ikbqcH8Z-_L-mkuX?@3?VoHnSBUM}{e4^S9bsc*TYai;>%A}7 zTovKUnA}XmH3CsUZ=*7Ayp150j(QUjS#7M8P{g#V)vkM~cG(j)Cf8q%IH!lmpDqLP!~l z5Moy6?kJn{1|(7V$;!XR*pQh#s}gt00Z0B3b(6nR&|!gpiOIck4$s9MgW0m)sWWq! zVQEXaWb~K9v=C7``yiLx7~iXed2rMe|iu4 Un9C2u;Q#;t07*qoM6N<$g3>b!{r~^~ diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html index b89d24dc8..d419c7b0e 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moLSCheckPoint< M > Member List

This is the complete list of members for moLSCheckPoint< M >, including all inherited members.

- + - - + + -
add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline]
funcmoLSCheckPoint< M > [private]
functor_category()eoBF< const M &, const M::EOType &, void > [static]
functor_category()eoBF< A1, A2, R > [static]
operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline]
eoBF< const M &, const M::EOType &, void >::operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, void > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType &, void > [virtual]
eoBF::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html index da86208bd..ccf44c40b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moLSCheckPoint< M > Class Template Reference - +
-
+ -

moLSCheckPoint< M > Class Template Reference

Class which allows a checkpointing system. + +

moLSCheckPoint< M > Class Template Reference

Class which allows a checkpointing system. More...

#include <moLSCheckPoint.h> @@ -38,15 +36,15 @@

Inheritance diagram for moLSCheckPoint< M >:

-eoBF< const M &, const M::EOType &, void > -eoFunctorBase +eoBF< A1, A2, R > +eoFunctorBase List of all members. - + @@ -97,7 +95,7 @@ template<class M>

-Function which launches the checkpointing. +Function which launches the checkpointing.

Each saved function is used on the current move and the current solution.

Parameters:
@@ -148,8 +146,8 @@ References moLSChe


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html index bfa4d63e9..c6a70b0dd 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: Member List - +

Public Member Functions

void operator() (const M &__move, const typename M::EOType &__sol)
 Function which launches the checkpointing.
 Function which launches the checkpointing.
void add (eoBF< const M &, const typename M::EOType &, void > &__f)
 Procedure which add a new function to the function vector.
- - + +

moLinearCoolingSchedule Member List

This is the complete list of members for moLinearCoolingSchedule, including all inherited members.

@@ -38,8 +36,8 @@ -
functor_category()eoUF< double &, bool > [static]
moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
thresholdmoLinearCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html index c41c6627a..2f5915970 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moLinearCoolingSchedule Class Reference - +
-
+ -

moLinearCoolingSchedule Class Reference

One of the possible moCoolingSchedule. + +

moLinearCoolingSchedule Class Reference

One of the possible moCoolingSchedule. More...

#include <moLinearCoolingSchedule.h> @@ -50,7 +48,7 @@  Simple constructor.
bool operator() (double &__temp) - Function which proceeds to the cooling.
Function which proceeds to the cooling.

Private Attributes

double threshold @@ -62,7 +60,7 @@ double  The quantity that allows the temperature to decrease.

Detailed Description

-One of the possible moCoolingSchedule. +One of the possible moCoolingSchedule.

An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold.

@@ -126,7 +124,7 @@ Definition at line

-Function which proceeds to the cooling. +Function which proceeds to the cooling.

It decreases the temperature and indicates if it is greater than the threshold.

Parameters:
@@ -134,7 +132,7 @@ It decreases the temperature and indicates if it is greater than the threshold.< __temp the current temperature.
-
Returns:
if the new temperature (current temperature - quantity) is greater than the threshold.
+
Returns:
if the new temperature (current temperature - quantity) is greater than the threshold.

Implements eoUF< double &, bool >. @@ -146,8 +144,8 @@ References


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png index 51f1257538ad7247802e98643b97b19b6d5b4174..064f41e2d16b8d23de04d328a4d7ff42ba40ff7c 100644 GIT binary patch delta 30 kcmcc3cAITN6jMgy#+dg^0&kgG*D?Tsr>mdKI;Vst0J6#oxc~qF delta 30 kcmcc3cAITN6jQ~VjWO?;1S)iX|7QRKPgg&ebxsLQ0K8BOVE_OC diff --git a/trunk/paradiseo-mo/doc/html/classmo_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_move-members.html index 6868024c0..294d608d3 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moMove< EOT > Member List

This is the complete list of members for moMove< EOT >, including all inherited members.

-
EOType typedefmoMove< EOT >
functor_category()eoUF< EOT &, void > [static]
operator()(EOT &)=0eoUF< EOT &, void > [pure virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< EOT &, void > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move.html b/trunk/paradiseo-mo/doc/html/classmo_move.html index e3132852a..9ee3d7e95 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMove< EOT > Class Template Reference - +
-
+ +

moMove< EOT > Class Template Reference

Definition of a move. More...

@@ -61,8 +59,8 @@ A move transforms a solution to another close solution. It describes how a solut

Definition at line 23 of file moMove.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html index 52e99e5c9..972d56e16 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveExpl< M > Class Template Reference - +
-
+ -

moMoveExpl< M > Class Template Reference

Description of a move (moMove) explorer. + +

moMoveExpl< M > Class Template Reference

Description of a move (moMove) explorer. More...

#include <moMoveExpl.h> @@ -51,16 +49,16 @@

template<class M>
class moMoveExpl< M >

-Description of a move (moMove) explorer. +Description of a move (moMove) explorer.

-Only a description...See moMoveLoopExpl. +Only a description...See moMoveLoopExpl.

Definition at line 21 of file moMoveExpl.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html index aa5bb415e..ce9f9d97c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveIncrEval< M > Class Template Reference - +
-
+ -

moMoveIncrEval< M > Class Template Reference

(generally) Efficient evaluation function based a move and a solution. + +

moMoveIncrEval< M > Class Template Reference

(generally) Efficient evaluation function based a move and a solution. More...

#include <moMoveIncrEval.h> @@ -38,8 +36,8 @@

Inheritance diagram for moMoveIncrEval< M >:

-eoBF< const M &, const M::EOType &, M::EOType::Fitness > -eoFunctorBase +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -56,8 +54,8 @@ From a move and a solution, it computes a new fitness that could be associated t

Definition at line 24 of file moMoveIncrEval.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init.html b/trunk/paradiseo-mo/doc/html/classmo_move_init.html index 44e3ab86e..afc8c57c6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: moMoveInit< M > Class Template Reference - +
- - + -

moMoveInit< M > Class Template Reference

Move (moMove) initializer. + +

moMoveInit< M > Class Template Reference

Move (moMove) initializer. More...

#include <moMoveInit.h> @@ -38,8 +36,8 @@

Inheritance diagram for moMoveInit< M >:

-eoBF< M &, const M::EOType &, void > -eoFunctorBase +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -48,7 +46,7 @@

template<class M>
class moMoveInit< M >

-Move (moMove) initializer. +Move (moMove) initializer.

Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used.

@@ -56,8 +54,8 @@ Class which allows to initiase a move. Only a description... An object that heri

Definition at line 22 of file moMoveInit.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html index b34fc465e..3eab7f463 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: moMoveLoopExpl< M > Class Template Reference - +
- - + +

moMoveLoopExpl< M > Class Template Reference

Class which describes an iterative explorer. More...

@@ -53,14 +51,14 @@ Class which describes an iterative explorer.

-Only a description... moHCMoveLoopExpl and moTSMoveLoopExpl are exemples of class that are a moMoveLoopExpl. +Only a description... moHCMoveLoopExpl and moTSMoveLoopExpl are exemples of class that are a moMoveLoopExpl.

Definition at line 21 of file moMoveLoopExpl.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html index b9d1575d1..eb53d21d9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moMoveSelect< M > Member List

This is the complete list of members for moMoveSelect< M >, including all inherited members.

@@ -38,8 +36,8 @@ -
Fitness typedefmoMoveSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.html b/trunk/paradiseo-mo/doc/html/classmo_move_select.html index e0655e805..71e7471a2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveSelect< M > Class Template Reference - +
-
+ -

moMoveSelect< M > Class Template Reference

Class that describes a move selector (moMove). + +

moMoveSelect< M > Class Template Reference

Class that describes a move selector (moMove). More...

#include <moMoveSelect.h> @@ -57,15 +55,15 @@ typedef M::EOType::Fitness  Procedure which initialises all that the move selector needs including the initial fitness.
virtual bool update (const M &__move, const Fitness &__fit)=0 - Function which updates the best solutions.
Function which updates the best solutions.


Detailed Description

template<class M>
class moMoveSelect< M >

-Class that describes a move selector (moMove). +Class that describes a move selector (moMove).

-It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. +It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.

@@ -130,7 +128,7 @@ template<class M>

-Function which updates the best solutions. +Function which updates the best solutions.

Parameters:
@@ -138,7 +136,7 @@ Function which updates the best solutions.
__fit a fitness linked to the new move.
-
Returns:
a boolean that expresses the need to resume the exploration.
+
Returns:
a boolean that expresses the need to resume the exploration.

Implemented in moBestImprSelect< M >, and moRandImprSelect< M >. @@ -146,8 +144,8 @@ Implemented in moMoveSelect.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_next_move.html index ebc97c77a..6047c0fba 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moNextMove< M > Class Template Reference - +
-
+
-

moNextMove< M > Class Template Reference

Class which allows to generate a new move (moMove). + +

moNextMove< M > Class Template Reference

Class which allows to generate a new move (moMove). More...

#include <moNextMove.h> @@ -38,9 +36,9 @@

Inheritance diagram for moNextMove< M >:

-eoBF< M &, const M::EOType &, bool > -eoFunctorBase -moItRandNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase +moItRandNextMove< M > List of all members. @@ -49,16 +47,16 @@

template<class M>
class moNextMove< M >

-Class which allows to generate a new move (moMove). +Class which allows to generate a new move (moMove).

-Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used. +Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used.

Definition at line 22 of file moNextMove.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.png b/trunk/paradiseo-mo/doc/html/classmo_next_move.png index f0527341dc80bb1e925f3d8355dfe85aabed29c4..2021f9a10664d8ed2e2c547b78a47ca74ffa189d 100644 GIT binary patch delta 825 zcmV-91IGNC2;BxDiBL{Q4GJ0x0000DNk~Le0001+0002M1Oos70O1A~N^zXy262-wjAP|(Q15GSk3ToYy*(Z`#@#%!j&q#j9OpR4Iqn(U z9e?vqyaRgU} z{RM|H$<#n?$d=*O3Dvp8iSMFn_BaKo?;2i%%L>Li)#J$o+%#JBj<>Te+0KeyG+t`v zPgHtt-J$Q^!Cm-HBMV?>TnY{gu6+D%WG_q8_G}Js9A^o=Ss%s?702BOH~GRi`Lg{b zIG;y(fj5=rILA58agKAGf8*|egPA2PVP+>BHyan0Dh_Mjt)0fP^aKYM7r4I19ZGk& zK(^4yLt@|xNW(S1XoHX7a@#aA$_MLG1dC!sD%f-DR)Zm9!U2wrD!3i*1V`Nl z5FEQ8uq^jINEb!g@h)(+Zg8Xw4Q|Z3HArv7mx5at<2&94e7DHoe}YCfz*<9^t6O9h zw=4hRkIZrZ18(w#aje|?ro!h@Uf@loInHs8bDZNG=eRrI#-6AB9)0X~?`MqP6^D|M zV(Z%z_t>mUF*;V-;p`K8O8zjoeAH)Xv{J?)FMNRf4kd4gvw4u#qEHoSafUQR&#@pf2k<>OA)tq7m5*SSz94E&0MLz+gjE9paUEmRdB-VaEUu+T1mc; ze5&~}k(Y5m@pr`9?H*S-6(?bBabyZKxD)FPj*O%LCd%ZZ$af7($7oQwm820002M1Oos704^vvNRc5ke*>^d zL_t(|obB9eZlf>|0ATpDznQtgaDr<0LXlSL{g1HB%Z~sl6tgs9tW*gW@L_wJrcCVa z&t>JK`#oM&!Vddo0f1tQQZ4=myEZ7*(tOu;HcjoFT8APb5poS6S0l15JIFrGZ3ZX7 zZ6vMXs{v`ZZqoK1*lmNf-7iCJf3)$QYR6OT>GWm0Yg_xAdw{A~Y-FRhY2B7sz#TF7 zz40b{iBI-f<6Xo#p%7CIX`IV=6VO?4-oAt#cGzdzSAIr5R366;e^>k0=RNJu&&Mt8 zyT*CgVTT=d*kOkqcGzKu-PXSHfB(DQZwdQKo6`-HGF@apBQ4$#$Kr?dfA%@wMt{D0 z4#n>IybE@fa$r)9Tuwuvo>(r7w1UQ2&VU?Ux8<_Gv~4fWj7hqnvdQ_JJgaOdl+sSg z4|n)DB7Tgy&wVe=ib#J?o4WO6TOMW1eGX$zvG^$~8!W}7m+Uqc0gw|m$sTpQE8DY1 zc82mm%UetuLK%f_kAUfg#;IHlxJ?o$`upvz z&v6cZ5o>Y&b=i~Mp5?;Vl64#H9a;U^JIv~Jw|_s!&As$f{+5J&e+T=@&&XH)Z}6^m zSm4x3#%$ zZ^HN4Q_K0SQ0%@pf0V}otf!^6+lcSB2j4F3&WAbK?c3dPpiQ0HYv1cYbM&Y2wiC7; zZ;taW#d$yE0G}Qy&WBAW++m+p!VWv^v+XNCBOfY{CLQp0cI3zIW#2WF_pq6xy+7Pf2{qMUCkLm!ov26Ty(!!z zFWXIN=2BWeu`p$#(%jbOy8Q~@XruOTCiHT|CfkjB1HgLPr+2-=H`{ssmf5 - + PARADISEO-MO: Member List - +
- - + +

moNoAspirCrit< M > Member List

This is the complete list of members for moNoAspirCrit< M >, including all inherited members.

- + - - + + -
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moNoAspirCrit< M > [inline, private, virtual]
operator()(const M &__move, const typename M::EOType::Fitness &__sol)moNoAspirCrit< M > [inline, private]
moAspirCrit::operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html index 739e3654c..5d686f037 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moNoAspirCrit< M > Class Template Reference - +
-
+ -

moNoAspirCrit< M > Class Template Reference

One of the possible aspiration criterion (moAspirCrit). + +

moNoAspirCrit< M > Class Template Reference

One of the possible aspiration criterion (moAspirCrit). More...

#include <moNoAspirCrit.h> @@ -38,25 +36,25 @@

Inheritance diagram for moNoAspirCrit< M >:

-moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. - + - +

Private Member Functions

bool operator() (const M &__move, const typename M::EOType::Fitness &__sol)
 Function which describes the aspiration criterion behaviour.
 Function which describes the aspiration criterion behaviour.
void init ()
 Procedure which initialises all that needs a moNoAspirCrit.
 Procedure which initialises all that needs a moNoAspirCrit.

Detailed Description

template<class M>
class moNoAspirCrit< M >

-One of the possible aspiration criterion (moAspirCrit). +One of the possible aspiration criterion (moAspirCrit).

The simplest : never satisfied.

@@ -91,7 +89,7 @@ template<class M>

-Function which describes the aspiration criterion behaviour. +Function which describes the aspiration criterion behaviour.

Does nothing.

Parameters:
@@ -100,7 +98,7 @@ Does nothing.

__sol a fitness.

-
Returns:
FALSE.
+
Returns:
FALSE.

Definition at line 32 of file moNoAspirCrit.h. @@ -124,7 +122,7 @@ template<class M>

-Procedure which initialises all that needs a moNoAspirCrit. +Procedure which initialises all that needs a moNoAspirCrit.

Nothing...

@@ -135,8 +133,8 @@ Definition at line 4


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png index 2faca5ab90b299f2807d78674afb81f03d1364ab..c0687eec9a39458d4c9a5ffbc317b7755ec034d0 100644 GIT binary patch delta 745 zcmV3vPf<&}lEUPr3gQDnRJNk{r)^y6b5nJCTj?&j@KV`G@WI zP5Zh1+V7bY)&u}(&Zv0tGNF&8;-w*SAW(XCdJ;-J5+Qp4*^S5q36Pitfp1H3MnF;z zGeL6DQ|hvr5kT@Vm=ZA8A$j)`e?kgsbLa^=3(khRN*{9A&k0f^>?^vg1LZ?J5YFq+ ztOcP2CJ*UaNF501d@Vj@PWZP7_do65*~i<6zfSn^`hLRe_3`b5C#;1NoZti}IKc^G zt~Vb^VEIFhuEf1cM;0ad%85#%UIGy{Vno$q2^$EaUuJ~8A?zoFBB_i3e>w>)vHE;$ z2{0o-mV&TP2~^8f9%BT6Hit}?nqqTTmyg9+4tqBX$jR0jw>s0jT@JH4yd!jVu(bea z#AqR)5%T5fYMxrFPsiUNE)cq##@|66_n-A&6I^e85yADQ6P(}#Cpf_gjk(@@Frj>X zmoN1MD)O-UPI_t@(+5~vf71w9#LbaF{21<@F(Jhv>lsp98VKGK5NZbxx%tLzIn`F$ z=~VGWnk3;!XnTNIx`axQI>6o#Dq zyqTjDCWIh=>aMQz22l=U^@Rl?<}0BFXi#XmDQttD5EvhT$H1cyQd|T+S6mtbtO*gA z5rq)#6;fDw3sDJCW&xU^P(!SQEh-_8`K7LqYawvh8iFDYgrEf8t09gA$d!ySl=(~v zAur1+2P4dK;HhUqKdFPRg%Y$5nR=`Puf?`CqpgMR2R^X1u)N0oaI{O?_3?yD<^&_$ b{ERN@z`*DRWFKH*29jOr*Eda6G_Gf<@pN$vshIP2 zj^nJ^20X2amrXD6KDoDGZ$NnQe`S&ANro*cK^4M}`r^`r9!dOmpXS+dfBM7kzq5Z# zy%%fWEVwA)2*)7}mpe93qpJ43)ZuyjOY?frzO~g3>XOfYaEiLk%=g)uqIcqGki_S( zmBo_DjNWg0rkK0FSDF4R*iJOCo<}*bdv(vW{+(ZqTJS|Q=Xv$8P=UbmC8^+tLk6)Z{L_@-m%dO{E!k%A;zHssu z{5@dK8P4A$U%yW6M~tk&zaKw#NIeYxdf>*l@Wo4i`iERw=UqJe)Xs*dW$%v`TrR6TJ>%QAxH5(8 ztozjp*MuuezkbhI{i*Fp_fz9zyXM?Cib{+-_I%TX`okKj3*&QbE0fQjXxnK~|4REv zSb$W#;jHY2`ijFlZYZr;H7jn*gtLN%`%nDT*G7@Y=0xf6jgW zA(yvzzMqWyw!AGcZSFUP|%( z+}Zs`_pdvOK?tIj-UH`b}Xw1avZ;Tg zZPl7{6#}1h9g2x5npsaMdRrF S0zY8M#Ng@b=d#Wzp$PzV15|7P diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html index ea99fd2c7..f226a658d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moRandImprSelect< M > Member List

This is the complete list of members for moRandImprSelect< M >, including all inherited members.

@@ -41,8 +39,8 @@ -
Fitness typedefmoRandImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
vect_better_movesmoRandImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html index 3634e3a8b..84b95d819 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moRandImprSelect< M > Class Template Reference - +
-
+ -

moRandImprSelect< M > Class Template Reference

One of the possible moMove selector (moMoveSelect). + +

moRandImprSelect< M > Class Template Reference

One of the possible moMove selector (moMoveSelect). More...

#include <moRandImprSelect.h> @@ -52,10 +50,10 @@ typedef M::EOType::Fitness 

Public Member Functions

void init (const Fitness &__fit) - Procedure which all that needs a moRandImprSelect.
+ Procedure which all that needs a moRandImprSelect.
bool update (const M &__move, const Fitness &__fit) - Function that updates the fitness and move vectors.
Function that updates the fitness and move vectors.
void operator() (M &__move, Fitness &__fit) throw (EmptySelection)  The move selection.
@@ -77,7 +75,7 @@ std::vector< M > template<class M>
class moRandImprSelect< M > -One of the possible
moMove selector (moMoveSelect). +One of the possible moMove selector (moMoveSelect).

All the neighbors are considered. One of them that enables an improvment of the objective function is choosen.

@@ -103,7 +101,7 @@ template<class M>

-Procedure which all that needs a moRandImprSelect. +Procedure which all that needs a moRandImprSelect.

Give a value to the initialise fitness. Clean the move and fitness vectors.

Parameters:
@@ -148,7 +146,7 @@ template<class M>

-Function that updates the fitness and move vectors. +Function that updates the fitness and move vectors.

if a move give a better fitness than the initial fitness, it is saved and the fitness too.

Parameters:
@@ -157,7 +155,7 @@ if a move give a better fitness than the initial fitness, it is saved and the fi __fit a new fitness associated to the new move.
-
Returns:
TRUE.
+
Returns:
TRUE.

Implements moMoveSelect< M >. @@ -206,7 +204,7 @@ One the saved move is randomly chosen.

Exceptions:
- +
EmptySelection If no move which improves the current fitness are found.
EmptySelection If no move which improves the current fitness are found.
@@ -220,8 +218,8 @@ References


The documentation for this class was generated from the following file:
-
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html index 570c69120..1514fe282 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
+

moRandMove< M > Member List

This is the complete list of members for moRandMove< M >, including all inherited members.

-
functor_category()eoUF< M &, void > [static]
operator()(M &)=0eoUF< M &, void > [pure virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< M &, void > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html index 77f653f76..a5aa60996 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moRandMove< M > Class Template Reference - +
-
+ +

moRandMove< M > Class Template Reference

Random move generator. More...

@@ -50,14 +48,14 @@ Random move generator.

-Only a description... An object that herits from this class needs to be designed in order to use a moSA. +Only a description... An object that herits from this class needs to be designed in order to use a moSA.

Definition at line 21 of file moRandMove.h.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html index ed9741041..86b073745 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moSA< M > Member List

This is the complete list of members for moSA< M >, including all inherited members.

- + @@ -41,7 +39,7 @@ - + @@ -51,8 +49,8 @@ -
className() consteoMonOp< M::EOType > [virtual]
className() const eoMonOp< M::EOType > [virtual]
contmoSA< M > [private]
cool_schedmoSA< M > [private]
eoMonOp()eoMonOp< M::EOType >
Fitness typedefmoSA< M > [private]
full_evalmoSA< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
getType() const eoOp< EOType >
incr_evalmoSA< M > [private]
init_tempmoSA< M > [private]
moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline]
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.html b/trunk/paradiseo-mo/doc/html/classmo_s_a.html index 6897cae6d..460213b27 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSA< M > Class Template Reference - +
-
+ +

moSA< M > Class Template Reference

Simulated Annealing (SA). More...

@@ -191,13 +189,13 @@ template<class M>

function that launches the SA algorithm.

-As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.

+As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.

Parameters:
__sol a solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.

Implements eoUF< M::EOType &, bool >. @@ -209,8 +207,8 @@ References moSA< M >::co


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html index 5774a71a2..fc67c8f32 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moSimpleMoveTabuList< M > Member List

This is the complete list of members for moSimpleMoveTabuList< M >, including all inherited members.

- + - + + - + -
add(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
currentSizemoSimpleMoveTabuList< M > [private]
EOT typedefmoSimpleMoveTabuList< M >
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moSimpleMoveTabuList< M > [inline, virtual]
maxSizemoSimpleMoveTabuList< M > [private]
moSimpleMoveTabuList(unsigned int __size)moSimpleMoveTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline]
moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
removeMove(const M &__move)moSimpleMoveTabuList< M > [inline, private]
tabuListmoSimpleMoveTabuList< M > [private]
update()moSimpleMoveTabuList< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html index 6e25ce2ed..5e9ecbf5b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSimpleMoveTabuList< M > Class Template Reference - +
-
+ +

moSimpleMoveTabuList< M > Class Template Reference

Class describing a move tabu list with a limited memory. More...

@@ -38,9 +36,9 @@

Inheritance diagram for moSimpleMoveTabuList< M >:

-moTabuList< M > -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -56,7 +54,7 @@ typedef M::EOType  - + @@ -114,25 +112,23 @@ template<class M> - +
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
 Function that indicates if, in a given state, the _move is tabu or not.
void add (const M &__move, const EOT &__sol)
 Procedure to add a move in the tabu list.
) [inline, virtual] [inline]

-Function that indicates if, in a given state, the _move is tabu or not. +Function that indicates if, in a given state, the _move is tabu or not.

Parameters:
- +
__move A given moMove.
__move A given moMove.
__sol A solution.
-
Returns:
true or false.
+
Returns:
true or false.
-

-Implements eoBF< const M &, const M::EOType &, bool >.

Definition at line 46 of file moSimpleMoveTabuList.h.

@@ -262,7 +258,7 @@ Procedure that removes a given move from the tabu list (if it is into, else do n

Parameters:
- +
__move A given moMove.
__move A given moMove.
@@ -276,8 +272,8 @@ Referenced by moSimpleMoveTabuList.h -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png index b291321faaf17e8c6100bc5ee1e17a61b49db06a..f4a038c830dd1c5fe5f526f2783efbb9ecb4da6e 100644 GIT binary patch delta 847 zcmV-V1F-zq3iAdbiBL{Q4GJ0x0000DNk~Le000290002M1Oos70KJS)uaO}$e*+0g zL_t(|ob8%Xa^oNjhT)~ph#QC#bapSaPrd&U7D<4GjT766(>NnKH37qC@uPN}e{g@# zD&Ou;I;j}?eb5LHRWr8UC!qUgY`t+gb~8Fhi@<2iKM|-WcThJnnm+NEy=dm8SkXWq zQ7%ZmwHa6Azl#RYPZ4y{ntBhRfAee=^$g8|0147>^Tw#tZ8Tr;#&&Mgx-0_fH=yyT?{JS9f>*wc!=!<5Ep$%vTU-P?+p*Nz*`GLvL!=#+Kn3@lAz#vMocYmUCRm6;oZP;csf3ia}KsN|t z34JfR+DsLVbS)-U8_^nq#(^s9Xwf>BSxa<*6|D#C0Xh#>QI|PvWZ^WTf6S0Qj5=vS zWKLA7cK%-J-4^vw>pSR;T9*s~(C%PGV@227yE5cv={UDN?7e7BTMPFfdPgzzhoDb< zSvc_(=S|S&^Sumx(F`%Pf1wR+XhR#?(1v~{`ovfFYkrq8^bRzLvou*ONi~Zdau8i8 zs2j?H8oM{Q(a8Rg7+G{=3u8NECI_}2K*w_SOKeDt`urNz;zva`7Sqa6uoZMYm?k!4 ze>9E{3nqnLVc$n1bm%1d$Rn$9He}yN$3ALVMC{N zTjiog_`LIO>dKW@O<#ToXy0M@V+Q$dT|r&j=!yA^6-wH*#tUnsbyZ z8cr=5>?LX+JglPwe|VWoL&0Zw#s{7p^L zXCiB@VWG7QS!hk$3{C5rA@kIbDv$zs>+`=i7NllKK@ak}CCl)K%SWM~Q4IY`^m#7} Z{{cWKn%z$e7@|Ns9$=Kuc(=Fd-< z0AzvjfddDs5B+}vR<;VfU8 z*%kkr|ApL4>~~G_6}r7i|Fh`wNhc0*^hNasmEAtQpLye-&3uRN2QNE3<>kjcJsk() za@IB~7SA!+cCF&}*IuK-?h|GI4ld&}Y`dbQXxcs@Wli(f%Kbh@H2`vPkCuLgXi~C&P_4RaVFBCoQOxaptoW z{x)Z&yp_e8Wdh&kbed-FvJ4jQ<5;(2*O50Bj59TUH}8>pW7Mi8oV5G=mLFTLs$5;Q zeb&5(ja*eW-{0LmGjD3;lf|s&+xOk;ta(r${3q>~^5K7rml&s3@u(fHt89w-{OEOm zjcX;R^VCW0lO$J7v6*rvfYT;*7g=$H9;;Pn4c?e{OxSqOZMM<(nMStrrmXz>Drf=6 z>$uNR3-|n$oN1MRU~a5h3D-yQ(-FKuMXZ|Bx7?nd@BQ_6vr*8#hgECBpXW2(zIJN% zQa9=P@U*I^Wwl4QPy6>V`{dRsw@%&WzqLmxc=f}#Mv<{4tzDm*&Gb(k2~Nq;W}kW9 zb=lLNJ5PKx^Xrw;zg-ns6DNDx{B88dy;pC^Kk?teyuV%Za`LG!GmLE0Vt?NS`c(qr z^QBLyoMb09M*J~-Uc#Dpssw0Ro#tlMUD?+A{xv$sMsZh9jxVZ@Pmg@?Lp=3PVp8=E z-?x12RX=W5g-hnM?@@bv>9XIcnU(LiiS0M-)Hj;+EobsE&+3(%PfskocXFyxT+BS( zuOi!D<~ZG3_Bm3|_HEINOKzt&n{CQfoj;}cwB@w^Q%@LkPyD%|TRSuL{^!(``OHD7 zbsK)J^)b{mdU@>askm7hs_VC#xJ#youkCq!_tWCD?^Eu09(&@T_VsJGwd=8MMH6-^ z87W-u@jKaMscddJd3VeN<4jMF(=&I?I(J$lzh;+S^rh~K-9DwJqBG?yzVQ9&R-B)H s>I?h-|9=<%;Q^Ko2}W - + PARADISEO-MO: Member List - +
-
+
+

moSimpleSolutionTabuList< M > Member List

This is the complete list of members for moSimpleSolutionTabuList< M >, including all inherited members.

- + - + + - + -
add(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
currentSizemoSimpleSolutionTabuList< M > [private]
EOT typedefmoSimpleSolutionTabuList< M >
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moSimpleSolutionTabuList< M > [inline, virtual]
maxSizemoSimpleSolutionTabuList< M > [private]
moSimpleSolutionTabuList(unsigned int __size)moSimpleSolutionTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline]
moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
removeSolution(const EOT &__sol)moSimpleSolutionTabuList< M > [inline, private]
tabuListmoSimpleSolutionTabuList< M > [private]
update()moSimpleSolutionTabuList< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html index 638880fab..e56e24ed5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSimpleSolutionTabuList< M > Class Template Reference - +
-
+ +

moSimpleSolutionTabuList< M > Class Template Reference

Class describing a solution tabu list with limited length. More...

@@ -38,9 +36,9 @@

Inheritance diagram for moSimpleSolutionTabuList< M >:

-moTabuList< M > -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -55,7 +53,7 @@ typedef M::EOType  - + @@ -147,25 +145,23 @@ template<class M> - +
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
 Function that indicates if, in a given state, the _move is tabu or not.
void add (const M &__move, const EOT &__sol)
 Procedure to add a move in the tabu list.
) [inline, virtual] [inline]

-Function that indicates if, in a given state, the _move is tabu or not. +Function that indicates if, in a given state, the _move is tabu or not.

Parameters:
- +
__move A given moMove.
__move A given moMove.
__sol A solution.
-
Returns:
true or false.
+
Returns:
true or false.
-

-Implements eoBF< const M &, const M::EOType &, bool >.

Definition at line 45 of file moSimpleSolutionTabuList.h.

@@ -309,8 +305,8 @@ Referenced by moSimpleSolutionTabuList.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png index df07eba57fabdbeea50b82bb1a8169547b89e02e..38d26e3298b696b097277f482c5495ad0df8f9bf 100644 GIT binary patch delta 870 zcmV-s1DX8b3W^6IiBL{Q4GJ0x0000DNk~Le0002M0002M1Oos70HE@5G?5`Qe*+*% zL_t(|ob8%h)}tT{faPVL2|I|hgP9HePu>3#26EwI)mAN2^@InN81oSldoX4A+qn&Y z#;)zR0WJXmfU1XC8a@SR4Plnzv+70w#*xQy1~L~ALy|y9;t&#m6i8^cK|?MD2o9>Vi2X{e||u;QG3t=c#4uQ*d)O=55{!>#V4!=`|TK@T!snY zPzix-VO{wx7*UoDA^madp7s@pEy&^|QzT1~7mD z3}65Q7~r;m?jIo6|3)*w5kRVyVO1XuW2teb8kF4GUsA)iUWQoJp17=;f7P}EsG2ng z7%RZIACSv)3ZOaQ5@6BLjsWK8X&nGkv*c%=0OFm-V3x1|0H{5XCn?;aXtdre5SBa` zn<)Yjmf5cBr7GRx!CVYp0k*_Ivk0K7xn@96fZX1brmL;C_VPc39e~E>%YQ*`{$po= z{{-m1Z0Wx6Ivc?1rr!r#e?N;1U;qOczyJm?fB|j`=>7q6{ckh_90j24HZ6rHth!Pz zIs#Bzq3#qwSgLfr2BfWlqm%*Dc0m~PW=GyEcoYD#`;fO~rVXZLHzl2^j)z>X#l^zZ ziU+z)l1sepc1_ySS^<^`?*X)onx`nu*vMchJ}wd70^r00Izt0Ef964s0X)S(%D#JJ zP_ihbIRTVixpw?^w^%>%23vlV^ zc=YkoyD0Hd1fE9*f28KYvk1sml9HBZ4`2Yl2=G7_=+*!(BH~ktLz-lR4@m^CHfDL^bFnahUgFz6r)!0WtePXIEU0wBT!AXWqbsxb$M;jaM$&lrO>vM>R- z2|$885AdxA?2vB&Paaf&VlCUA0jPWu1DTCU3}ROBdqBFHJVg#9zbNvOSTaQ}X(c)R wWI|3I1w6k8(>(t~yDi{z%>ZWr^j^0716LFA;#S1Qxc~qF07*qoM6N<$f&gWAjQ{`u literal 1376 zcmeAS@N?(olHy`uVBq!ia0y~yV3Yu|53n!;N!?wEoz$e7@|Ns9$=Kuc(=Fd-< z0AzvjfddDs5B+}v-{<+(;SAp{ z^C|IL|EuzN+3rYqvd!>WmQ~53RU1N`tW-2*%4R(*cjnpuEbYhk(;+X6OwXO};IR3; z^r~UXw#mOPy^`Nu7kErxFtYFd%`4}s#iNe2raf=!DcxXqe>x}I=_!%Ne%=uJazsgZ z{;%)JC2?*#RyVaz?U-Wh{ko?AjFG%snzpciaL2^^DnGWT#Mr#r)$??+^~4kM&wBj% z@A^I4HmC9GleuSiZuzlemQMPfAGgCUe+N2Ymrt)=@M1&BZ?}b0cChWunByI=jp4(2 z{@V;0UeBJp-{jKvJ!vxaKpX}5 zHE?9UPTrzd>@$63qtU_%&$U}K+4p}=+~i6C-3gf{TBO~r&LmV{@c``6V!Ry+8%Y2>NvxI5G6N`0w z1COo0Z`$xUBK6q}@h~r93yE^h6h{ z)xS*GJZnyL@v-MiRzCBIvryXc=#$XqzpN>H*6=^d+Hm>Frk>AFt%4r~hfPjdeJjiA zu(W8&{`axFXUv^i`Fu4i|MY#g8t;6#^<=)!{-rm?y{uxFxg{ID*{*)VG=JZ}Q{_{p zUkK6MsX23**GXE&SYeRb_0_?Rht6i7&2Ibj&DN+guH8ROGFT|ecsJoS|BzMWtCx2rx6%F@i=pZU4dXIOk~Tt0E*+MJYk-99HJD^JV}xwlU_{o2(hYvSHsp8IX-kGQP2`Jc>V z8uvR-UwJV#t7N9s-gSR-r|2@6gnH$9En68>6l~qDDlmfevu|8Pa_f8sjvlw)TVg8vvd@qD{;>Ot7F z_UEa`KI}JiORco%^*+7D1Wj9pJ@-w!^1^4vu7{w|Xcb-i<%wwcyb(-hk zNw=*(AI-m@Vi>bfaXbIZ`GHA=^Ok9px~ZKN`zC*S$+z?q?E6po{Jirt-BWGldL#dw zxJjPIYLXMT+@E-6(k%_+Bb&ukKgWd52D)VK83ExR5ox#F)Y!6aov0C!oDi9=C&zBI zvv#_%<|+9nXEs?qDm`}W?CQ)ZTh8gMzRcvkJd&8bovp4jSt)h?RnvaR?IusCG!boFyt=akR{019P^00000 diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html index 1429986ff..0de27a701 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+
+

moSolContinue< EOT > Member List

This is the complete list of members for moSolContinue< EOT >, including all inherited members.

-
functor_category()eoUF< const EOT &, bool > [static]
init()=0moSolContinue< EOT > [pure virtual]
operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html index 42c1cbcda..b72ba1c20 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSolContinue< EOT > Class Template Reference - +
-
+ +

moSolContinue< EOT > Class Template Reference

Class that describes a stop criterion for a solution-based heuristic. More...

@@ -87,8 +85,8 @@ Implemented in moSolContinue.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html index 22a391fbd..111c7db74 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moTS< M > Member List

This is the complete list of members for moTS< M >, including all inherited members.

- + - - + - -
className() consteoMonOp< M::EOType > [virtual]
className() const eoMonOp< M::EOType > [virtual]
contmoTS< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoTS< M > [private]
first_timemoTS< M > [inline, private, static]
Fitness typedefmoTS< M > [private]
full_evalmoTS< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
getType() const eoOp< EOType >
moTS(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
moTS(moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
move_explmoTS< M > [private]
mutexmoTS< M > [inline, private, static]
operator()(EOT &__sol)moTS< M > [inline, virtual]
OpType enum nameeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.html b/trunk/paradiseo-mo/doc/html/classmo_t_s.html index d69d9ff57..0be59a1f9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moTS< M > Class Template Reference - +
-
+ +

moTS< M > Class Template Reference

Tabu Search (TS). More...

@@ -49,13 +47,13 @@

Public Member Functions

 moTS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval) - Constructor of a moTS specifying all the boxes.
+ Constructor of a moTS specifying all the boxes.
 moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)  Constructor with less parameters.
bool operator() (EOT &__sol) - Function which launchs the Tabu Search.
Function which launchs the Tabu Search.

Private Types

typedef M::EOType EOT @@ -78,15 +76,6 @@ typedef EOT::Fitness eoEvalFunc< EOT > & full_eval  Full evaluation function.
-

Static Private Attributes

- -static bool first_time = true - - Boolean allowing to initialise the ptread_mutex_t in the constructor.
- -static pthread_mutex_t mutex - - The lock.

Detailed Description

template<class M>
@@ -98,7 +87,7 @@ Generic algorithm that describes a tabu search.

-Definition at line 30 of file moTS.h.


Constructor & Destructor Documentation

+Definition at line 29 of file moTS.h.

Constructor & Destructor Documentation

@@ -157,9 +146,9 @@ template<class M>

-Constructor of a moTS specifying all the boxes. +Constructor of a moTS specifying all the boxes.

-In this constructor, a moTSMoveLoopExpl is instanciated.

+In this constructor, a moTSMoveLoopExpl is instanciated.

Parameters:
@@ -173,9 +162,7 @@ In this constructor, a

-Definition at line 59 of file moTS.h. -

-References moTS< M >::first_time, and moTS< M >::mutex. +Definition at line 58 of file moTS.h.

@@ -217,16 +204,14 @@ Constructor with less parameters. The explorer is given in the parameters.

Parameters:
__move_init move initialisation
- +
__move_expl the explorer (generally different that a moTSMoveLoopExpl)
__move_expl the explorer (generally different that a moTSMoveLoopExpl)
__cont stop criterion
__full_eval full evaluation function

-Definition at line 81 of file moTS.h. -

-References moTS< M >::first_time, and moTS< M >::mutex. +Definition at line 71 of file moTS.h.


Member Function Documentation

@@ -249,28 +234,28 @@ template<class M>

-Function which launchs the Tabu Search. +Function which launchs the Tabu Search.

-Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.

+Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.

Parameters:
__sol a solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.

Implements eoUF< M::EOType &, bool >.

-Definition at line 104 of file moTS.h. +Definition at line 85 of file moTS.h.

-References moTS< M >::cont, moTS< M >::full_eval, moTS< M >::move_expl, and moTS< M >::mutex. +References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl.


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html index a9f7cc423..ea7febcc6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moTSMoveLoopExpl< M > Member List

This is the complete list of members for moTSMoveLoopExpl< M >, including all inherited members.

@@ -44,8 +42,8 @@ -
aspir_critmoTSMoveLoopExpl< M > [private]
EOT typedefmoTSMoveLoopExpl< M > [private]
tabu_listmoTSMoveLoopExpl< M > [private]
~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html index 036f4c409..fdc61a2e2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moTSMoveLoopExpl< M > Class Template Reference - +
-
+ +

moTSMoveLoopExpl< M > Class Template Reference

Explorer for a Tabu Search algorithm. More...

@@ -93,7 +91,7 @@ typedef M::EOType::Fitness  -It is used by a moTS. +It is used by a moTS.

@@ -211,8 +209,8 @@ References moTS


The documentation for this class was generated from the following file: -
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html index 81c2e43c4..8e7d23efe 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
-
+ +

moTabuList< M > Member List

This is the complete list of members for moTabuList< M >, including all inherited members.

- + - + - + -
add(const M &__move, const EOT &__sol)=0moTabuList< M > [pure virtual]
EOT typedefmoTabuList< M >
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()=0moTabuList< M > [pure virtual]
operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, bool > [pure virtual]
operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
update()=0moTabuList< M > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html index 659282948..2232a521b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moTabuList< M > Class Template Reference - +
-
+ -

moTabuList< M > Class Template Reference

Class describing a tabu list that a moTS uses. + +

moTabuList< M > Class Template Reference

Class describing a tabu list that a moTS uses. More...

#include <moTabuList.h> @@ -38,10 +36,10 @@

Inheritance diagram for moTabuList< M >:

-eoBF< const M &, const M::EOType &, bool > -eoFunctorBase -moSimpleMoveTabuList< M > -moSimpleSolutionTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > List of all members. @@ -65,9 +63,9 @@ typedef M::EOType 
moTS uses. +Class describing a tabu list that a moTS uses.

-It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS. +It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS.

@@ -166,8 +164,8 @@ Implemented in moTabuList.h -


Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png index c9d3346ba0cacd9a80360459c91be50ab1054700..b4c545581091dc713e5c9500f436e4655f44881e 100644 GIT binary patch literal 1364 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 - + PARADISEO-MO: File Index - +
-
+

PARADISEO-MO File List

Here is a list of all documented files with brief descriptions: @@ -56,8 +55,8 @@
index.h [code]
mo.h [code]
moTS.h [code]
moTSMoveLoopExpl.h [code]
-
Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/functions.html b/trunk/paradiseo-mo/doc/html/functions.html index b0e0be4c7..1f82523a0 100644 --- a/trunk/paradiseo-mo/doc/html/functions.html +++ b/trunk/paradiseo-mo/doc/html/functions.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - +
- - + +
  • Class Members
  • +

    - b -

    +: moImprBestFitAspirCrit< M >, moFirstImprSelect< M >, moBestImprSelect< M >
  • best_move +: moFirstImprSelect< M >, moBestImprSelect< M >

    - c -

    +: moTS< M >, moSA< M >
  • cool_sched +: moSA< M >
  • currentSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >

    - e -

    +: moTSMoveLoopExpl< M >, moTS< M >, moTabuList< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moItRandNextMove< M >, moHCMoveLoopExpl< M >, moHC< M >
  • EOType +: moMove< EOT >

    - f -

    -

    - g -

    -

    - h -

    +: moImprBestFitAspirCrit< M >, moBestImprSelect< M >
  • Fitness +: moTSMoveLoopExpl< M >, moTS< M >, moSA< M >, moRandImprSelect< M >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moFirstImprSelect< M >, moBestImprSelect< M >
  • full_eval +: moTS< M >, moSA< M >, moHC< M >
  • func +: moLSCheckPoint< M >

    - i -

    -

    - l -

    +: moTSMoveLoopExpl< M >, moSA< M >, moHCMoveLoopExpl< M >
  • init() +: moTabuList< M >, moSolContinue< EOT >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moRandImprSelect< M >, moNoAspirCrit< M >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moGenSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >, moAspirCrit< M >
  • init_fit +: moRandImprSelect< M >, moFirstImprSelect< M >
  • init_temp +: moSA< M >

    - m -

    +: moItRandNextMove< M >
  • maxNumGen +: moGenSolContinue< EOT >
  • maxSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • moExponentialCoolingSchedule() +: moExponentialCoolingSchedule
  • moGenSolContinue() +: moGenSolContinue< EOT >
  • moHC() +: moHC< M >
  • moHCMoveLoopExpl() +: moHCMoveLoopExpl< M >
  • moImprBestFitAspirCrit() +: moImprBestFitAspirCrit< M >
  • moItRandNextMove() +: moItRandNextMove< M >
  • moLinearCoolingSchedule() +: moLinearCoolingSchedule
  • moSA() +: moSA< M >
  • moSimpleMoveTabuList() +: moSimpleMoveTabuList< M >
  • moSimpleSolutionTabuList() +: moSimpleSolutionTabuList< M >
  • moTS() +: moTS< M >
  • moTSMoveLoopExpl() +: moTSMoveLoopExpl< M >
  • move_expl +: moTS< M >, moHC< M >
  • move_init +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • move_rand +: moSA< M >
  • move_select +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >

    - n -

    +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • num_iter +: moItRandNextMove< M >
  • numGen +: moGenSolContinue< EOT >

    - o -

    +: moTSMoveLoopExpl< M >, moTS< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moRandImprSelect< M >, moNoAspirCrit< M >, moLSCheckPoint< M >, moLinearCoolingSchedule, moItRandNextMove< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moGenSolContinue< EOT >, moFirstImprSelect< M >, moExponentialCoolingSchedule, moBestImprSelect< M >

    - q -

    +: moLinearCoolingSchedule

    - r -

    -

    - s -

    +: moItRandNextMove< M >
  • ratio +: moExponentialCoolingSchedule
  • removeMove() +: moSimpleMoveTabuList< M >
  • removeSolution() +: moSimpleSolutionTabuList< M >

    - t -

    +: moTSMoveLoopExpl< M >
  • tabuList +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • threshold +: moLinearCoolingSchedule, moExponentialCoolingSchedule

    - u -

    +: moTabuList< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moRandImprSelect< M >, moMoveSelect< M >, moFirstImprSelect< M >, moBestImprSelect< M >

    - v -

    -
    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +: moFirstImprSelect< M >
  • vect_better_fit +: moRandImprSelect< M >
  • vect_better_moves +: moRandImprSelect< M > +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/functions_func.html b/trunk/paradiseo-mo/doc/html/functions_func.html index 97a573daf..34224102b 100644 --- a/trunk/paradiseo-mo/doc/html/functions_func.html +++ b/trunk/paradiseo-mo/doc/html/functions_func.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - Functions - +
    -
    +
  • +
  • Class Members
  • + -
    - -
    - -

     

    -

    - a -

    +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/functions_type.html b/trunk/paradiseo-mo/doc/html/functions_type.html index 043faf2b2..1a55e430c 100644 --- a/trunk/paradiseo-mo/doc/html/functions_type.html +++ b/trunk/paradiseo-mo/doc/html/functions_type.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - Typedefs - +
    -
    + +
  • Class Members
  • +  

    -
    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +: moTSMoveLoopExpl< M >, moTS< M >, moTabuList< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moItRandNextMove< M >, moHCMoveLoopExpl< M >, moHC< M >
  • EOType +: moMove< EOT >
  • Fitness +: moTSMoveLoopExpl< M >, moTS< M >, moSA< M >, moRandImprSelect< M >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moFirstImprSelect< M >, moBestImprSelect< M > +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
  • diff --git a/trunk/paradiseo-mo/doc/html/functions_vars.html b/trunk/paradiseo-mo/doc/html/functions_vars.html index 9af308433..f48a3bec4 100644 --- a/trunk/paradiseo-mo/doc/html/functions_vars.html +++ b/trunk/paradiseo-mo/doc/html/functions_vars.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - Variables - +
    -
    + +
  • Class Members
  • + @@ -59,111 +57,59 @@

    - a -

    +: moTSMoveLoopExpl< M >

    - b -

    +: moImprBestFitAspirCrit< M >, moFirstImprSelect< M >, moBestImprSelect< M >
  • best_move +: moFirstImprSelect< M >, moBestImprSelect< M >

    - c -

    +: moTS< M >, moSA< M >
  • cool_sched +: moSA< M >
  • currentSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >

    - f -

    +: moImprBestFitAspirCrit< M >, moBestImprSelect< M >
  • full_eval +: moTS< M >, moSA< M >, moHC< M >
  • func +: moLSCheckPoint< M >

    - i -

    +: moTSMoveLoopExpl< M >, moSA< M >, moHCMoveLoopExpl< M >
  • init_fit +: moRandImprSelect< M >, moFirstImprSelect< M >
  • init_temp +: moSA< M >

    - m -

    +: moItRandNextMove< M >
  • maxNumGen +: moGenSolContinue< EOT >
  • maxSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • move_expl +: moTS< M >, moHC< M >
  • move_init +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • move_rand +: moSA< M >
  • move_select +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >

    - n -

    +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • num_iter +: moItRandNextMove< M >
  • numGen +: moGenSolContinue< EOT >

    - q -

    +: moLinearCoolingSchedule

    - r -

    +: moItRandNextMove< M >
  • ratio +: moExponentialCoolingSchedule

    - t -

    +: moTSMoveLoopExpl< M >
  • tabuList +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • threshold +: moLinearCoolingSchedule, moExponentialCoolingSchedule

    - v -

    -
    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +: moFirstImprSelect< M >
  • vect_better_fit +: moRandImprSelect< M >
  • vect_better_moves +: moRandImprSelect< M > +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/hierarchy.html b/trunk/paradiseo-mo/doc/html/hierarchy.html index 20d240331..bfaebf9e5 100644 --- a/trunk/paradiseo-mo/doc/html/hierarchy.html +++ b/trunk/paradiseo-mo/doc/html/hierarchy.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Hierarchical Index - +
    -
    + +

    PARADISEO-MO Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically: -
  • eoBF< M &, const M::EOType &, bool > - [external] -
  • eoBF< M &, const M::EOType &, void > - [external]
  • eoBF< M &, M::EOType::Fitness &, void > [external] -
    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/index.html b/trunk/paradiseo-mo/doc/html/index.html index 7a92d1781..bd26c60e9 100644 --- a/trunk/paradiseo-mo/doc/html/index.html +++ b/trunk/paradiseo-mo/doc/html/index.html @@ -1,11 +1,8 @@ - + PARADISEO-MO - - <a href="main.html">Frames are disabled. Click here to go to the main page.</a> - diff --git a/trunk/paradiseo-mo/doc/html/index_8h-source.html b/trunk/paradiseo-mo/doc/html/index_8h-source.html index eafe216c1..bfcc4d4f1 100644 --- a/trunk/paradiseo-mo/doc/html/index_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/index_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: index.h Source File - +
    -
    +

    index.h

    00001 
     00022 // coding: iso-8859-1
     00023 // mode: C++
     00024 // c-file-style: "Stroustrup"
     00025 // fill-column: 80
     00026 // End:
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/main.html b/trunk/paradiseo-mo/doc/html/main.html index dd30e986d..8ac0c5ce6 100644 --- a/trunk/paradiseo-mo/doc/html/main.html +++ b/trunk/paradiseo-mo/doc/html/main.html @@ -1,13 +1,13 @@ - + PARADISEO-MO: Welcome to PARADISEO-Moving Objects - +
    -
    +

    Welcome to PARADISEO-Moving Objects

    0.1

    @@ -33,8 +32,8 @@ tutorial

    install The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.

    design

    -
    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_8h-source.html index 844a345a2..d2a0255c5 100644 --- a/trunk/paradiseo-mo/doc/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: mo.h Source File - +
    -
    +

    mo.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "mo.h"
    @@ -68,8 +67,8 @@
     00044 #include "moTSMoveLoopExpl.h"
     00045 
     00046 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html index e70fb8f89..946e33307 100644 --- a/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moAlgo.h Source File - +
    -
    +

    moAlgo.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moAlgo.h"
    @@ -39,14 +38,14 @@
     00015 #include <eoOp.h>
     00016 
     00018 
    -00021 template < class EOT > class moAlgo:public eoMonOp < EOT >
    +00021 template < class EOT > class moAlgo:public eoMonOp < EOT >
     00022 {
     00023 
     00024 };
     00025 
     00026 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html index cf8d4c919..43ca77110 100644 --- a/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moAspirCrit.h Source File - +
    -
    +

    moAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moAspirCrit.h"
    @@ -39,7 +38,7 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename
    +00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename
     00023   M::EOType::Fitness &,
     00024   bool >
     00025 {
    @@ -47,13 +46,13 @@
     00027 public:
     00029 
     00032   virtual void
    -00033   init () = 0;
    +00033   init () = 0;
     00034 
     00035 };
     00036 
     00037 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html index 43c6448c5..78cab0014 100644 --- a/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moBestImprSelect.h Source File - +
    -
    +

    moBestImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moBestImprSelect.h"
    @@ -39,62 +38,62 @@
     00015 #include "moMoveSelect.h"
     00016 
     00018 
    -00022 template < class M > class moBestImprSelect:public moMoveSelect < M >
    +00022 template < class M > class moBestImprSelect:public moMoveSelect < M >
     00023 {
     00024 
     00025 public:
     00026 
    -00028   typedef typename M::EOType::Fitness Fitness;
    +00028   typedef typename M::EOType::Fitness Fitness;
     00029 
    -00031   void init (const Fitness & __fit)
    +00031   void init (const Fitness & __fit)
     00032   {
     00033 
    -00034     first_time = true;
    +00034     first_time = true;
     00035   }
     00036 
     00037 
     00039 
    -00047   bool update (const M & __move, const Fitness & __fit)
    +00047   bool update (const M & __move, const Fitness & __fit)
     00048   {
     00049 
    -00050     if (first_time || __fit > best_fit)
    +00050     if (first_time || __fit > best_fit)
     00051       {
     00052 
    -00053         best_fit = __fit;
    -00054         best_move = __move;
    +00053         best_fit = __fit;
    +00054         best_move = __move;
     00055 
    -00056         first_time = false;
    +00056         first_time = false;
     00057       }
     00058 
     00059     return true;
     00060   }
     00061 
     00063 
    -00068   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
    +00068   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
     00069   {
     00070 
    -00071     if (!first_time)
    +00071     if (!first_time)
     00072       {
    -00073         __move = best_move;
    -00074         __fit = best_fit;
    +00073         __move = best_move;
    +00074         __fit = best_fit;
     00075       }
     00076     else
    -00077       throw EmptySelection ();
    +00077       throw EmptySelection ();
     00078   }
     00079 
     00080 private:
     00081 
    -00083   bool first_time;
    +00083   bool first_time;
     00084 
    -00086   M best_move;
    +00086   M best_move;
     00087 
    -00089   Fitness best_fit;
    +00089   Fitness best_fit;
     00090 
     00091 };
     00092 
     00093 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html index ba277d342..f9153c881 100644 --- a/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moCoolingSchedule.h Source File - +
    -
    +

    moCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moCoolingSchedule.h"
    @@ -39,14 +38,14 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00022 class moCoolingSchedule:public eoUF < double &, bool >
    +00022 class moCoolingSchedule:public eoUF < double &, bool >
     00023 {
     00024 
     00025 };
     00026 
     00027 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html index 37a27a4e8..0b2858666 100644 --- a/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moExponentialCoolingSchedule.h Source File - +
    -
    +

    moExponentialCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moExponentialCoolingSchedule.h"
    @@ -39,30 +38,30 @@
     00015 #include "moCoolingSchedule.h"
     00016 
     00018 
    -00022 class moExponentialCoolingSchedule: public moCoolingSchedule
    +00022 class moExponentialCoolingSchedule: public moCoolingSchedule
     00023 {
     00024 
     00025 public:
     00027 
    -00031   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
    +00031   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
     00032   {}
     00033 
     00035 
    -00041   bool operator() (double &__temp)
    +00041   bool operator() (double &__temp)
     00042   {
    -00043     return (__temp *= ratio) > threshold;
    +00043     return (__temp *= ratio) > threshold;
     00044   }
     00045 
     00046 private:
     00047 
    -00049   double threshold;
    +00049   double threshold;
     00050 
    -00052   double ratio;
    +00052   double ratio;
     00053 };
     00054 
     00055 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html index bd4878b75..332dc4e5f 100644 --- a/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moFirstImprSelect.h Source File - +
    -
    +

    moFirstImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moFirstImprSelect.h"
    @@ -39,32 +38,32 @@
     00015 #include "moMoveSelect.h"
     00016 
     00018 
    -00023 template < class M > class moFirstImprSelect:public moMoveSelect < M >
    +00023 template < class M > class moFirstImprSelect:public moMoveSelect < M >
     00024 {
     00025 
     00026 public:
     00027 
    -00029   typedef typename M::EOType::Fitness Fitness;
    +00029   typedef typename M::EOType::Fitness Fitness;
     00030 
     00032 
    -00035   virtual void init (const Fitness & __fit)
    +00035   virtual void init (const Fitness & __fit)
     00036   {
     00037 
    -00038     valid = false;
    -00039     init_fit = __fit;
    +00038     valid = false;
    +00039     init_fit = __fit;
     00040   }
     00041 
     00042 
     00044 
    -00052   bool update (const M & __move, const typename M::EOType::Fitness & __fit)
    +00052   bool update (const M & __move, const typename M::EOType::Fitness & __fit)
     00053   {
     00054 
    -00055     if (__fit > init_fit)
    +00055     if (__fit > init_fit)
     00056       {
     00057 
    -00058         best_fit = __fit;
    -00059         best_move = __move;
    -00060         valid = true;
    +00058         best_fit = __fit;
    +00059         best_move = __move;
    +00060         valid = true;
     00061 
     00062         return false;
     00063       }
    @@ -75,33 +74,33 @@
     00068   }
     00069 
     00071 
    -00076   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
    +00076   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
     00077   {
     00078 
    -00079     if (valid)
    +00079     if (valid)
     00080       {
    -00081         __move = best_move;
    -00082         __fit = best_fit;
    +00081         __move = best_move;
    +00082         __fit = best_fit;
     00083       }
     00084     else
    -00085       throw EmptySelection ();
    +00085       throw EmptySelection ();
     00086   }
     00087 
     00088 private:
     00089 
    -00091   bool valid;
    +00091   bool valid;
     00092 
    -00094   M best_move;
    +00094   M best_move;
     00095 
    -00097   Fitness init_fit;
    +00097   Fitness init_fit;
     00098 
    -00100   Fitness best_fit;
    +00100   Fitness best_fit;
     00101 
     00102 };
     00103 
     00104 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html index bd642b626..d96162e7c 100644 --- a/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moGenSolContinue.h Source File - +
    -
    +

    moGenSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "eoGenSolContinue.h"
    @@ -39,41 +38,41 @@
     00015 #include "moSolContinue.h"
     00016 
     00018 
    -00021 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
    +00021 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
     00022 {
     00023 
     00024 public:
     00025 
     00027 
    -00030   moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
    +00030   moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
     00031   {
     00032 
     00033   }
     00034 
     00036 
    -00044   bool operator   () (const EOT & __sol)
    +00044   bool operator   () (const EOT & __sol)
     00045   {
     00046 
    -00047     return (++numGen < maxNumGen);
    +00047     return (++numGen < maxNumGen);
     00048   }
     00049 
     00051 
    -00054   void init ()
    +00054   void init ()
     00055   {
     00056 
    -00057     numGen = 0;
    +00057     numGen = 0;
     00058   }
     00059 
     00060 private:
     00061 
    -00063   unsigned int maxNumGen;
    +00063   unsigned int maxNumGen;
     00064 
    -00066   unsigned int numGen;
    +00066   unsigned int numGen;
     00067 };
     00068 
     00069 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html index 31a64f4df..5d8c27c93 100644 --- a/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moHC.h Source File - +
    -
    +

    moHC.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moHC.h"
    @@ -44,47 +43,47 @@
     00020 #include "moHCMoveLoopExpl.h"
     00021 
     00023 
    -00026 template < class M > class moHC:public moAlgo < typename M::EOType >
    +00026 template < class M > class moHC:public moAlgo < typename M::EOType >
     00027 {
     00028 
     00030   typedef
     00031     typename
     00032     M::EOType
    -00033     EOT;
    +00033     EOT;
     00034 
     00036   typedef
     00037     typename
     00038     EOT::Fitness
    -00039     Fitness;
    +00039     Fitness;
     00040 
     00041 public:
     00042 
     00044 
    -00053 moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
    +00053 moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
     00054              (__move_init, __next_move, __incr_eval, __move_select)),
    -00055     full_eval (__full_eval)
    +00055     full_eval (__full_eval)
     00056   {
     00057 
     00058   }
     00059 
     00061 
    -00067 moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
    -00068     full_eval
    +00067 moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
    +00068     full_eval
     00069     (__full_eval)
     00070   {
     00071 
     00072   }
     00073 
     00075 
    -00082   bool operator   ()(EOT & __sol)
    +00082   bool operator   ()(EOT & __sol)
     00083   {
     00084 
     00085     if (__sol.invalid ())
     00086       {
    -00087         full_eval (__sol);
    +00087         full_eval (__sol);
     00088       }
     00089 
    -00090     EOT new_sol;
    +00090     EOT new_sol;
     00091 
     00092     do
     00093       {
    @@ -94,10 +93,10 @@
     00097         try
     00098         {
     00099 
    -00100           move_expl (__sol, new_sol);
    +00100           move_expl (__sol, new_sol);
     00101 
     00102         }
    -00103         catch (EmptySelection & __ex)
    +00103         catch (EmptySelection & __ex)
     00104         {
     00105 
     00106           break;
    @@ -120,14 +119,14 @@
     00123 
     00124 private:
     00125 
    -00127   moMoveExpl < M > &move_expl;
    +00127   moMoveExpl < M > &move_expl;
     00128 
    -00130   eoEvalFunc < EOT > &full_eval;
    +00130   eoEvalFunc < EOT > &full_eval;
     00131 };
     00132 
     00133 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html index 29ea62f8e..530e8dd48 100644 --- a/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moHCMoveLoopExpl.h Source File - +
    -
    +

    moHCMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moHCMoveLoopExpl.h"
    @@ -43,53 +42,53 @@
     00019 #include "moMoveIncrEval.h"
     00020 #include "moMoveSelect.h"
     00021 
    -00023 template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M >
    +00023 template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M >
     00024 {
     00025 
    -00027   typedef typename M::EOType EOT;
    +00027   typedef typename M::EOType EOT;
     00028 
    -00030   typedef typename M::EOType::Fitness Fitness;
    +00030   typedef typename M::EOType::Fitness Fitness;
     00031 
     00032 public:
     00033 
     00035 
    -00043 moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
    +00043 moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
     00044 
    -00045   move_init (__move_init),
    -00046     next_move (__next_move),
    -00047     incr_eval (__incr_eval), move_select (__move_select)
    +00045   move_init (__move_init),
    +00046     next_move (__next_move),
    +00047     incr_eval (__incr_eval), move_select (__move_select)
     00048   {
     00049 
     00050   }
     00051 
     00053 
    -00059   void operator   () (const EOT & __old_sol, EOT & __new_sol)
    +00059   void operator   () (const EOT & __old_sol, EOT & __new_sol)
     00060   {
     00061 
     00062     M move;
     00063 
     00064     //
    -00065     move_init (move, __old_sol);        /* Restarting the exploration of 
    +00065     move_init (move, __old_sol);        /* Restarting the exploration of 
     00066                                            of the neighborhood ! */
     00067 
    -00068     move_select.init (__old_sol.fitness ());
    +00068     move_select.init (__old_sol.fitness ());
     00069 
    -00070     while (move_select.update (move, incr_eval (move, __old_sol))
    -00071            && next_move (move, __old_sol));
    +00070     while (move_select.update (move, incr_eval (move, __old_sol))
    +00071            && next_move (move, __old_sol));
     00072 
     00073     try
     00074     {
     00075 
     00076       M best_move;
     00077 
    -00078       Fitness best_move_fit;
    +00078       Fitness best_move_fit;
     00079 
    -00080       move_select (best_move, best_move_fit);
    +00080       move_select (best_move, best_move_fit);
     00081       __new_sol.fitness (best_move_fit);
     00082       best_move (__new_sol);
     00083 
     00084     }
    -00085     catch (EmptySelection & __ex)
    +00085     catch (EmptySelection & __ex)
     00086     {
     00087 
     00088       // ?
    @@ -98,19 +97,19 @@
     00091 
     00092 private:
     00093 
    -00095   moMoveInit < M > &move_init;
    +00095   moMoveInit < M > &move_init;
     00096 
    -00098   moNextMove < M > &next_move;
    +00098   moNextMove < M > &next_move;
     00099 
    -00101   moMoveIncrEval < M > &incr_eval;
    +00101   moMoveIncrEval < M > &incr_eval;
     00102 
    -00104   moMoveSelect < M > &move_select;
    +00104   moMoveSelect < M > &move_select;
     00105 
     00106 };
     00107 
     00108 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html index b20f73351..acbf01beb 100644 --- a/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moImprBestFitAspirCrit.h Source File - +
    -
    +

    moImprBestFitAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moImprAspirCrit.h"
    @@ -39,44 +38,44 @@
     00015 #include "moAspirCrit.h"
     00016 
     00018 
    -00022 template < class M > class moImprBestFitAspirCrit:public moAspirCrit < M >
    +00022 template < class M > class moImprBestFitAspirCrit:public moAspirCrit < M >
     00023 {
     00024 
     00025 public:
     00026 
    -00028   typedef typename M::EOType::Fitness Fitness;
    +00028   typedef typename M::EOType::Fitness Fitness;
     00029 
    -00031   moImprBestFitAspirCrit ()
    +00031   moImprBestFitAspirCrit ()
     00032   {
     00033 
    -00034     first_time = true;
    +00034     first_time = true;
     00035   }
     00036 
    -00038   void init ()
    +00038   void init ()
     00039   {
     00040 
    -00041     first_time = true;
    +00041     first_time = true;
     00042   }
     00043 
     00045 
    -00052   bool operator   () (const M & __move, const Fitness & __fit)
    +00052   bool operator   () (const M & __move, const Fitness & __fit)
     00053   {
     00054 
    -00055     if (first_time)
    +00055     if (first_time)
     00056       {
     00057 
    -00058         best_fit = __fit;
    -00059         first_time = false;
    +00058         best_fit = __fit;
    +00059         first_time = false;
     00060 
     00061         return true;
     00062       }
    -00063     else if (__fit < best_fit)
    +00063     else if (__fit < best_fit)
     00064       return false;
     00065 
     00066     else
     00067       {
     00068 
    -00069         best_fit = __fit;
    +00069         best_fit = __fit;
     00070 
     00071         return true;
     00072       }
    @@ -84,14 +83,14 @@
     00074 
     00075 private:
     00076 
    -00078   Fitness best_fit;
    +00078   Fitness best_fit;
     00079 
    -00081   bool first_time;
    +00081   bool first_time;
     00082 };
     00083 
     00084 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html index cdac45b80..54bee2586 100644 --- a/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moItRandNextMove.h Source File - +
    -
    +

    moItRandNextMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moNextMove.h"
    @@ -40,54 +39,54 @@
     00016 #include "moRandMove.h"
     00017 
     00019 
    -00022 template < class M > class moItRandNextMove:public moNextMove < M >
    +00022 template < class M > class moItRandNextMove:public moNextMove < M >
     00023 {
     00024 
    -00026   typedef typename M::EOType EOT;
    +00026   typedef typename M::EOType EOT;
     00027 
     00028 public:
     00029 
     00031 
    -00037   moItRandNextMove (moRandMove < M > &__rand_move,
    -00038                     unsigned int __max_iter):rand_move (__rand_move),
    -00039     max_iter (__max_iter), num_iter (0)
    +00037   moItRandNextMove (moRandMove < M > &__rand_move,
    +00038                     unsigned int __max_iter):rand_move (__rand_move),
    +00039     max_iter (__max_iter), num_iter (0)
     00040   {
     00041 
     00042   }
     00043 
     00045 
    -00052   bool operator   () (M & __move, const EOT & __sol)
    +00052   bool operator   () (M & __move, const EOT & __sol)
     00053   {
     00054 
    -00055     if (num_iter++ > max_iter)
    +00055     if (num_iter++ > max_iter)
     00056       {
     00057 
    -00058         num_iter = 0;
    +00058         num_iter = 0;
     00059         return false;
     00060       }
     00061     else
     00062       {
     00063 
     00064         /* The given solution is discarded here */
    -00065         rand_move (__move);
    -00066         num_iter++;
    +00065         rand_move (__move);
    +00066         num_iter++;
     00067         return true;
     00068       }
     00069   }
     00070 
     00071 private:
     00072 
    -00074   moRandMove < M > &rand_move;
    +00074   moRandMove < M > &rand_move;
     00075 
    -00077   unsigned int max_iter;
    +00077   unsigned int max_iter;
     00078 
    -00080   unsigned int num_iter;
    +00080   unsigned int num_iter;
     00081 
     00082 };
     00083 
     00084 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html index cc495dec1..d10b395c9 100644 --- a/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moLSCheckPoint.h Source File - +
    -
    +

    moLSCheckPoint.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moLSCheckPoint.h"
    @@ -39,28 +38,28 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename
    +00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename
     00022   M::EOType &, void >
     00023 {
     00024 
     00025 public:
     00027 
     00033   void
    -00034   operator   () (const M & __move, const typename M::EOType & __sol)
    +00034   operator   () (const M & __move, const typename M::EOType & __sol)
     00035   {
     00036 
    -00037     for (unsigned int i = 0; i < func.size (); i++)
    +00037     for (unsigned int i = 0; i < func.size (); i++)
     00038       {
    -00039         func[i]->operator   ()(__move, __sol);
    +00039         func[i]->operator   ()(__move, __sol);
     00040       }
     00041   }
     00042 
     00044 
     00048   void
    -00049   add (eoBF < const M &, const typename M::EOType &, void >&__f)
    +00049   add (eoBF < const M &, const typename M::EOType &, void >&__f)
     00050   {
     00051 
    -00052     func.push_back (&__f);
    +00052     func.push_back (&__f);
     00053   }
     00054 
     00055 private:
    @@ -69,13 +68,13 @@
     00059     M &, const
     00060     typename
     00061   M::EOType &, void >*>
    -00062     func;
    +00062     func;
     00063 
     00064 };
     00065 
     00066 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html index 23d58ce77..f54781742 100644 --- a/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moLinearCoolingSchedule.h Source File - +
    -
    +

    moLinearCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moLinearCoolingSchedule.h"
    @@ -39,30 +38,30 @@
     00015 #include "moCoolingSchedule.h"
     00016 
     00018 
    -00022 class moLinearCoolingSchedule: public moCoolingSchedule
    +00022 class moLinearCoolingSchedule: public moCoolingSchedule
     00023 {
     00024 
     00025 public:
     00027 
    -00031   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
    +00031   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
     00032   {}
     00033 
     00035 
    -00041   bool operator() (double &__temp)
    +00041   bool operator() (double &__temp)
     00042   {
    -00043     return (__temp -= quantity) > threshold;
    +00043     return (__temp -= quantity) > threshold;
     00044   }
     00045 
     00046 private:
     00047 
    -00049   double threshold;
    +00049   double threshold;
     00050 
    -00052   double quantity;
    +00052   double quantity;
     00053 };
     00054 
     00055 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html index cc8981795..a766ebaff 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMove.h Source File - +
    -
    +

    moMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moMove.h"
    @@ -39,17 +38,17 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00023 template < class EOT > class moMove:public eoUF < EOT &, void >
    +00023 template < class EOT > class moMove:public eoUF < EOT &, void >
     00024 {
     00025 
     00026 public:
    -00028   typedef EOT EOType;
    +00028   typedef EOT EOType;
     00029 
     00030 };
     00031 
     00032 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html index e3b28b2fe..0fd516e6b 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveExpl.h Source File - +
    -
    +

    moMoveExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "eoMoveExpl.h"
    @@ -39,7 +38,7 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00021 template < class M > class moMoveExpl:public eoBF < const typename
    +00021 template < class M > class moMoveExpl:public eoBF < const typename
     00022   M::EOType &,
     00023   typename
     00024 M::EOType &, void >
    @@ -48,8 +47,8 @@
     00027 };
     00028 
     00029 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html index e7f92eb66..963fa0005 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveIncrEval.h Source File - +
    -
    +

    moMoveIncrEval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "eoMoveIncrEval.h"
    @@ -39,7 +38,7 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename
    +00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename
     00025   M::EOType &,
     00026   typename
     00027   M::EOType::Fitness >
    @@ -48,8 +47,8 @@
     00030 };
     00031 
     00032 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html index e01bd73f2..03c6fac7a 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveInit.h Source File - +
    -
    +

    moMoveInit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moMoveInit.h"
    @@ -39,15 +38,15 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00022 template < class M > class moMoveInit:public eoBF < M &, const typename
    +00022 template < class M > class moMoveInit:public eoBF < M &, const typename
     00023 M::EOType &, void >
     00024 {
     00025 
     00026 };
     00027 
     00028 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html index 86af8a705..5c3900673 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveLoopExpl.h Source File - +
    -
    +

    moMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moMoveLoopExpl.h"
    @@ -39,14 +38,14 @@
     00015 #include "moMoveExpl.h"
     00016 
     00018 
    -00021 template < class M > class moMoveLoopExpl:public moMoveExpl < M >
    +00021 template < class M > class moMoveLoopExpl:public moMoveExpl < M >
     00022 {
     00023 
     00024 };
     00025 
     00026 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html index b3dfb15a4..711032510 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveSelect.h Source File - +
    -
    +

    moMoveSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moMoveSelect.h"
    @@ -39,35 +38,35 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00021 class EmptySelection
    +00021 class EmptySelection
     00022 {
     00023 
     00024 };
     00025 
     00027 
    -00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &,
    +00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &,
     00033   void >
     00034 {
     00035 public:
     00037   typedef
     00038     typename
     00039     M::EOType::Fitness
    -00040     Fitness;
    +00040     Fitness;
     00041 
     00043 
     00050   virtual void
    -00051   init (const Fitness & __fit) = 0;
    +00051   init (const Fitness & __fit) = 0;
     00052 
     00054 
     00059   virtual
     00060     bool
    -00061   update (const M & __move, const Fitness & __fit) = 0;
    +00061   update (const M & __move, const Fitness & __fit) = 0;
     00062 
     00063 };
     00064 
     00065 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html index 1407aa526..26a511acd 100644 --- a/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moNextMove.h Source File - +
    -
    +

    moNextMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moNextMove.h"
    @@ -39,7 +38,7 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00022 template < class M > class moNextMove:public eoBF < M &, const typename
    +00022 template < class M > class moNextMove:public eoBF < M &, const typename
     00023   M::EOType &,
     00024   bool >
     00025 {
    @@ -47,8 +46,8 @@
     00027 };
     00028 
     00029 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html index 417888272..97c22b7f2 100644 --- a/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moNoAspirCrit.h Source File - +
    -
    +

    moNoAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "eoNoAspirCrit.h"
    @@ -39,11 +38,11 @@
     00015 #include "moAspirCrit.h"
     00016 
     00018 
    -00021 template < class M > class moNoAspirCrit:public moAspirCrit < M >
    +00021 template < class M > class moNoAspirCrit:public moAspirCrit < M >
     00022 {
     00023 
     00025 
    -00032   bool operator   () (const M & __move,
    +00032   bool operator   () (const M & __move,
     00033                       const typename M::EOType::Fitness & __sol)
     00034   {
     00035 
    @@ -51,14 +50,14 @@
     00037   }
     00038 
     00040 
    -00043   void init ()
    +00043   void init ()
     00044   {
     00045   }
     00046 };
     00047 
     00048 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html index 350169a34..e2ea2cf9d 100644 --- a/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moRandImprSelect.h Source File - +
    -
    +

    moRandImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moRandImprSelect.h"
    @@ -42,63 +41,63 @@
     00018 #include "moMoveSelect.h"
     00019 
     00021 
    -00025 template < class M > class moRandImprSelect:public moMoveSelect < M >
    +00025 template < class M > class moRandImprSelect:public moMoveSelect < M >
     00026 {
     00027 
     00028 public:
     00029 
    -00031   typedef typename M::EOType::Fitness Fitness;
    +00031   typedef typename M::EOType::Fitness Fitness;
     00032 
     00034 
    -00040   void init (const Fitness & __fit)
    +00040   void init (const Fitness & __fit)
     00041   {
    -00042     init_fit = __fit;
    -00043     vect_better_fit.clear ();
    -00044     vect_better_moves.clear ();
    +00042     init_fit = __fit;
    +00043     vect_better_fit.clear ();
    +00044     vect_better_moves.clear ();
     00045   }
     00046 
     00048 
    -00056   bool update (const M & __move, const Fitness & __fit)
    +00056   bool update (const M & __move, const Fitness & __fit)
     00057   {
     00058 
    -00059     if (__fit > init_fit)
    +00059     if (__fit > init_fit)
     00060       {
     00061 
    -00062         vect_better_fit.push_back (__fit);
    -00063         vect_better_moves.push_back (__move);
    +00062         vect_better_fit.push_back (__fit);
    +00063         vect_better_moves.push_back (__move);
     00064       }
     00065 
     00066     return true;
     00067   }
     00068 
     00070 
    -00077   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
    +00077   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
     00078   {
     00079 
    -00080     if (!vect_better_fit.empty ())
    +00080     if (!vect_better_fit.empty ())
     00081       {
     00082 
    -00083         unsigned n = rng.random (vect_better_fit.size ());
    +00083         unsigned n = rng.random (vect_better_fit.size ());
     00084 
    -00085         __move = vect_better_moves[n];
    -00086         __fit = vect_better_fit[n];
    +00085         __move = vect_better_moves[n];
    +00086         __fit = vect_better_fit[n];
     00087       }
     00088     else
    -00089       throw EmptySelection ();
    +00089       throw EmptySelection ();
     00090   }
     00091 
     00092 private:
     00093 
    -00095   Fitness init_fit;
    +00095   Fitness init_fit;
     00096 
    -00098   std::vector < Fitness > vect_better_fit;
    +00098   std::vector < Fitness > vect_better_fit;
     00099 
    -00101   std::vector < M > vect_better_moves;
    +00101   std::vector < M > vect_better_moves;
     00102 };
     00103 
     00104 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html index 2269ccf43..c0787d6ef 100644 --- a/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moRandMove.h Source File - +
    -
    +

    moRandMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moRandMove.h"
    @@ -39,14 +38,14 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00021 template < class M > class moRandMove:public eoUF < M &, void >
    +00021 template < class M > class moRandMove:public eoUF < M &, void >
     00022 {
     00023 
     00024 };
     00025 
     00026 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html index 03ca3d86f..fd0027fcb 100644 --- a/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSA.h Source File - +
    -
    +

    moSA.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moSA.h"
    @@ -48,67 +47,67 @@
     00024 #include <math.h>
     00025 
     00027 
    -00030 template < class M > class moSA:public moAlgo < typename M::EOType >
    +00030 template < class M > class moSA:public moAlgo < typename M::EOType >
     00031 {
     00032 
     00034   typedef
     00035     typename
     00036     M::EOType
    -00037     EOT;
    +00037     EOT;
     00038 
     00040   typedef
     00041     typename
     00042     EOT::Fitness
    -00043     Fitness;
    +00043     Fitness;
     00044 
     00045 public:
     00046 
     00048 
    -00058   moSA (moRandMove < M > &__move_rand,
    +00058   moSA (moRandMove < M > &__move_rand,
     00059         moMoveIncrEval < M > &__incr_eval,
     00060         moSolContinue < EOT > &__cont,
     00061         double __init_temp,
    -00062         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
    -00063   move_rand (__move_rand),
    -00064   incr_eval (__incr_eval),
    -00065   cont (__cont),
    -00066   init_temp (__init_temp),
    -00067   cool_sched (__cool_sched),
    -00068   full_eval (__full_eval)
    +00062         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
    +00063   move_rand (__move_rand),
    +00064   incr_eval (__incr_eval),
    +00065   cont (__cont),
    +00066   init_temp (__init_temp),
    +00067   cool_sched (__cool_sched),
    +00068   full_eval (__full_eval)
     00069   {
     00070 
     00071   }
     00072 
     00074 
    -00080   bool operator   ()(EOT & __sol)
    +00080   bool operator   ()(EOT & __sol)
     00081   {
     00082 
     00083     if (__sol.invalid ())
     00084       {
    -00085         full_eval (__sol);
    +00085         full_eval (__sol);
     00086       }
     00087 
    -00088     double temp = init_temp;
    +00088     double temp = init_temp;
     00089 
     00090     M move;
     00091 
    -00092     EOT best_sol = __sol;
    +00092     EOT best_sol = __sol;
     00093 
     00094     do
     00095       {
     00096 
    -00097         cont.init ();
    +00097         cont.init ();
     00098         do
     00099           {
     00100 
    -00101             move_rand (move);
    +00101             move_rand (move);
     00102 
    -00103             Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
    +00103             Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
     00104 
     00105             if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
     00106               {
     00107 
    -00108                 __sol.fitness (incr_eval (move, __sol));
    +00108                 __sol.fitness (incr_eval (move, __sol));
     00109                 move (__sol);
     00110 
     00111                 /* Updating the best solution found
    @@ -118,10 +117,10 @@
     00115               }
     00116 
     00117           }
    -00118         while (cont (__sol));
    +00118         while (cont (__sol));
     00119 
     00120       }
    -00121     while (cool_sched (temp));
    +00121     while (cool_sched (temp));
     00122 
     00123     __sol = best_sol;
     00124 
    @@ -130,22 +129,22 @@
     00127 
     00128 private:
     00129 
    -00131   moRandMove < M > &move_rand;
    +00131   moRandMove < M > &move_rand;
     00132 
    -00134   moMoveIncrEval < M > &incr_eval;
    +00134   moMoveIncrEval < M > &incr_eval;
     00135 
    -00137   moSolContinue < EOT > &cont;
    +00137   moSolContinue < EOT > &cont;
     00138 
    -00140   double  init_temp;
    +00140   double  init_temp;
     00141 
    -00143   moCoolingSchedule & cool_sched;
    +00143   moCoolingSchedule & cool_sched;
     00144 
    -00146   eoEvalFunc < EOT > &full_eval;        // Full evaluator.
    +00146   eoEvalFunc < EOT > &full_eval;        // Full evaluator.
     00147 };
     00148 
     00149 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html index 48d00b2f6..2fbd4bccf 100644 --- a/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSimpleMoveTabuList.h Source File - +
    -
    +

    moSimpleMoveTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moSimpleMoveTabuList.h"
    @@ -42,66 +41,66 @@
     00018 #include "moTabuList.h"
     00019 
     00021 template <class M>
    -00022 class moSimpleMoveTabuList: public moTabuList < M >
    +00022 class moSimpleMoveTabuList: public moTabuList < M >
     00023 {
     00024   
     00025 public:
     00026   
    -00028   typedef typename M::EOType EOT;
    +00028   typedef typename M::EOType EOT;
     00029 
     00031   /*
     00032     \param __size The maximum size of the move tabu list.
     00033    */
    -00034   moSimpleMoveTabuList(unsigned int __size): maxSize(__size)
    +00034   moSimpleMoveTabuList(unsigned int __size): maxSize(__size)
     00035   {
    -00036     currentSize=0;
    +00036     currentSize=0;
     00037   }
     00038 
     00040 
     00045   bool
    -00046   operator () (const M & __move, const EOT & __sol) 
    +00046   operator () (const M & __move, const EOT & __sol) 
     00047   {
     00048     typename std::list<M>::iterator it;
     00049     
    -00050     it=tabuList.begin();
    -00051     while(it!=tabuList.end()&&(!((*it)==__move)))
    +00050     it=tabuList.begin();
    +00051     while(it!=tabuList.end()&&(!((*it)==__move)))
     00052       {
     00053         it++;
     00054       }
     00055     
    -00056     return it!=tabuList.end();
    +00056     return it!=tabuList.end();
     00057   }
     00058   
     00059   void
    -00060   add (const M & __move, const EOT & __sol)
    +00060   add (const M & __move, const EOT & __sol)
     00061   {
    -00062     if(currentSize!=0)
    +00062     if(currentSize!=0)
     00063       {
     00064         // Useful in the case of a move has been kept thanks to the moAspirCrit.
     00065         // In this case, the move can already be in the tabuList.
    -00066         removeMove(__move);
    +00066         removeMove(__move);
     00067       }
     00068 
    -00069     tabuList.push_back(__move);
    +00069     tabuList.push_back(__move);
     00070     
    -00071     if(currentSize==maxSize)
    +00071     if(currentSize==maxSize)
     00072       {
    -00073         tabuList.erase(tabuList.begin());
    +00073         tabuList.erase(tabuList.begin());
     00074       }
     00075     else
     00076       {
    -00077         currentSize++;
    +00077         currentSize++;
     00078       }
     00079   }
     00080   
     00081   void
    -00082   update ()
    +00082   update ()
     00083   {
     00084     //nothing to do
     00085   }
     00086 
     00087   void
    -00088   init ()
    +00088   init ()
     00089   {
     00090     //nothing to do
     00091   }
    @@ -110,32 +109,32 @@
     00094   
     00096 
     00099   void
    -00100   removeMove(const M & __move)
    +00100   removeMove(const M & __move)
     00101   {
     00102     typename std::list<M>::iterator it;
     00103     
    -00104     it=tabuList.begin();
    -00105     while(it!=tabuList.end()&&(!((*it)==__move)))
    +00104     it=tabuList.begin();
    +00105     while(it!=tabuList.end()&&(!((*it)==__move)))
     00106       {
     00107         it++;
     00108       }
     00109 
    -00110     if(it!=tabuList.end())
    +00110     if(it!=tabuList.end())
     00111       {
    -00112         tabuList.erase(it);
    +00112         tabuList.erase(it);
     00113       }
     00114   }
     00115 
    -00117   unsigned int maxSize;
    +00117   unsigned int maxSize;
     00118 
    -00120   unsigned int currentSize;
    +00120   unsigned int currentSize;
     00121   
    -00123   std::list<M> tabuList;
    +00123   std::list<M> tabuList;
     00124 };
     00125 
     00126 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html index 4cee3cffb..cd5ab1597 100644 --- a/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSimpleSolutionTabuList.h Source File - +
    -
    +

    moSimpleSolutionTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moSimpleSolutionTabuList.h"
    @@ -42,73 +41,73 @@
     00018 #include "moTabuList.h"
     00019 
     00021 template <class M>
    -00022 class moSimpleSolutionTabuList: public moTabuList < M >
    +00022 class moSimpleSolutionTabuList: public moTabuList < M >
     00023 {
     00024   
     00025 public:
     00026 
    -00028   typedef typename M::EOType EOT;
    +00028   typedef typename M::EOType EOT;
     00029   
     00031 
    -00034   moSimpleSolutionTabuList(unsigned int __size): maxSize(__size)
    +00034   moSimpleSolutionTabuList(unsigned int __size): maxSize(__size)
     00035   {
    -00036     currentSize=0;
    +00036     currentSize=0;
     00037   }
     00038   
     00040 
    -00045   bool operator () (const M & __move, const EOT & __sol) 
    +00045   bool operator () (const M & __move, const EOT & __sol) 
     00046   {
     00047     typename std::list<EOT>::iterator it;
     00048   
     00049     M _move=(M)__move;
    -00050     EOT _sol=(EOT) __sol;
    +00050     EOT _sol=(EOT) __sol;
     00051 
     00052     _move(_sol);
     00053   
    -00054     it=tabuList.begin();
    -00055     while(it!=tabuList.end()&&(!((*it)==_sol)))
    +00054     it=tabuList.begin();
    +00055     while(it!=tabuList.end()&&(!((*it)==_sol)))
     00056       {
     00057         it++;
     00058       }
     00059     
    -00060     return it!=tabuList.end();
    +00060     return it!=tabuList.end();
     00061   }
     00062   
     00063   void
    -00064   add (const M & __move, const EOT & __sol)
    +00064   add (const M & __move, const EOT & __sol)
     00065   {
     00066     M _move=(M)__move;
    -00067     EOT _sol=(EOT) _sol;
    +00067     EOT _sol=(EOT) _sol;
     00068     
     00069     _move(_sol);
     00070 
    -00071     if(currentSize!=0)
    +00071     if(currentSize!=0)
     00072       {
     00073         // Useful in the case of a solution has been kept thanks to the moAspirCrit.
     00074         // In this case, the solution can already be in the tabuList.
    -00075         removeSolution(_sol);
    +00075         removeSolution(_sol);
     00076       }
     00077     
    -00078     tabuList.push_back(_sol);
    +00078     tabuList.push_back(_sol);
     00079     
    -00080     if(currentSize==maxSize)
    +00080     if(currentSize==maxSize)
     00081       {
    -00082         tabuList.erase(tabuList.begin());
    +00082         tabuList.erase(tabuList.begin());
     00083       }
     00084     else
     00085       {
    -00086         currentSize++;
    +00086         currentSize++;
     00087       }
     00088   }
     00089 
     00090   void
    -00091   update ()
    +00091   update ()
     00092   {
     00093     //nothing to do
     00094   }
     00095 
     00096   void
    -00097   init ()
    +00097   init ()
     00098   {
     00099     //nothing to do
     00100   }
    @@ -117,32 +116,32 @@
     00103 
     00105 
     00108   void
    -00109   removeSolution(const EOT & __sol)
    +00109   removeSolution(const EOT & __sol)
     00110   {
     00111     typename std::list<EOT>::iterator it;
     00112 
    -00113     it=tabuList.begin();
    -00114     while(it!=tabuList.end()&&(!((*it)==__sol)))
    +00113     it=tabuList.begin();
    +00114     while(it!=tabuList.end()&&(!((*it)==__sol)))
     00115       {
     00116         it++;
     00117       }
     00118 
    -00119     if(it!=tabuList.end())
    +00119     if(it!=tabuList.end())
     00120       {
    -00121         tabuList.erase(it);
    +00121         tabuList.erase(it);
     00122       }
     00123   }
     00124   
    -00126   unsigned int maxSize;
    +00126   unsigned int maxSize;
     00127 
    -00129   unsigned int currentSize;
    +00129   unsigned int currentSize;
     00130   
    -00132   std::list<EOT> tabuList;
    +00132   std::list<EOT> tabuList;
     00133 };
     00134 
     00135 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html index 17f8a61ea..60e0d5315 100644 --- a/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSolContinue.h Source File - +
    -
    +

    moSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moSolContinue.h"
    @@ -39,17 +38,17 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool >
    +00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool >
     00023 {
     00024 
     00025 public:
     00027 
    -00030   virtual void init () = 0;
    +00030   virtual void init () = 0;
     00031 };
     00032 
     00033 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html index ce9ff8b0f..2628da72f 100644 --- a/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moTS.h Source File - +
    -
    +

    moTS.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moTS.h"
    @@ -45,127 +44,95 @@
     00021 #include "moMoveExpl.h"
     00022 #include "moTSMoveLoopExpl.h"
     00023 
    -00024 #include <pthread.h>
    -00025 
    -00027 
    -00030 template < class M > class moTS:public moAlgo < typename M::EOType >
    -00031 {
    -00032 
    -00034   typedef
    -00035     typename
    -00036     M::EOType
    -00037     EOT;
    -00038 
    -00040   typedef
    -00041     typename
    -00042     EOT::Fitness
    -00043     Fitness;
    -00044 
    -00045 public:
    -00046 
    -00048 
    -00059 moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
    -00060              (__move_init, __next_move, __incr_eval, __tabu_list,
    -00061               __aspir_crit)), cont (__cont), full_eval (__full_eval)
    -00062   {
    -00063 
    -00064     if (first_time)
    -00065       {
    -00066 
    -00067         pthread_mutex_init (&mutex, 0);
    -00068 
    -00069         first_time = false;
    -00070       }
    -00071   }
    -00072 
    -00074 
    -00081 moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
    -00082     cont (__cont),
    -00083     full_eval (__full_eval)
    -00084   {
    -00085 
    -00086     if (first_time)
    -00087       {
    -00088 
    -00089         pthread_mutex_init (&mutex, 0);
    -00090 
    -00091         first_time = false;
    -00092       }
    -00093   }
    -00094 
    -00096 
    -00104   bool operator   ()(EOT & __sol)
    -00105   {
    -00106 
    -00107     pthread_mutex_lock (&mutex);
    -00108 
    -00109     if (__sol.invalid ())
    -00110       {
    -00111         full_eval (__sol);
    -00112       }
    -00113 
    -00114     M move;
    -00115 
    -00116     EOT best_sol = __sol, new_sol;
    -00117 
    -00118     cont.init ();
    -00119 
    -00120     do
    -00121       {
    -00122 
    -00123         new_sol = __sol;
    -00124 
    -00125         try
    -00126         {
    -00127 
    -00128           move_expl (__sol, new_sol);
    -00129 
    -00130         }
    -00131         catch (EmptySelection & __ex)
    -00132         {
    +00024 
    +00026 
    +00029 template < class M > class moTS:public moAlgo < typename M::EOType >
    +00030 {
    +00031 
    +00033   typedef
    +00034     typename
    +00035     M::EOType
    +00036     EOT;
    +00037 
    +00039   typedef
    +00040     typename
    +00041     EOT::Fitness
    +00042     Fitness;
    +00043 
    +00044 public:
    +00045 
    +00047 
    +00058 moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
    +00059              (__move_init, __next_move, __incr_eval, __tabu_list,
    +00060               __aspir_crit)), cont (__cont), full_eval (__full_eval)
    +00061       {}
    +00062 
    +00064 
    +00071 moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
    +00072     cont (__cont),
    +00073     full_eval (__full_eval)
    +00074     {}
    +00075 
    +00077 
    +00085   bool operator   ()(EOT & __sol)
    +00086   {
    +00087     if (__sol.invalid ())
    +00088       {
    +00089         full_eval (__sol);
    +00090       }
    +00091 
    +00092     M move;
    +00093 
    +00094     EOT best_sol = __sol, new_sol;
    +00095 
    +00096     cont.init ();
    +00097 
    +00098     do
    +00099       {
    +00100 
    +00101         new_sol = __sol;
    +00102 
    +00103         try
    +00104         {
    +00105 
    +00106           move_expl (__sol, new_sol);
    +00107 
    +00108         }
    +00109         catch (EmptySelection & __ex)
    +00110         {
    +00111 
    +00112           break;
    +00113         }
    +00114 
    +00115         /* Updating the best solution
    +00116            found until now ? */
    +00117         if (new_sol.fitness () > __sol.fitness ())
    +00118           {
    +00119             best_sol = new_sol;
    +00120           }
    +00121 
    +00122         __sol = new_sol;
    +00123 
    +00124       }
    +00125     while (cont (__sol));
    +00126 
    +00127     __sol = best_sol;
    +00128  
    +00129     return true;
    +00130   }
    +00131 
    +00132 private:
     00133 
    -00134           break;
    -00135         }
    +00135   moMoveExpl < M > &move_expl;
     00136 
    -00137         /* Updating the best solution
    -00138            found until now ? */
    -00139         if (new_sol.fitness () > __sol.fitness ())
    -00140           {
    -00141             best_sol = new_sol;
    -00142           }
    +00138   moSolContinue < EOT > &cont;
    +00139 
    +00141   eoEvalFunc < EOT > &full_eval;
    +00142 };
     00143 
    -00144         __sol = new_sol;
    -00145 
    -00146       }
    -00147     while (cont (__sol));
    -00148 
    -00149     __sol = best_sol;
    -00150 
    -00151     pthread_mutex_unlock (&mutex);
    -00152 
    -00153     return true;
    -00154   }
    -00155 
    -00156 private:
    -00157 
    -00159   static bool first_time;
    -00160 
    -00162   static  pthread_mutex_t  mutex;
    -00163 
    -00165   moMoveExpl < M > &move_expl;
    -00166 
    -00168   moSolContinue < EOT > &cont;
    -00169 
    -00171   eoEvalFunc < EOT > &full_eval;
    -00172 };
    -00173 
    -00175 template < class EOT > pthread_mutex_t moTS < EOT >::mutex;
    -00176 
    -00178 template < class EOT > bool moTS < EOT >::first_time = true;
    -00179 
    -00180 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +00144 #endif +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html index 9c30f473a..be0f9497f 100644 --- a/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moTSMoveLoopExpl.h Source File - +
    -
    +

    moTSMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moTSMoveLoopExpl.h"
    @@ -48,88 +47,88 @@
     00024 #include "moBestImprSelect.h"
     00025 
     00027 
    -00030 template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M >
    +00030 template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M >
     00031 {
     00032 
    -00034   typedef typename M::EOType EOT;
    +00034   typedef typename M::EOType EOT;
     00035 
    -00037   typedef typename M::EOType::Fitness Fitness;
    +00037   typedef typename M::EOType::Fitness Fitness;
     00038 
     00039 public:
     00040 
     00042 
    -00049 moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
    -00050   move_init (__move_init),
    -00051     next_move (__next_move),
    -00052     incr_eval (__incr_eval),
    -00053     tabu_list (__tabu_list), aspir_crit (__aspir_crit)
    +00049 moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
    +00050   move_init (__move_init),
    +00051     next_move (__next_move),
    +00052     incr_eval (__incr_eval),
    +00053     tabu_list (__tabu_list), aspir_crit (__aspir_crit)
     00054   {
     00055 
    -00056     tabu_list.init ();
    -00057     aspir_crit.init ();
    +00056     tabu_list.init ();
    +00057     aspir_crit.init ();
     00058   }
     00059 
     00061 
    -00069   void operator   () (const EOT & __old_sol, EOT & __new_sol)
    +00069   void operator   () (const EOT & __old_sol, EOT & __new_sol)
     00070   {
     00071 
     00072     M move;
     00073 
     00074 
    -00075     move_init (move, __old_sol);        /* Restarting the exploration of 
    +00075     move_init (move, __old_sol);        /* Restarting the exploration of 
     00076                                            of the neighborhood ! */
     00077 
    -00078     move_select.init (__old_sol.fitness ());
    +00078     move_select.init (__old_sol.fitness ());
     00079 
     00080     do
     00081       {
     00082 
    -00083         Fitness fit = incr_eval (move, __old_sol);
    +00083         Fitness fit = incr_eval (move, __old_sol);
     00084 
    -00085         if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
    +00085         if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
     00086           {
    -00087             if (!move_select.update (move, fit))
    +00087             if (!move_select.update (move, fit))
     00088               break;
     00089           }
     00090 
     00091       }
    -00092     while (next_move (move, __old_sol));
    +00092     while (next_move (move, __old_sol));
     00093 
     00094     M best_move;
     00095 
    -00096     Fitness best_move_fit;
    +00096     Fitness best_move_fit;
     00097 
    -00098     move_select (best_move, best_move_fit);
    +00098     move_select (best_move, best_move_fit);
     00099 
     00100     __new_sol.fitness (best_move_fit);
     00101     best_move (__new_sol);
     00102 
     00103     /* Removing moves that are
     00104        no more tabu */
    -00105     tabu_list.update ();
    +00105     tabu_list.update ();
     00106 
     00107     // Updating the tabu list
    -00108     tabu_list.add (best_move, __new_sol);
    +00108     tabu_list.add (best_move, __new_sol);
     00109   }
     00110 
     00111 private:
     00112 
    -00114   moMoveInit < M > &move_init;
    +00114   moMoveInit < M > &move_init;
     00115 
    -00117   moNextMove < M > &next_move;
    +00117   moNextMove < M > &next_move;
     00118 
    -00120   moMoveIncrEval < M > &incr_eval;
    +00120   moMoveIncrEval < M > &incr_eval;
     00121 
    -00123   moBestImprSelect < M > move_select;
    +00123   moBestImprSelect < M > move_select;
     00124 
    -00126   moTabuList < M > &tabu_list;
    +00126   moTabuList < M > &tabu_list;
     00127 
    -00129   moAspirCrit < M > &aspir_crit;
    +00129   moAspirCrit < M > &aspir_crit;
     00130 };
     00131 
     00132 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html index 45fe4104b..c4fff4bfd 100644 --- a/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moTabuList.h Source File - +
    -
    +

    moTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
     00002 
     00003 // "moTabuList.h"
    @@ -39,30 +38,30 @@
     00015 #include <eoFunctor.h>
     00016 
     00018 
    -00022 template < class M > class moTabuList:public eoBF < const M &, const typename
    +00022 template < class M > class moTabuList:public eoBF < const M &, const typename
     00023   M::EOType &,
     00024   bool >
     00025 {
     00026 
     00027 public:
    -00029   typedef typename M::EOType EOT;
    +00029   typedef typename M::EOType EOT;
     00030 
     00032 
     00038   virtual void
    -00039   add (const M & __move, const EOT & __sol) = 0;
    +00039   add (const M & __move, const EOT & __sol) = 0;
     00040 
     00042 
     00045   virtual void
    -00046   update () = 0;
    +00046   update () = 0;
     00047 
     00049 
     00052   virtual void
    -00053   init () = 0;
    +00053   init () = 0;
     00054 };
     00055 
     00056 #endif
    -

    Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
    Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/search.idx b/trunk/paradiseo-mo/doc/html/search.idx index a53ef783960d34175939239ebf3624c3d1f70c28..9acfc7ce9ecb7684e17d1d3eaf61df0622799300 100644 GIT binary patch literal 341793 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 z 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 r - + Search - +
    • Main Page
    • @@ -374,8 +374,8 @@ main(); ?> -
      Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by  +
      Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by  -doxygen 1.5.2
      +doxygen 1.4.7
      diff --git a/trunk/paradiseo-mo/doc/html/tabs.css b/trunk/paradiseo-mo/doc/html/tabs.css index c37faafe8..a61552a67 100644 --- a/trunk/paradiseo-mo/doc/html/tabs.css +++ b/trunk/paradiseo-mo/doc/html/tabs.css @@ -82,13 +82,13 @@ DIV.tabs A:hover SPAN background-position: 0% -150px; } -DIV.tabs LI.current A +DIV.tabs LI#current A { background-position: 100% -150px; border-width : 0px; } -DIV.tabs LI.current SPAN +DIV.tabs LI#current SPAN { background-position: 0% -150px; padding-bottom : 6px; diff --git a/trunk/paradiseo-mo/doc/html/tree.html b/trunk/paradiseo-mo/doc/html/tree.html index f7599816b..8ff0fff2f 100644 --- a/trunk/paradiseo-mo/doc/html/tree.html +++ b/trunk/paradiseo-mo/doc/html/tree.html @@ -1,6 +1,6 @@ - + @@ -103,98 +103,83 @@

      |o*EmptySelection

      |o+eoFunctorBase [external]

      -

      ||o+eoBF< const M &, const M::EOType &, bool > [external]

      +

      ||o+eoBF< A1, A2, R > [external]

      -

      ||o+eoBF< const M &, const M::EOType &, M::EOType::Fitness > [external]

      - -

      ||o+eoBF< const M &, const M::EOType &, void > [external]

      - -

      ||o+eoBF< const M &, const M::EOType::Fitness &, bool > [external]

      +

      ||o+eoBF< const M::EOType &, M::EOType &, void > [external]

      -

      ||o+eoBF< const M::EOType &, M::EOType &, void > [external]

      -
      -

      |||\+moMoveExpl< M >

      - -

      ||o+eoBF< M &, const M::EOType &, bool > [external]

      - -

      ||o+eoBF< M &, const M::EOType &, void > [external]

      - -

      ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

      -
      -

      |||\+moMoveSelect< M >

      -
      +

      ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

      + -

      ||o+eoUF< const EOT &, bool > [external]

      -
      -

      |||\+moSolContinue< EOT >

      -
      +

      ||o+eoUF< const EOT &, bool > [external]

      + -

      ||o+eoUF< double &, bool > [external]

      -
      -

      |||\+moCoolingSchedule

      -
      +

      ||o+eoUF< double &, bool > [external]

      + -

      ||o+eoUF< EOT &, bool > [external]

      -
      -

      |||\+eoMonOp< EOT > [external]

      -
      +

      ||o+eoUF< EOT &, bool > [external]

      +
      +

      |||\+eoMonOp< EOT > [external]

      +
      -

      ||o+eoUF< EOT &, void > [external]

      -
      +

      ||o+eoUF< EOT &, void > [external]

      +

      ||o*eoUF< EOType &, bool > [external]

      -

      ||o+eoUF< M &, void > [external]

      -
      +

      ||o+eoUF< M &, void > [external]

      + -

      ||\+eoUF< M::EOType &, bool > [external]

      -
      -

      || \+eoMonOp< M::EOType > [external]

      -
      -

      ||  \+moAlgo< M::EOType >

      -
      +

      ||\+eoUF< M::EOType &, bool > [external]

      +
      +

      || \+eoMonOp< M::EOType > [external]

      +
      +

      ||  \+moAlgo< M::EOType >

      +

      ||   o*moHC< M >

      ||   o*moSA< M >

      ||   \*moTS< M >

      @@ -202,15 +187,15 @@
      -

      |\+eoOp< EOType > [external]

      -
      +

      |\+eoOp< EOType > [external]

      +

      | o*eoMonOp< EOT > [external]

      | \*eoMonOp< M::EOType > [external]

      o*Class Members

      -

      \+File List

      -
      +

      \+File List

      +

       o*index.h

       o*mo.h

       o*moAlgo.h

      diff --git a/trunk/paradiseo-mo/doc/latex/annotated.tex b/trunk/paradiseo-mo/doc/latex/annotated.tex index d9ae06077..cef418d52 100644 --- a/trunk/paradiseo-mo/doc/latex/annotated.tex +++ b/trunk/paradiseo-mo/doc/latex/annotated.tex @@ -1,34 +1,34 @@ \section{PARADISEO-MO Class List} Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList} -\item\contentsline{section}{{\bf EmptySelection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} -\item\contentsline{section}{{\bf moAlgo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} -\item\contentsline{section}{{\bf moAspirCrit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} -\item\contentsline{section}{{\bf moBestImprSelect$<$ M $>$} (One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} -\item\contentsline{section}{{\bf moCoolingSchedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} -\item\contentsline{section}{{\bf moExponentialCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} -\item\contentsline{section}{{\bf moFirstImprSelect$<$ M $>$} (One possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} -\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} -\item\contentsline{section}{{\bf moHC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} -\item\contentsline{section}{{\bf moHCMoveLoopExpl$<$ M $>$} (Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} -\item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item\contentsline{section}{{\bf moItRandNextMove$<$ M $>$} (One of the possible \doxyref{moNextMove}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} -\item\contentsline{section}{{\bf moLinearCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} -\item\contentsline{section}{{\bf moLSCheckPoint$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} -\item\contentsline{section}{{\bf moMove$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} -\item\contentsline{section}{{\bf moMoveExpl$<$ M $>$} (Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} -\item\contentsline{section}{{\bf moMoveIncrEval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{} -\item\contentsline{section}{{\bf moMoveInit$<$ M $>$} (Move (\doxyref{moMove}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{} -\item\contentsline{section}{{\bf moMoveLoopExpl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{} -\item\contentsline{section}{{\bf moMoveSelect$<$ M $>$} (Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} -\item\contentsline{section}{{\bf moNextMove$<$ M $>$} (Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} -\item\contentsline{section}{{\bf moNoAspirCrit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} -\item\contentsline{section}{{\bf moRandImprSelect$<$ M $>$} (One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} -\item\contentsline{section}{{\bf moRandMove$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} -\item\contentsline{section}{{\bf moSA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} -\item\contentsline{section}{{\bf moSimpleMoveTabuList$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} -\item\contentsline{section}{{\bf moSimpleSolutionTabuList$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} -\item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} -\item\contentsline{section}{{\bf moTabuList$<$ M $>$} (Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} -\item\contentsline{section}{{\bf moTS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} -\item\contentsline{section}{{\bf moTSMoveLoopExpl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} +\item\contentsline{section}{\bf{Empty\-Selection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} +\item\contentsline{section}{\bf{mo\-Algo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} +\item\contentsline{section}{\bf{mo\-Aspir\-Crit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} +\item\contentsline{section}{\bf{mo\-Best\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} +\item\contentsline{section}{\bf{mo\-Cooling\-Schedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} +\item\contentsline{section}{\bf{mo\-Exponential\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} +\item\contentsline{section}{\bf{mo\-First\-Impr\-Select$<$ M $>$} (One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} +\item\contentsline{section}{\bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-HC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} +\item\contentsline{section}{\bf{mo\-HCMove\-Loop\-Expl$<$ M $>$} (Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} +\item\contentsline{section}{\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} (One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} +\item\contentsline{section}{\bf{mo\-It\-Rand\-Next\-Move$<$ M $>$} (One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} +\item\contentsline{section}{\bf{mo\-Linear\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} +\item\contentsline{section}{\bf{mo\-LSCheck\-Point$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} +\item\contentsline{section}{\bf{mo\-Move$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} +\item\contentsline{section}{\bf{mo\-Move\-Expl$<$ M $>$} (Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} +\item\contentsline{section}{\bf{mo\-Move\-Incr\-Eval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{} +\item\contentsline{section}{\bf{mo\-Move\-Init$<$ M $>$} (Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{} +\item\contentsline{section}{\bf{mo\-Move\-Loop\-Expl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{} +\item\contentsline{section}{\bf{mo\-Move\-Select$<$ M $>$} (Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} +\item\contentsline{section}{\bf{mo\-Next\-Move$<$ M $>$} (Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} +\item\contentsline{section}{\bf{mo\-No\-Aspir\-Crit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} +\item\contentsline{section}{\bf{mo\-Rand\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} +\item\contentsline{section}{\bf{mo\-Rand\-Move$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} +\item\contentsline{section}{\bf{mo\-SA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} +\item\contentsline{section}{\bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} +\item\contentsline{section}{\bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} +\item\contentsline{section}{\bf{mo\-Sol\-Continue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Tabu\-List$<$ M $>$} (Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} +\item\contentsline{section}{\bf{mo\-TS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} +\item\contentsline{section}{\bf{mo\-TSMove\-Loop\-Expl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex b/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex index 942fea7fc..4b44303b4 100644 --- a/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex +++ b/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex @@ -1,9 +1,9 @@ -\section{EmptySelection Class Reference} +\section{Empty\-Selection Class Reference} \label{class_empty_selection}\index{EmptySelection@{EmptySelection}} Special class that describes the case of no selection. -{\tt \#include $<$moMoveSelect.h$>$} +{\tt \#include $<$mo\-Move\-Select.h$>$} @@ -14,8 +14,8 @@ This class is used as an exception that can be thrown if a solution selector has -Definition at line 21 of file moMoveSelect.h. +Definition at line 21 of file mo\-Move\-Select.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveSelect.h\end{CompactItemize} +mo\-Move\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex index 6564c8f7a..bfd2994a6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex @@ -1,11 +1,11 @@ -\section{moAlgo$<$ EOT $>$ Class Template Reference} +\section{mo\-Algo$<$ EOT $>$ Class Template Reference} \label{classmo_algo}\index{moAlgo@{moAlgo}} Description of an algorithm of the paradiseo-mo library. -{\tt \#include $<$moAlgo.h$>$} +{\tt \#include $<$mo\-Algo.h$>$} -Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_algo} @@ -14,16 +14,16 @@ Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moAlgo$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Algo$<$ EOT $>$} Description of an algorithm of the paradiseo-mo library. -\doxyref{moHC}{p.}{classmo_h_c}, \doxyref{moTS}{p.}{classmo_t_s} and \doxyref{moSA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library. +\doxyref{mo\-HC}{p.}{classmo_h_c}, \doxyref{mo\-TS}{p.}{classmo_t_s} and \doxyref{mo\-SA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library. -Definition at line 21 of file moAlgo.h. +Definition at line 21 of file mo\-Algo.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moAlgo.h\end{CompactItemize} +mo\-Algo.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps index da056c4c6..7a0252d70 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 119.76 +%%BoundingBox: 0 0 500 218.579 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.175 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw (moImprBestFitAspirCrit< M >) cw (moNoAspirCrit< M >) cw @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moAspirCrit< M >) 0.5 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0.5 2 box + (eoBF< A1, A2, R >) 0.5 2 box (eoFunctorBase) 0.5 3 box (moImprBestFitAspirCrit< M >) 0 0 box (moNoAspirCrit< M >) 1 0 box diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex index 78dea621f..8349f497a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex @@ -1,46 +1,46 @@ -\section{moAspirCrit$<$ M $>$ Class Template Reference} +\section{mo\-Aspir\-Crit$<$ M $>$ Class Template Reference} \label{classmo_aspir_crit}\index{moAspirCrit@{moAspirCrit}} Description of the conditions in which a tabu move could be accepted. -{\tt \#include $<$moAspirCrit.h$>$} +{\tt \#include $<$mo\-Aspir\-Crit.h$>$} -Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.35329cm]{classmo_aspir_crit} +\includegraphics[height=4cm]{classmo_aspir_crit} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} ()=0 +virtual void \bf{init} ()=0 \begin{CompactList}\small\item\em Procedure which initialises all that needs a aspiration criterion. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moAspirCrit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Aspir\-Crit$<$ M $>$} Description of the conditions in which a tabu move could be accepted. -It is only a description... An object that herits from this class is needed to be used in a \doxyref{moTS}{p.}{classmo_t_s}. See moNoAspriCrit for example. +It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. See mo\-No\-Aspri\-Crit for example. -Definition at line 22 of file moAspirCrit.h. +Definition at line 22 of file mo\-Aspir\-Crit.h. \subsection{Member Function Documentation} -\index{moAspirCrit@{moAspirCrit}!init@{init}} -\index{init@{init}!moAspirCrit@{moAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140} +\index{moAspirCrit@{mo\-Aspir\-Crit}!init@{init}} +\index{init@{init}!moAspirCrit@{mo\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140} Procedure which initialises all that needs a aspiration criterion. It can be possible that this procedure do nothing... -Implemented in {\bf moImprBestFitAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and {\bf moNoAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}. +Implemented in \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and \bf{mo\-No\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moAspirCrit.h\end{CompactItemize} +mo\-Aspir\-Crit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex index 1cb7a44d5..f0598e3a1 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex @@ -1,11 +1,11 @@ -\section{moBestImprSelect$<$ M $>$ Class Template Reference} +\section{mo\-Best\-Impr\-Select$<$ M $>$ Class Template Reference} \label{classmo_best_impr_select}\index{moBestImprSelect@{moBestImprSelect}} -One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. -{\tt \#include $<$moBestImprSelect.h$>$} +{\tt \#include $<$mo\-Best\-Impr\-Select.h$>$} -Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_best_impr_select} @@ -14,53 +14,53 @@ Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956} +void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956} \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item -bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em 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) +bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -bool {\bf first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13} +bool \bf{first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13} \begin{CompactList}\small\item\em Allowing to know if at least one move has been generated. \item\end{CompactList}\item -M {\bf best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a} +M \bf{best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a} \begin{CompactList}\small\item\em The best move. \item\end{CompactList}\item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_best_impr_select_dcac897424b5805f146bb1dbb429f2fe} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_best_impr_select_dcac897424b5805f146bb1dbb429f2fe} \begin{CompactList}\small\item\em The best fitness. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moBestImprSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Best\-Impr\-Select$<$ M $>$} -One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. All neighbors are considered, and the movement which enables the best improvement is selected. -Definition at line 22 of file moBestImprSelect.h. +Definition at line 22 of file mo\-Best\-Impr\-Select.h. \subsection{Member Function Documentation} -\index{moBestImprSelect@{moBestImprSelect}!update@{update}} -\index{update@{update}!moBestImprSelect@{moBestImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moBestImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} +\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!update@{update}} +\index{update@{update}!moBestImprSelect@{mo\-Best\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} -Function that indicates if the current move has not improved the fitness. +\doxyref{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. +If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) and the fitness linked to this move are saved. \begin{Desc} \item[Parameters:] @@ -71,13 +71,13 @@ If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{class \item[Returns:]TRUE if the move does not improve the fitness. \end{Desc} -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. -Definition at line 47 of file moBestImprSelect.h. +Definition at line 47 of file mo\-Best\-Impr\-Select.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, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} +References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}} +\index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -90,16 +90,16 @@ Procedure which saved the best move and fitness. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} +\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 68 of file moBestImprSelect.h. +Definition at line 68 of file mo\-Best\-Impr\-Select.h. -References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time. +References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moBestImprSelect.h\end{CompactItemize} +mo\-Best\-Impr\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex index 47648d9d0..65e4977be 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{moCoolingSchedule Class Reference} +\section{mo\-Cooling\-Schedule Class Reference} \label{classmo_cooling_schedule}\index{moCoolingSchedule@{moCoolingSchedule}} This class gives the description of a cooling schedule. -{\tt \#include $<$moCoolingSchedule.h$>$} +{\tt \#include $<$mo\-Cooling\-Schedule.h$>$} -Inheritance diagram for moCoolingSchedule::\begin{figure}[H] +Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_cooling_schedule} @@ -16,12 +16,12 @@ Inheritance diagram for moCoolingSchedule::\begin{figure}[H] \subsection{Detailed Description} This class gives the description of a cooling schedule. -It is only a description... An object that herits from this class is needed to be used in a \doxyref{moSA}{p.}{classmo_s_a}. See \doxyref{moExponentialCoolingSchedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{moLinearCoolingSchedule}{p.}{classmo_linear_cooling_schedule} for example. +It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-SA}{p.}{classmo_s_a}. See \doxyref{mo\-Exponential\-Cooling\-Schedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{mo\-Linear\-Cooling\-Schedule}{p.}{classmo_linear_cooling_schedule} for example. -Definition at line 22 of file moCoolingSchedule.h. +Definition at line 22 of file mo\-Cooling\-Schedule.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moCoolingSchedule.h\end{CompactItemize} +mo\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex index b572655f6..728025e98 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{moExponentialCoolingSchedule Class Reference} +\section{mo\-Exponential\-Cooling\-Schedule Class Reference} \label{classmo_exponential_cooling_schedule}\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. -{\tt \#include $<$moExponentialCoolingSchedule.h$>$} +{\tt \#include $<$mo\-Exponential\-Cooling\-Schedule.h$>$} -Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] +Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_exponential_cooling_schedule} @@ -14,34 +14,34 @@ Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moExponentialCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) +\bf{mo\-Exponential\-Cooling\-Schedule} (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} +bool \bf{operator()} (double \&\_\-\_\-temp) +\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -double {\bf threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} +double \bf{threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} \begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item -double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} +double \bf{ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} \begin{CompactList}\small\item\em The decreasing factor of the temperature. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold. -Definition at line 22 of file moExponentialCoolingSchedule.h. +Definition at line 22 of file mo\-Exponential\-Cooling\-Schedule.h. \subsection{Constructor \& Destructor Documentation} -\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moExponentialCoolingSchedule::moExponentialCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} +\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Exponential\-Cooling\-Schedule::mo\-Exponential\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} Simple constructor. @@ -53,15 +53,15 @@ Simple constructor. \end{Desc} -Definition at line 31 of file moExponentialCoolingSchedule.h. +Definition at line 31 of file mo\-Exponential\-Cooling\-Schedule.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, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} +\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}} +\index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} -Function which proceeds to the cooling. +\doxyref{Function} which proceeds to the cooling. It decreases the temperature and indicates if it is greater than the threshold. @@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. +Implements \bf{eo\-UF$<$ double \&, bool $>$}. -Definition at line 41 of file moExponentialCoolingSchedule.h. +Definition at line 41 of file mo\-Exponential\-Cooling\-Schedule.h. References ratio, and threshold. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moExponentialCoolingSchedule.h\end{CompactItemize} +mo\-Exponential\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex index 412bfec33..68e591cc4 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex @@ -1,11 +1,11 @@ -\section{moFirstImprSelect$<$ M $>$ Class Template Reference} +\section{mo\-First\-Impr\-Select$<$ M $>$ Class Template Reference} \label{classmo_first_impr_select}\index{moFirstImprSelect@{moFirstImprSelect}} -One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. -{\tt \#include $<$moFirstImprSelect.h$>$} +{\tt \#include $<$mo\-First\-Impr\-Select.h$>$} -Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_first_impr_select} @@ -14,68 +14,68 @@ Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) +virtual void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item -bool {\bf update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit) -\begin{CompactList}\small\item\em 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) +bool \bf{update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -bool {\bf valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c} +bool \bf{valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c} \begin{CompactList}\small\item\em Allow to know if at least one move has improved the solution. \item\end{CompactList}\item -M {\bf best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c} +M \bf{best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c} \begin{CompactList}\small\item\em Best stored movement. \item\end{CompactList}\item -{\bf Fitness} {\bf init\_\-fit}\label{classmo_first_impr_select_ce7ba63e8cc3a9164f4e546477e98ca8} +\bf{Fitness} \bf{init\_\-fit}\label{classmo_first_impr_select_ce7ba63e8cc3a9164f4e546477e98ca8} \begin{CompactList}\small\item\em Initial fitness. \item\end{CompactList}\item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_first_impr_select_e1190347b76ec6fe717be32354b4a9a9} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_first_impr_select_e1190347b76ec6fe717be32354b4a9a9} \begin{CompactList}\small\item\em Best stored fitness. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moFirstImprSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-First\-Impr\-Select$<$ M $>$} -One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. The neighborhood is explored until a move enables an improvment of the current solution. -Definition at line 23 of file moFirstImprSelect.h. +Definition at line 23 of file mo\-First\-Impr\-Select.h. \subsection{Member Function Documentation} -\index{moFirstImprSelect@{moFirstImprSelect}!init@{init}} -\index{init@{init}!moFirstImprSelect@{moFirstImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moFirstImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055} +\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!init@{init}} +\index{init@{init}!moFirstImprSelect@{mo\-First\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-First\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055} Procedure which initialise the exploration. It save the current fitness as the initial value for the fitness. -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. -Definition at line 35 of file moFirstImprSelect.h. +Definition at line 35 of file mo\-First\-Impr\-Select.h. -References moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!update@{update}} -\index{update@{update}!moFirstImprSelect@{moFirstImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moFirstImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} +References mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!update@{update}} +\index{update@{update}!moFirstImprSelect@{mo\-First\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} -Function that indicates if the current move has not improved the fitness. +\doxyref{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. +If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) should be applied to the current solution. \begin{Desc} \item[Parameters:] @@ -86,11 +86,11 @@ If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{class \item[Returns:]TRUE if the move does not improve the fitness. \end{Desc} -Definition at line 52 of file moFirstImprSelect.h. +Definition at line 52 of file mo\-First\-Impr\-Select.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, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} +References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}} +\index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -103,16 +103,16 @@ Procedure which saved the best move and fitness. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} +\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 76 of file moFirstImprSelect.h. +Definition at line 76 of file mo\-First\-Impr\-Select.h. -References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid. +References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moFirstImprSelect.h\end{CompactItemize} +mo\-First\-Impr\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex index 19c044b84..e123e64bb 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -1,11 +1,11 @@ -\section{moGenSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Gen\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_gen_sol_continue}\index{moGenSolContinue@{moGenSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$moGenSolContinue.h$>$} +{\tt \#include $<$mo\-Gen\-Sol\-Continue.h$>$} -Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_gen_sol_continue} @@ -14,25 +14,25 @@ Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moGenSolContinue} (unsigned int \_\-\_\-maxNumGen) +\bf{mo\-Gen\-Sol\-Continue} (unsigned int \_\-\_\-max\-Num\-Gen) \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 -void {\bf init} () +bool \bf{operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stop criterion. \item\end{CompactList}\item +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxNumGen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a} +unsigned int \bf{max\-Num\-Gen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a} \begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item -unsigned int {\bf numGen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c} +unsigned int \bf{num\-Gen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c} \begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moGenSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Gen\-Sol\-Continue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -40,12 +40,12 @@ The stop criterion corresponds to a maximum number of iteration. -Definition at line 21 of file moGenSolContinue.h. +Definition at line 21 of file mo\-Gen\-Sol\-Continue.h. \subsection{Constructor \& Destructor Documentation} -\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}} -\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moGenSolContinue}$<$ EOT $>$::{\bf moGenSolContinue} (unsigned int {\em \_\-\_\-maxNumGen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b} +\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!moGenSolContinue@{moGenSolContinue}} +\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Gen\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Num\-Gen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b} Simple constructor. @@ -53,19 +53,19 @@ Simple constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumGen}]the maximum number of generation. \end{description} +\item[{\em \_\-\_\-max\-Num\-Gen}]the maximum number of generation. \end{description} \end{Desc} -Definition at line 30 of file moGenSolContinue.h. +Definition at line 30 of file mo\-Gen\-Sol\-Continue.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, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} +\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} -Function that activates the stop criterion. +\doxyref{Function} that activates the stop criterion. Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations. @@ -78,25 +78,25 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. -Definition at line 44 of file moGenSolContinue.h. +Definition at line 44 of file mo\-Gen\-Sol\-Continue.h. -References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}} -\index{init@{init}!moGenSolContinue@{moGenSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moGenSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} +References mo\-Gen\-Sol\-Continue$<$ EOT $>$::max\-Num\-Gen, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}} +\index{init@{init}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} Procedure which allows to initialise the generation counter. It can also be used to reset the iteration counter. -Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 54 of file moGenSolContinue.h. +Definition at line 54 of file mo\-Gen\-Sol\-Continue.h. -References moGenSolContinue$<$ EOT $>$::numGen. +References mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moGenSolContinue.h\end{CompactItemize} +mo\-Gen\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex index b402914eb..ef82357b0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex @@ -1,11 +1,11 @@ -\section{moHC$<$ M $>$ Class Template Reference} +\section{mo\-HC$<$ M $>$ Class Template Reference} \label{classmo_h_c}\index{moHC@{moHC}} Hill Climbing (HC). -{\tt \#include $<$moHC.h$>$} +{\tt \#include $<$mo\-HC.h$>$} -Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_h_c} @@ -14,34 +14,34 @@ Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H] \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, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, \bf{eo\-Eval\-Func}$<$ \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} +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which launches the HC. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb} +typedef M::EOType \bf{EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027} +typedef EOT::Fitness \bf{Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} +\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moHC$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-HC$<$ M $>$} Hill Climbing (HC). @@ -49,17 +49,17 @@ Class which describes the algorithm for a hill climbing. -Definition at line 26 of file moHC.h. +Definition at line 26 of file mo\-HC.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}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} +\index{moHC@{mo\-HC}!moHC@{moHC}} +\index{moHC@{moHC}!moHC@{mo\-HC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} Full constructor. -All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}. +All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}. \begin{Desc} \item[Parameters:] @@ -68,14 +68,14 @@ All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{ \end{Desc} -Definition at line 53 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}} -\index{moHC@{moHC}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} +Definition at line 53 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}} +\index{moHC@{moHC}!moHC@{mo\-HC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} Light constructor. -This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl} (generally not a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}). +This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_expl} (generally not a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}). \begin{Desc} \item[Parameters:] @@ -84,17 +84,17 @@ 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 67 of file mo\-HC.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, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} +\index{moHC@{mo\-HC}!operator()@{operator()}} +\index{operator()@{operator()}!moHC@{mo\-HC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-HC}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} -Function which launches the HC. +\doxyref{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. +The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. \begin{Desc} \item[Parameters:] @@ -105,12 +105,12 @@ The HC 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 $>$}. +Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}. -Definition at line 82 of file moHC.h. +Definition at line 82 of file mo\-HC.h. -References moHC$<$ M $>$::full\_\-eval, and moHC$<$ M $>$::move\_\-expl. +References mo\-HC$<$ M $>$::full\_\-eval, and mo\-HC$<$ M $>$::move\_\-expl. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moHC.h\end{CompactItemize} +mo\-HC.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex index 776f8a638..8b96d664a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{moHCMoveLoopExpl$<$ M $>$ Class Template Reference} +\section{mo\-HCMove\-Loop\-Expl$<$ M $>$ Class Template Reference} \label{classmo_h_c_move_loop_expl}\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}} -Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. +Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. -{\tt \#include $<$moHCMoveLoopExpl.h$>$} +{\tt \#include $<$mo\-HCMove\-Loop\-Expl.h$>$} -Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_h_c_move_loop_expl} @@ -14,49 +14,49 @@ Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select) +\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol) +void \bf{operator()} (const \bf{EOT} \&\_\-\_\-old\_\-sol, \bf{EOT} \&\_\-\_\-new\_\-sol) \begin{CompactList}\small\item\em Procedure which launches the explorer. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9} +typedef M::EOType \bf{EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc} +\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc} \begin{CompactList}\small\item\em Move initialiser. \item\end{CompactList}\item -{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443} +\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779} +\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779} \begin{CompactList}\small\item\em (generally) Efficient evaluation. \item\end{CompactList}\item -{\bf moMoveSelect}$<$ M $>$ \& {\bf move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb} +\bf{mo\-Move\-Select}$<$ M $>$ \& \bf{move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb} \begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moHCMoveLoopExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-HCMove\-Loop\-Expl$<$ M $>$} -Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. +Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. -Definition at line 23 of file moHCMoveLoopExpl.h. +Definition at line 23 of file mo\-HCMove\-Loop\-Expl.h. \subsection{Constructor \& Destructor Documentation} -\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHCMoveLoopExpl}$<$ M $>$::{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5} +\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} +\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5} Constructor. @@ -70,12 +70,12 @@ All the boxes have to be specified. \end{Desc} -Definition at line 43 of file moHCMoveLoopExpl.h. +Definition at line 43 of file mo\-HCMove\-Loop\-Expl.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, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} +\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}} +\index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-\_\-old\_\-sol}, \bf{EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,12 +89,12 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Implements \bf{eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. -Definition at line 59 of file moHCMoveLoopExpl.h. +Definition at line 59 of file mo\-HCMove\-Loop\-Expl.h. -References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move. +References mo\-HCMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-select, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moHCMoveLoopExpl.h\end{CompactItemize} +mo\-HCMove\-Loop\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps index b569936e2..a00a3c3cb 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 239.521 +%%BoundingBox: 0 0 500 437.158 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.14375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moImprBestFitAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moImprBestFitAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex index 6647d77fa..c1ffc5c16 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex @@ -1,11 +1,11 @@ -\section{moImprBestFitAspirCrit$<$ M $>$ Class Template Reference} +\section{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$ Class Template Reference} \label{classmo_impr_best_fit_aspir_crit}\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}} -One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. +One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. -{\tt \#include $<$moImprBestFitAspirCrit.h$>$} +{\tt \#include $<$mo\-Impr\-Best\-Fit\-Aspir\-Crit.h$>$} -Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit} @@ -14,49 +14,49 @@ Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moImprBestFitAspirCrit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340} +\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340} \begin{CompactList}\small\item\em Contructor. \item\end{CompactList}\item -void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630} +void \bf{init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630} \begin{CompactList}\small\item\em Initialisation procedure. \item\end{CompactList}\item -bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Function that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3} \begin{CompactList}\small\item\em Best fitness found until now. \item\end{CompactList}\item -bool {\bf first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265} +bool \bf{first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265} \begin{CompactList}\small\item\em Indicates that a fitness has been already saved or not. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moImprBestFitAspirCrit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} -One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. +One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. This criterion is satisfied when a given fitness is the best ever considered. -Definition at line 22 of file moImprBestFitAspirCrit.h. +Definition at line 22 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.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, virtual]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} +\index{moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}!operator()@{operator()}} +\index{operator()@{operator()}!moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} -Function that indicates if the fit is better that the already saved fit. +\doxyref{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,12 +69,10 @@ 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 mo\-Impr\-Best\-Fit\-Aspir\-Crit.h. -Definition at line 52 of file moImprBestFitAspirCrit.h. - -References moImprBestFitAspirCrit$<$ M $>$::best\_\-fit, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time. +References mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::best\_\-fit, and mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::first\_\-time. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moImprBestFitAspirCrit.h\end{CompactItemize} +mo\-Impr\-Best\-Fit\-Aspir\-Crit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps index 3c5267824..5f2df0014 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 316.206 +%%BoundingBox: 0 0 500 490.798 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moItRandNextMove< M >) cw (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moItRandNextMove< M >) 0 0 box (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex index e7abc9a90..b14d59d18 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex @@ -1,11 +1,11 @@ -\section{moItRandNextMove$<$ M $>$ Class Template Reference} +\section{mo\-It\-Rand\-Next\-Move$<$ M $>$ Class Template Reference} \label{classmo_it_rand_next_move}\index{moItRandNextMove@{moItRandNextMove}} -One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. +One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. -{\tt \#include $<$moItRandNextMove.h$>$} +{\tt \#include $<$mo\-It\-Rand\-Next\-Move.h$>$} -Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_it_rand_next_move} @@ -14,50 +14,50 @@ Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter) +\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter) \begin{CompactList}\small\item\em The constructor. \item\end{CompactList}\item -bool {\bf operator()} (M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Generation of a new move. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf} +typedef M::EOType \bf{EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moRandMove}$<$ M $>$ \& {\bf rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459} +\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459} \begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item -unsigned int {\bf max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033} +unsigned int \bf{max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033} \begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item -unsigned int {\bf num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b} +unsigned int \bf{num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b} \begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moItRandNextMove$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-It\-Rand\-Next\-Move$<$ M $>$} -One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. +One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. -This class is a move (\doxyref{moMove}{p.}{classmo_move}) generator with a bound for the maximum number of iterations. +This class is a move (\doxyref{mo\-Move}{p.}{classmo_move}) generator with a bound for the maximum number of iterations. -Definition at line 22 of file moItRandNextMove.h. +Definition at line 22 of file mo\-It\-Rand\-Next\-Move.h. \subsection{Constructor \& Destructor Documentation} -\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}} -\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moItRandNextMove}$<$ M $>$::{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a} +\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!moItRandNextMove@{moItRandNextMove}} +\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a} The constructor. -{\bf Parameters} only for initialising the attributes. +\doxyref{Parameters} only for initialising the attributes. \begin{Desc} \item[Parameters:] @@ -66,12 +66,12 @@ The constructor. \end{Desc} -Definition at line 37 of file moItRandNextMove.h. +Definition at line 37 of file mo\-It\-Rand\-Next\-Move.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, virtual]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} +\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!operator()@{operator()}} +\index{operator()@{operator()}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} Generation of a new move. @@ -87,12 +87,10 @@ 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 mo\-It\-Rand\-Next\-Move.h. -Definition at line 52 of file moItRandNextMove.h. - -References moItRandNextMove$<$ M $>$::max\_\-iter, moItRandNextMove$<$ M $>$::num\_\-iter, and moItRandNextMove$<$ M $>$::rand\_\-move. +References mo\-It\-Rand\-Next\-Move$<$ M $>$::max\_\-iter, mo\-It\-Rand\-Next\-Move$<$ M $>$::num\_\-iter, and mo\-It\-Rand\-Next\-Move$<$ M $>$::rand\_\-move. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moItRandNextMove.h\end{CompactItemize} +mo\-It\-Rand\-Next\-Move.h\end{CompactItemize} 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 b9d378132..9ac583db0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex @@ -1,11 +1,11 @@ -\section{moLSCheckPoint$<$ M $>$ Class Template Reference} +\section{mo\-LSCheck\-Point$<$ M $>$ Class Template Reference} \label{classmo_l_s_check_point}\index{moLSCheckPoint@{moLSCheckPoint}} Class which allows a checkpointing system. -{\tt \#include $<$moLSCheckPoint.h$>$} +{\tt \#include $<$mo\-LSCheck\-Point.h$>$} -Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_l_s_check_point} @@ -14,20 +14,20 @@ Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) -\begin{CompactList}\small\item\em Function which launches the checkpointing. \item\end{CompactList}\item -void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) +void \bf{operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which launches the checkpointing. \item\end{CompactList}\item +void \bf{add} (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ {\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} +std::vector$<$ \bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ \bf{func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} \begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moLSCheckPoint$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-LSCheck\-Point$<$ M $>$} Class which allows a checkpointing system. @@ -35,15 +35,15 @@ Thanks to this class, at each iteration, additionnal function can be used (and n -Definition at line 21 of file moLSCheckPoint.h. +Definition at line 21 of file mo\-LSCheck\-Point.h. \subsection{Member Function Documentation} -\index{moLSCheckPoint@{moLSCheckPoint}!operator()@{operator()}} -\index{operator()@{operator()}!moLSCheckPoint@{moLSCheckPoint}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} +\index{moLSCheckPoint@{mo\-LSCheck\-Point}!operator()@{operator()}} +\index{operator()@{operator()}!moLSCheckPoint@{mo\-LSCheck\-Point}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} -Function which launches the checkpointing. +\doxyref{Function} which launches the checkpointing. Each saved function is used on the current move and the current solution. @@ -54,11 +54,11 @@ Each saved function is used on the current move and the current solution. \end{Desc} -Definition at line 34 of file moLSCheckPoint.h. +Definition at line 34 of file mo\-LSCheck\-Point.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 ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} +References mo\-LSCheck\-Point$<$ M $>$::func.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}} +\index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::add (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} Procedure which add a new function to the function vector. @@ -70,10 +70,10 @@ The new function is added at the end of the vector. \begin{Desc} \end{Desc} -Definition at line 49 of file moLSCheckPoint.h. +Definition at line 49 of file mo\-LSCheck\-Point.h. -References moLSCheckPoint$<$ M $>$::func. +References mo\-LSCheck\-Point$<$ M $>$::func. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moLSCheckPoint.h\end{CompactItemize} +mo\-LSCheck\-Point.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex index 59b77e02d..5a239d9f4 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{moLinearCoolingSchedule Class Reference} +\section{mo\-Linear\-Cooling\-Schedule Class Reference} \label{classmo_linear_cooling_schedule}\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. -{\tt \#include $<$moLinearCoolingSchedule.h$>$} +{\tt \#include $<$mo\-Linear\-Cooling\-Schedule.h$>$} -Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H] +Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_linear_cooling_schedule} @@ -14,34 +14,34 @@ Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moLinearCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) +\bf{mo\-Linear\-Cooling\-Schedule} (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} +bool \bf{operator()} (double \&\_\-\_\-temp) +\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -double {\bf threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} +double \bf{threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} \begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item -double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} +double \bf{quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} \begin{CompactList}\small\item\em The quantity that allows the temperature to decrease. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. -Definition at line 22 of file moLinearCoolingSchedule.h. +Definition at line 22 of file mo\-Linear\-Cooling\-Schedule.h. \subsection{Constructor \& Destructor Documentation} -\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moLinearCoolingSchedule::moLinearCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} +\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} +\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Linear\-Cooling\-Schedule::mo\-Linear\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} Simple constructor. @@ -53,15 +53,15 @@ Simple constructor. \end{Desc} -Definition at line 31 of file moLinearCoolingSchedule.h. +Definition at line 31 of file mo\-Linear\-Cooling\-Schedule.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, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} +\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}} +\index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} -Function which proceeds to the cooling. +\doxyref{Function} which proceeds to the cooling. It decreases the temperature and indicates if it is greater than the threshold. @@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. +Implements \bf{eo\-UF$<$ double \&, bool $>$}. -Definition at line 41 of file moLinearCoolingSchedule.h. +Definition at line 41 of file mo\-Linear\-Cooling\-Schedule.h. References quantity, and threshold. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moLinearCoolingSchedule.h\end{CompactItemize} +mo\-Linear\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_move.tex index e178fa21e..05267ce0e 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move.tex @@ -1,11 +1,11 @@ -\section{moMove$<$ EOT $>$ Class Template Reference} +\section{mo\-Move$<$ EOT $>$ Class Template Reference} \label{classmo_move}\index{moMove@{moMove}} Definition of a move. -{\tt \#include $<$moMove.h$>$} +{\tt \#include $<$mo\-Move.h$>$} -Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move} @@ -14,13 +14,13 @@ Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT {\bf EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba} +typedef EOT \bf{EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moMove$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Move$<$ EOT $>$} Definition of a move. @@ -28,8 +28,8 @@ A move transforms a solution to another close solution. It describes how a solut -Definition at line 23 of file moMove.h. +Definition at line 23 of file mo\-Move.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMove.h\end{CompactItemize} +mo\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex index 0e4a7e621..5d0b1e66b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex @@ -1,11 +1,11 @@ -\section{moMoveExpl$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Expl$<$ M $>$ Class Template Reference} \label{classmo_move_expl}\index{moMoveExpl@{moMoveExpl}} -Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. +Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. -{\tt \#include $<$moMoveExpl.h$>$} +{\tt \#include $<$mo\-Move\-Expl.h$>$} -Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4.59016cm]{classmo_move_expl} @@ -14,16 +14,16 @@ Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Expl$<$ M $>$} -Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. +Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. -Only a description...See \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}. +Only a description...See \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}. -Definition at line 21 of file moMoveExpl.h. +Definition at line 21 of file mo\-Move\-Expl.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveExpl.h\end{CompactItemize} +mo\-Move\-Expl.h\end{CompactItemize} 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 85bba26c1..91421ef4b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex @@ -1,11 +1,11 @@ -\section{moMoveIncrEval$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Incr\-Eval$<$ M $>$ Class Template Reference} \label{classmo_move_incr_eval}\index{moMoveIncrEval@{moMoveIncrEval}} (generally) Efficient evaluation function based a move and a solution. -{\tt \#include $<$moMoveIncrEval.h$>$} +{\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$} -Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move_incr_eval} @@ -14,7 +14,7 @@ Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveIncrEval$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Incr\-Eval$<$ M $>$} (generally) Efficient evaluation function based a move and a solution. @@ -22,8 +22,8 @@ From a move and a solution, it computes a new fitness that could be associated t -Definition at line 24 of file moMoveIncrEval.h. +Definition at line 24 of file mo\-Move\-Incr\-Eval.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveIncrEval.h\end{CompactItemize} +mo\-Move\-Incr\-Eval.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex index 904ac7911..353911436 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex @@ -1,11 +1,11 @@ -\section{moMoveInit$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Init$<$ M $>$ Class Template Reference} \label{classmo_move_init}\index{moMoveInit@{moMoveInit}} -Move (\doxyref{moMove}{p.}{classmo_move}) initializer. +Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. -{\tt \#include $<$moMoveInit.h$>$} +{\tt \#include $<$mo\-Move\-Init.h$>$} -Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move_init} @@ -14,16 +14,16 @@ Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveInit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Init$<$ M $>$} -Move (\doxyref{moMove}{p.}{classmo_move}) initializer. +Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used. -Definition at line 22 of file moMoveInit.h. +Definition at line 22 of file mo\-Move\-Init.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveInit.h\end{CompactItemize} +mo\-Move\-Init.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex index 15968268f..1a6c5b997 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{moMoveLoopExpl$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Loop\-Expl$<$ M $>$ Class Template Reference} \label{classmo_move_loop_expl}\index{moMoveLoopExpl@{moMoveLoopExpl}} Class which describes an iterative explorer. -{\tt \#include $<$moMoveLoopExpl.h$>$} +{\tt \#include $<$mo\-Move\-Loop\-Expl.h$>$} -Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4.59016cm]{classmo_move_loop_expl} @@ -14,16 +14,16 @@ Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveLoopExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Loop\-Expl$<$ M $>$} Class which describes an iterative explorer. -Only a description... \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}. +Only a description... \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}. -Definition at line 21 of file moMoveLoopExpl.h. +Definition at line 21 of file mo\-Move\-Loop\-Expl.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveLoopExpl.h\end{CompactItemize} +mo\-Move\-Loop\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex index 82d8378b7..6a9be3909 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex @@ -1,11 +1,11 @@ -\section{moMoveSelect$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Select$<$ M $>$ Class Template Reference} \label{classmo_move_select}\index{moMoveSelect@{moMoveSelect}} -Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). +Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). -{\tt \#include $<$moMoveSelect.h$>$} +{\tt \#include $<$mo\-Move\-Select.h$>$} -Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2.82828cm]{classmo_move_select} @@ -14,33 +14,33 @@ Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)=0 +virtual void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)=0 \begin{CompactList}\small\item\em Procedure which initialises all that the move selector needs including the initial fitness. \item\end{CompactList}\item -virtual bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)=0 -\begin{CompactList}\small\item\em Function which updates the best solutions. \item\end{CompactList}\end{CompactItemize} +virtual bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)=0 +\begin{CompactList}\small\item\em \doxyref{Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Select$<$ M $>$} -Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). +Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). -It iteratively considers some moves (\doxyref{moMove}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. +It iteratively considers some moves (\doxyref{mo\-Move}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. -Definition at line 32 of file moMoveSelect.h. +Definition at line 32 of file mo\-Move\-Select.h. \subsection{Member Function Documentation} -\index{moMoveSelect@{moMoveSelect}!init@{init}} -\index{init@{init}!moMoveSelect@{moMoveSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moMoveSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e} +\index{moMoveSelect@{mo\-Move\-Select}!init@{init}} +\index{init@{init}!moMoveSelect@{mo\-Move\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Move\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e} Procedure which initialises all that the move selector needs including the initial fitness. @@ -54,12 +54,12 @@ In order to know the fitness of the solution, for which the neighborhood will be \end{Desc} -Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, {\bf moFirstImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{moMoveSelect}!update@{update}} -\index{update@{update}!moMoveSelect@{moMoveSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf moMoveSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} +Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, \bf{mo\-First\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{mo\-Move\-Select}!update@{update}} +\index{update@{update}!moMoveSelect@{mo\-Move\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool \bf{mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} -Function which updates the best solutions. +\doxyref{Function} which updates the best solutions. \begin{Desc} \item[Parameters:] @@ -70,8 +70,8 @@ Function which updates the best solutions. \item[Returns:]a boolean that expresses the need to resume the exploration. \end{Desc} -Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}. +Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveSelect.h\end{CompactItemize} +mo\-Move\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps index dfda1c365..08b997f12 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 316.206 +%%BoundingBox: 0 0 500 490.798 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw (moItRandNextMove< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -189,7 +189,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box (moItRandNextMove< M >) 0 0 box diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex index 3fdea7d9d..7da58dd8d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex @@ -1,11 +1,11 @@ -\section{moNextMove$<$ M $>$ Class Template Reference} +\section{mo\-Next\-Move$<$ M $>$ Class Template Reference} \label{classmo_next_move}\index{moNextMove@{moNextMove}} -Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). +Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}). -{\tt \#include $<$moNextMove.h$>$} +{\tt \#include $<$mo\-Next\-Move.h$>$} -Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_next_move} @@ -14,16 +14,16 @@ Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moNextMove$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Next\-Move$<$ M $>$} -Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). +Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}). -Useful for the explorer (for \doxyref{moTS}{p.}{classmo_t_s} or \doxyref{moHC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used. +Useful for the explorer (for \doxyref{mo\-TS}{p.}{classmo_t_s} or \doxyref{mo\-HC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used. -Definition at line 22 of file moNextMove.h. +Definition at line 22 of file mo\-Next\-Move.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moNextMove.h\end{CompactItemize} +mo\-Next\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps index 8bc333965..f5d50a373 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 239.521 +%%BoundingBox: 0 0 500 583.942 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moNoAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moNoAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex index c9169ff46..88109d6be 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex @@ -1,11 +1,11 @@ -\section{moNoAspirCrit$<$ M $>$ Class Template Reference} +\section{mo\-No\-Aspir\-Crit$<$ M $>$ Class Template Reference} \label{classmo_no_aspir_crit}\index{moNoAspirCrit@{moNoAspirCrit}} -One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}). +One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}). -{\tt \#include $<$moNoAspirCrit.h$>$} +{\tt \#include $<$mo\-No\-Aspir\-Crit.h$>$} -Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_no_aspir_crit} @@ -14,30 +14,30 @@ Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H] \subsection*{Private Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) -\begin{CompactList}\small\item\em 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} +bool \bf{operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item +void \bf{init} () +\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moNoAspirCrit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-No\-Aspir\-Crit$<$ M $>$} -One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}). +One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}). The simplest : never satisfied. -Definition at line 21 of file moNoAspirCrit.h. +Definition at line 21 of file mo\-No\-Aspir\-Crit.h. \subsection{Member Function Documentation} -\index{moNoAspirCrit@{moNoAspirCrit}!operator()@{operator()}} -\index{operator()@{operator()}!moNoAspirCrit@{moNoAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moNoAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} +\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!operator()@{operator()}} +\index{operator()@{operator()}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} -Function which describes the aspiration criterion behaviour. +\doxyref{Function} which describes the aspiration criterion behaviour. Does nothing. @@ -50,19 +50,19 @@ Does nothing. \item[Returns:]FALSE. \end{Desc} -Definition at line 32 of file moNoAspirCrit.h.\index{moNoAspirCrit@{moNoAspirCrit}!init@{init}} -\index{init@{init}!moNoAspirCrit@{moNoAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moNoAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} +Definition at line 32 of file mo\-No\-Aspir\-Crit.h.\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!init@{init}} +\index{init@{init}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} -Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. +Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. Nothing... -Implements {\bf moAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}. +Implements \bf{mo\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}. -Definition at line 43 of file moNoAspirCrit.h. +Definition at line 43 of file mo\-No\-Aspir\-Crit.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moNoAspirCrit.h\end{CompactItemize} +mo\-No\-Aspir\-Crit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex index 965d745cd..5e7d64978 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex @@ -1,11 +1,11 @@ -\section{moRandImprSelect$<$ M $>$ Class Template Reference} +\section{mo\-Rand\-Impr\-Select$<$ M $>$ Class Template Reference} \label{classmo_rand_impr_select}\index{moRandImprSelect@{moRandImprSelect}} -One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}). +One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}). -{\tt \#include $<$moRandImprSelect.h$>$} +{\tt \#include $<$mo\-Rand\-Impr\-Select.h$>$} -Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_rand_impr_select} @@ -14,50 +14,50 @@ Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item -bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Function that updates the fitness and move vectors. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) +void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item +bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that updates the fitness and move vectors. \item\end{CompactList}\item +void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf init\_\-fit}\label{classmo_rand_impr_select_d153c277a0a2ea95ac484210d445b40e} +\bf{Fitness} \bf{init\_\-fit}\label{classmo_rand_impr_select_d153c277a0a2ea95ac484210d445b40e} \begin{CompactList}\small\item\em Fitness of the current solution. \item\end{CompactList}\item -std::vector$<$ {\bf Fitness} $>$ {\bf vect\_\-better\_\-fit}\label{classmo_rand_impr_select_05c7c3b858e8a25632f2f5c86b0c97a3} +std::vector$<$ \bf{Fitness} $>$ \bf{vect\_\-better\_\-fit}\label{classmo_rand_impr_select_05c7c3b858e8a25632f2f5c86b0c97a3} \begin{CompactList}\small\item\em Candidate fitnesse vector. \item\end{CompactList}\item -std::vector$<$ M $>$ {\bf vect\_\-better\_\-moves}\label{classmo_rand_impr_select_2ace12bd179144fa71d56324694201f5} +std::vector$<$ M $>$ \bf{vect\_\-better\_\-moves}\label{classmo_rand_impr_select_2ace12bd179144fa71d56324694201f5} \begin{CompactList}\small\item\em Candidate move vector. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moRandImprSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Rand\-Impr\-Select$<$ M $>$} -One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}). +One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}). All the neighbors are considered. One of them that enables an improvment of the objective function is choosen. -Definition at line 25 of file moRandImprSelect.h. +Definition at line 25 of file mo\-Rand\-Impr\-Select.h. \subsection{Member Function Documentation} -\index{moRandImprSelect@{moRandImprSelect}!init@{init}} -\index{init@{init}!moRandImprSelect@{moRandImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9} +\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!init@{init}} +\index{init@{init}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9} -Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. +Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. Give a value to the initialise fitness. Clean the move and fitness vectors. @@ -68,16 +68,16 @@ Give a value to the initialise fitness. Clean the move and fitness vectors. \end{Desc} -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. -Definition at line 40 of file moRandImprSelect.h. +Definition at line 40 of file mo\-Rand\-Impr\-Select.h. -References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!update@{update}} -\index{update@{update}!moRandImprSelect@{moRandImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moRandImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} +References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!update@{update}} +\index{update@{update}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} -Function that updates the fitness and move vectors. +\doxyref{Function} that updates the fitness and move vectors. if a move give a better fitness than the initial fitness, it is saved and the fitness too. @@ -90,13 +90,13 @@ if a move give a better fitness than the initial fitness, it is saved and the fi \item[Returns:]TRUE. \end{Desc} -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. -Definition at line 56 of file moRandImprSelect.h. +Definition at line 56 of file mo\-Rand\-Impr\-Select.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, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} +References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}} +\index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -111,16 +111,16 @@ One the saved move is randomly chosen. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description} +\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description} \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 77 of file moRandImprSelect.h. +Definition at line 77 of file mo\-Rand\-Impr\-Select.h. -References eoRng::random(), moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves. +References eo\-Rng::random(), mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moRandImprSelect.h\end{CompactItemize} +mo\-Rand\-Impr\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex index 665d27245..a35b6919a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex @@ -1,11 +1,11 @@ -\section{moRandMove$<$ M $>$ Class Template Reference} +\section{mo\-Rand\-Move$<$ M $>$ Class Template Reference} \label{classmo_rand_move}\index{moRandMove@{moRandMove}} Random move generator. -{\tt \#include $<$moRandMove.h$>$} +{\tt \#include $<$mo\-Rand\-Move.h$>$} -Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_rand_move} @@ -14,16 +14,16 @@ Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moRandMove$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Rand\-Move$<$ M $>$} Random move generator. -Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{moSA}{p.}{classmo_s_a}. +Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{mo\-SA}{p.}{classmo_s_a}. -Definition at line 21 of file moRandMove.h. +Definition at line 21 of file mo\-Rand\-Move.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moRandMove.h\end{CompactItemize} +mo\-Rand\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex index a58e3a510..017b05804 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex @@ -1,11 +1,11 @@ -\section{moSA$<$ M $>$ Class Template Reference} +\section{mo\-SA$<$ M $>$ Class Template Reference} \label{classmo_s_a}\index{moSA@{moSA}} Simulated Annealing (SA). -{\tt \#include $<$moSA.h$>$} +{\tt \#include $<$mo\-SA.h$>$} -Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_s_a} @@ -14,44 +14,44 @@ Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H] \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, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, \bf{mo\-Cooling\-Schedule} \&\_\-\_\-cool\_\-sched, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item -bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5} +typedef M::EOType \bf{EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b} +typedef EOT::Fitness \bf{Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moRandMove}$<$ M $>$ \& {\bf move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec} +\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec} \begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item -{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc} +\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc} \begin{CompactList}\small\item\em A (generally) efficient evaluation function. \item\end{CompactList}\item -{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716} +\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716} \begin{CompactList}\small\item\em Stopping criterion before temperature update. \item\end{CompactList}\item -double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} +double \bf{init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} \begin{CompactList}\small\item\em Initial temperature. \item\end{CompactList}\item -{\bf moCoolingSchedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} +\bf{mo\-Cooling\-Schedule} \& \bf{cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moSA$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-SA$<$ M $>$} Simulated Annealing (SA). @@ -59,12 +59,12 @@ Class that describes a Simulated Annealing algorithm. -Definition at line 30 of file moSA.h. +Definition at line 30 of file mo\-SA.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}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} +\index{moSA@{mo\-SA}!moSA@{moSA}} +\index{moSA@{moSA}!moSA@{mo\-SA}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-SA}$<$ M $>$::\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} SA constructor. @@ -78,17 +78,17 @@ All the boxes used by a SA need to be given. \end{Desc} -Definition at line 58 of file moSA.h. +Definition at line 58 of file mo\-SA.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, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} +\index{moSA@{mo\-SA}!operator()@{operator()}} +\index{operator()@{operator()}!moSA@{mo\-SA}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-SA}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} function that launches the SA algorithm. -As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm. +As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm. \begin{Desc} \item[Parameters:] @@ -99,12 +99,12 @@ 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 $>$}. +Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}. -Definition at line 80 of file moSA.h. +Definition at line 80 of file mo\-SA.h. -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(). +References mo\-SA$<$ M $>$::cont, mo\-SA$<$ M $>$::cool\_\-sched, mo\-SA$<$ M $>$::full\_\-eval, mo\-SA$<$ M $>$::incr\_\-eval, mo\-SA$<$ M $>$::init\_\-temp, mo\-SA$<$ M $>$::move\_\-rand, and eo\-Rng::uniform(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSA.h\end{CompactItemize} +mo\-SA.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps index 95d9a8476..b0dcef476 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 277.778 +%%BoundingBox: 0 0 500 427.807 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.16875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moSimpleMoveTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleMoveTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex index d80f3328b..729e656e6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex @@ -1,11 +1,11 @@ -\section{moSimpleMoveTabuList$<$ M $>$ Class Template Reference} +\section{mo\-Simple\-Move\-Tabu\-List$<$ M $>$ Class Template Reference} \label{classmo_simple_move_tabu_list}\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}} Class describing a move tabu list with a limited memory. -{\tt \#include $<$moSimpleMoveTabuList.h$>$} +{\tt \#include $<$mo\-Simple\-Move\-Tabu\-List.h$>$} -Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_simple_move_tabu_list} @@ -14,75 +14,73 @@ Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7} +typedef M::EOType \bf{EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSimpleMoveTabuList} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79} +\bf{mo\-Simple\-Move\-Tabu\-List} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79} \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item -void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item -void {\bf update} () +void \bf{update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf removeMove} (const M \&\_\-\_\-move) +void \bf{remove\-Move} (const M \&\_\-\_\-move) \begin{CompactList}\small\item\em Procedure that removes a given move from the tabu list (if it is into, else do nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxSize}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23} +unsigned int \bf{max\-Size}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23} \begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item -unsigned int {\bf currentSize}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb} +unsigned int \bf{current\-Size}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb} \begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item -std::list$<$ M $>$ {\bf tabuList}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} +std::list$<$ M $>$ \bf{tabu\-List}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} \begin{CompactList}\small\item\em The move tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moSimpleMoveTabuList$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Simple\-Move\-Tabu\-List$<$ M $>$} Class describing a move tabu list with a limited memory. -Definition at line 22 of file moSimpleMoveTabuList.h. +Definition at line 22 of file mo\-Simple\-Move\-Tabu\-List.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, virtual]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} +\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} -Function that indicates if, in a given state, the \_\-move is tabu or not. +\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} \end{Desc} \begin{Desc} \item[Returns:]true or false. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. +Definition at line 46 of file mo\-Simple\-Move\-Tabu\-List.h. -Definition at line 46 of file moSimpleMoveTabuList.h. - -References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}} -\index{add@{add}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!add@{add}} +\index{add@{add}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} Procedure to add a move in the tabu list. @@ -96,35 +94,35 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. -Definition at line 60 of file moSimpleMoveTabuList.h. +Definition at line 60 of file mo\-Simple\-Move\-Tabu\-List.h. -References moSimpleMoveTabuList$<$ M $>$::currentSize, moSimpleMoveTabuList$<$ M $>$::maxSize, moSimpleMoveTabuList$<$ M $>$::removeMove(), and moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!update@{update}} -\index{update@{update}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::remove\-Move(), and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}} +\index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 82 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!init@{init}} -\index{init@{init}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} +Definition at line 82 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}} +\index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 88 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!removeMove@{removeMove}} -\index{removeMove@{removeMove}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::removeMove (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} +Definition at line 88 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!removeMove@{removeMove}} +\index{removeMove@{removeMove}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::remove\-Move (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} Procedure that removes a given move from the tabu list (if it is into, else do nothing). @@ -132,16 +130,16 @@ Procedure that removes a given move from the tabu list (if it is into, else do n \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \end{description} \end{Desc} -Definition at line 100 of file moSimpleMoveTabuList.h. +Definition at line 100 of file mo\-Simple\-Move\-Tabu\-List.h. -References moSimpleMoveTabuList$<$ M $>$::tabuList. +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List. -Referenced by moSimpleMoveTabuList$<$ M $>$::add(). +Referenced by mo\-Simple\-Move\-Tabu\-List$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSimpleMoveTabuList.h\end{CompactItemize} +mo\-Simple\-Move\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps index c673817e4..06f8e8fc5 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 277.778 +%%BoundingBox: 0 0 500 400 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moSimpleSolutionTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleSolutionTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex index 9437723d9..7d0407bd5 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex @@ -1,11 +1,11 @@ -\section{moSimpleSolutionTabuList$<$ M $>$ Class Template Reference} +\section{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$ Class Template Reference} \label{classmo_simple_solution_tabu_list}\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} Class describing a solution tabu list with limited length. -{\tt \#include $<$moSimpleSolutionTabuList.h$>$} +{\tt \#include $<$mo\-Simple\-Solution\-Tabu\-List.h$>$} -Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_simple_solution_tabu_list} @@ -14,54 +14,54 @@ Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} +typedef M::EOType \bf{EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSimpleSolutionTabuList} (unsigned int \_\-\_\-size) +\bf{mo\-Simple\-Solution\-Tabu\-List} (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 -void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item -void {\bf update} () +void \bf{update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf removeSolution} (const {\bf EOT} \&\_\-\_\-sol) +void \bf{remove\-Solution} (const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure that removes a given solution from the tabu list (if it is into, else does nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxSize}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845} +unsigned int \bf{max\-Size}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845} \begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item -unsigned int {\bf currentSize}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf} +unsigned int \bf{current\-Size}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf} \begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item -std::list$<$ {\bf EOT} $>$ {\bf tabuList}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} +std::list$<$ \bf{EOT} $>$ \bf{tabu\-List}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} \begin{CompactList}\small\item\em The solution tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moSimpleSolutionTabuList$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} Class describing a solution tabu list with limited length. -Definition at line 22 of file moSimpleSolutionTabuList.h. +Definition at line 22 of file mo\-Simple\-Solution\-Tabu\-List.h. \subsection{Constructor \& Destructor Documentation} -\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSimpleSolutionTabuList}$<$ M $>$::{\bf moSimpleSolutionTabuList} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178} +\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178} Constructor. @@ -73,34 +73,32 @@ Constructor. \end{Desc} -Definition at line 34 of file moSimpleSolutionTabuList.h. +Definition at line 34 of file mo\-Simple\-Solution\-Tabu\-List.h. -References moSimpleSolutionTabuList$<$ M $>$::currentSize. +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size. \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, virtual]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} +\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} -Function that indicates if, in a given state, the \_\-move is tabu or not. +\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} \end{Desc} \begin{Desc} \item[Returns:]true or false. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. +Definition at line 45 of file mo\-Simple\-Solution\-Tabu\-List.h. -Definition at line 45 of file moSimpleSolutionTabuList.h. - -References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}} -\index{add@{add}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!add@{add}} +\index{add@{add}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} Procedure to add a move in the tabu list. @@ -114,35 +112,35 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. -Definition at line 64 of file moSimpleSolutionTabuList.h. +Definition at line 64 of file mo\-Simple\-Solution\-Tabu\-List.h. -References moSimpleSolutionTabuList$<$ M $>$::currentSize, moSimpleSolutionTabuList$<$ M $>$::maxSize, moSimpleSolutionTabuList$<$ M $>$::removeSolution(), and moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!update@{update}} -\index{update@{update}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::remove\-Solution(), and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}} +\index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 91 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!init@{init}} -\index{init@{init}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} +Definition at line 91 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}} +\index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 97 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!removeSolution@{removeSolution}} -\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::removeSolution (const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} +Definition at line 97 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!removeSolution@{removeSolution}} +\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::remove\-Solution (const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} Procedure that removes a given solution from the tabu list (if it is into, else does nothing). @@ -154,12 +152,12 @@ Procedure that removes a given solution from the tabu list (if it is into, else \end{Desc} -Definition at line 109 of file moSimpleSolutionTabuList.h. +Definition at line 109 of file mo\-Simple\-Solution\-Tabu\-List.h. -References moSimpleSolutionTabuList$<$ M $>$::tabuList. +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List. -Referenced by moSimpleSolutionTabuList$<$ M $>$::add(). +Referenced by mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSimpleSolutionTabuList.h\end{CompactItemize} +mo\-Simple\-Solution\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex index bc98d68d9..3eafbc4e4 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex @@ -1,11 +1,11 @@ -\section{moSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_sol_continue}\index{moSolContinue@{moSolContinue}} Class that describes a stop criterion for a solution-based heuristic. -{\tt \#include $<$moSolContinue.h$>$} +{\tt \#include $<$mo\-Sol\-Continue.h$>$} -Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_sol_continue} @@ -14,33 +14,33 @@ Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} ()=0 +virtual void \bf{init} ()=0 \begin{CompactList}\small\item\em Procedure which initialises all that the stop criterion needs. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Sol\-Continue$<$ 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 ({\bf eoUF}). +It allows to add an initialisation procedure to an object that is a unary function (\doxyref{eo\-UF}). -Definition at line 22 of file moSolContinue.h. +Definition at line 22 of file mo\-Sol\-Continue.h. \subsection{Member Function Documentation} -\index{moSolContinue@{moSolContinue}!init@{init}} -\index{init@{init}!moSolContinue@{moSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void {\bf moSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7} +\index{moSolContinue@{mo\-Sol\-Continue}!init@{init}} +\index{init@{init}!moSolContinue@{mo\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void \bf{mo\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7} Procedure which initialises all that the stop criterion needs. Generally, it allocates some data structures or initialises some counters. -Implemented in {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}. +Implemented in \bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSolContinue.h\end{CompactItemize} +mo\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex index a64996f1f..1eb22beb6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex @@ -1,11 +1,11 @@ -\section{moTS$<$ M $>$ Class Template Reference} +\section{mo\-TS$<$ M $>$ Class Template Reference} \label{classmo_t_s}\index{moTS@{moTS}} Tabu Search (TS). -{\tt \#include $<$moTS.h$>$} +{\tt \#include $<$mo\-TS.h$>$} -Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_t_s} @@ -14,46 +14,37 @@ Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H] \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, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) -\begin{CompactList}\small\item\em Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item +\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \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} +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1} +typedef M::EOType \bf{EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca} +typedef EOT::Fitness \bf{Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865} +\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} +\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} -\subsection*{Static Private Attributes} -\begin{CompactItemize} -\item -static bool {\bf first\_\-time} = true\label{classmo_t_s_564bc1969548ccbd9bb7e76f92898de0} - -\begin{CompactList}\small\item\em Boolean allowing to initialise the ptread\_\-mutex\_\-t in the constructor. \item\end{CompactList}\item -static pthread\_\-mutex\_\-t {\bf mutex}\label{classmo_t_s_688f9ba42eb33cae6431f4f4eb65b9e9} - -\begin{CompactList}\small\item\em The lock. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTS$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-TS$<$ M $>$} Tabu Search (TS). @@ -61,17 +52,17 @@ Generic algorithm that describes a tabu search. -Definition at line 30 of file moTS.h. +Definition at line 29 of file mo\-TS.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}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} +\index{moTS@{mo\-TS}!moTS@{moTS}} +\index{moTS@{moTS}!moTS@{mo\-TS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} -Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. +Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. -In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} is instanciated. +In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} is instanciated. \begin{Desc} \item[Parameters:] @@ -80,11 +71,9 @@ In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl \end{Desc} -Definition at line 59 of file moTS.h. - -References moTS$<$ M $>$::first\_\-time, and moTS$<$ M $>$::mutex.\index{moTS@{moTS}!moTS@{moTS}} -\index{moTS@{moTS}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +Definition at line 58 of file mo\-TS.h.\index{moTS@{mo\-TS}!moTS@{moTS}} +\index{moTS@{moTS}!moTS@{mo\-TS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -94,23 +83,21 @@ The explorer is given in the parameters. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description} +\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description} \end{Desc} -Definition at line 81 of file moTS.h. - -References moTS$<$ M $>$::first\_\-time, and moTS$<$ M $>$::mutex. +Definition at line 71 of file mo\-TS.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, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} +\index{moTS@{mo\-TS}!operator()@{operator()}} +\index{operator()@{operator()}!moTS@{mo\-TS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-TS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} -Function which launchs the Tabu Search. +\doxyref{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. +Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm. \begin{Desc} \item[Parameters:] @@ -121,12 +108,12 @@ 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 $>$}. +Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}. -Definition at line 104 of file moTS.h. +Definition at line 85 of file mo\-TS.h. -References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, moTS$<$ M $>$::move\_\-expl, and moTS$<$ M $>$::mutex. +References mo\-TS$<$ M $>$::cont, mo\-TS$<$ M $>$::full\_\-eval, and mo\-TS$<$ M $>$::move\_\-expl. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moTS.h\end{CompactItemize} +mo\-TS.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex index 2a5d367c6..30f0a7156 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{moTSMoveLoopExpl$<$ M $>$ Class Template Reference} +\section{mo\-TSMove\-Loop\-Expl$<$ M $>$ Class Template Reference} \label{classmo_t_s_move_loop_expl}\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}} Explorer for a Tabu Search algorithm. -{\tt \#include $<$moTSMoveLoopExpl.h$>$} +{\tt \#include $<$mo\-TSMove\-Loop\-Expl.h$>$} -Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_t_s_move_loop_expl} @@ -14,57 +14,57 @@ Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit) +\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol) +void \bf{operator()} (const \bf{EOT} \&\_\-\_\-old\_\-sol, \bf{EOT} \&\_\-\_\-new\_\-sol) \begin{CompactList}\small\item\em Procedure which lauches the exploration. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527} +typedef M::EOType \bf{EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400} +\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400} \begin{CompactList}\small\item\em Move initialisation. \item\end{CompactList}\item -{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49} +\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c} +\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c} \begin{CompactList}\small\item\em Efficient evaluation. \item\end{CompactList}\item -{\bf moBestImprSelect}$<$ M $>$ {\bf move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1} +\bf{mo\-Best\-Impr\-Select}$<$ M $>$ \bf{move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1} \begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\item -{\bf moTabuList}$<$ M $>$ \& {\bf tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790} +\bf{mo\-Tabu\-List}$<$ M $>$ \& \bf{tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790} \begin{CompactList}\small\item\em Tabu list. \item\end{CompactList}\item -{\bf moAspirCrit}$<$ M $>$ \& {\bf aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f} +\bf{mo\-Aspir\-Crit}$<$ M $>$ \& \bf{aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f} \begin{CompactList}\small\item\em Aspiration criterion. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTSMoveLoopExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-TSMove\-Loop\-Expl$<$ M $>$} Explorer for a Tabu Search algorithm. -It is used by a \doxyref{moTS}{p.}{classmo_t_s}. +It is used by a \doxyref{mo\-TS}{p.}{classmo_t_s}. -Definition at line 30 of file moTSMoveLoopExpl.h. +Definition at line 30 of file mo\-TSMove\-Loop\-Expl.h. \subsection{Constructor \& Destructor Documentation} -\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTSMoveLoopExpl}$<$ M $>$::{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381} +\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} +\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381} Constructor. @@ -76,14 +76,14 @@ Constructor. \end{Desc} -Definition at line 49 of file moTSMoveLoopExpl.h. +Definition at line 49 of file mo\-TSMove\-Loop\-Expl.h. -References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. +References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. \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, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} +\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}} +\index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-\_\-old\_\-sol}, \bf{EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,12 +97,12 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Implements \bf{eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. -Definition at line 69 of file moTSMoveLoopExpl.h. +Definition at line 69 of file mo\-TSMove\-Loop\-Expl.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. +References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, mo\-TSMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-select, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moTSMoveLoopExpl.h\end{CompactItemize} +mo\-TSMove\-Loop\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps index 2aee2f1b6..43c125a8a 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 138.889 +%%BoundingBox: 0 0 500 200 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.6 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw (moSimpleMoveTabuList< M >) cw (moSimpleSolutionTabuList< M >) cw @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moTabuList< M >) 0.5 1 box - (eoBF< const M &, const M::EOType &, bool >) 0.5 2 box + (eoBF< A1, A2, R >) 0.5 2 box (eoFunctorBase) 0.5 3 box (moSimpleMoveTabuList< M >) 0 0 box (moSimpleSolutionTabuList< M >) 1 0 box diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex index 1ed7c1b47..89cb23468 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex @@ -1,48 +1,48 @@ -\section{moTabuList$<$ M $>$ Class Template Reference} +\section{mo\-Tabu\-List$<$ M $>$ Class Template Reference} \label{classmo_tabu_list}\index{moTabuList@{moTabuList}} -Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. +Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. -{\tt \#include $<$moTabuList.h$>$} +{\tt \#include $<$mo\-Tabu\-List.h$>$} -Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.88889cm]{classmo_tabu_list} +\includegraphics[height=4cm]{classmo_tabu_list} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df} +typedef M::EOType \bf{EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)=0 +virtual void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)=0 \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item -virtual void {\bf update} ()=0 +virtual void \bf{update} ()=0 \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -virtual void {\bf init} ()=0 +virtual void \bf{init} ()=0 \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTabuList$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Tabu\-List$<$ M $>$} -Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. +Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. -It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{moTS}{p.}{classmo_t_s}. +It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. -Definition at line 22 of file moTabuList.h. +Definition at line 22 of file mo\-Tabu\-List.h. \subsection{Member Function Documentation} -\index{moTabuList@{moTabuList}!add@{add}} -\index{add@{add}!moTabuList@{moTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286} +\index{moTabuList@{mo\-Tabu\-List}!add@{add}} +\index{add@{add}!moTabuList@{mo\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286} Procedure to add a move in the tabu list. @@ -56,26 +56,26 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{moTabuList}!update@{update}} -\index{update@{update}!moTabuList@{moTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} +Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{mo\-Tabu\-List}!update@{update}} +\index{update@{update}!moTabuList@{mo\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} 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}, 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} +Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{mo\-Tabu\-List}!init@{init}} +\index{init@{init}!moTabuList@{mo\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} 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}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. +Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moTabuList.h\end{CompactItemize} +mo\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty index 262acba40..41b992349 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 Wed Jun 27 15:12:37 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Jun 27 15:12:37 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Jul 5 12:04:05 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Jul 5 12:04:05 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 66deba8dc..ae3028808 100644 --- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/doc/latex/hierarchy.tex @@ -1,89 +1,79 @@ \section{PARADISEO-MO Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} -\item \contentsline{section}{EmptySelection}{\pageref{class_empty_selection}}{} -\item eoFunctorBase{\tt [external]}\begin{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\item \contentsline{section}{Empty\-Selection}{\pageref{class_empty_selection}}{} +\item eo\-Functor\-Base{\tt [external]}\begin{CompactList} +\item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \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}{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} +\item \contentsline{section}{mo\-No\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} \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}}{} +\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} +\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} +\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{} +\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{} \begin{CompactList} -\item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} +\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{} +\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} \begin{CompactList} -\item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} +\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} +\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} +\end{CompactList} +\end{CompactList} +\item eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{} \begin{CompactList} -\item \contentsline{section}{moHCMoveLoopExpl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{} -\item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} -\end{CompactList} -\end{CompactList} -\end{CompactList} -\item eoBF$<$ M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{} +\item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} \begin{CompactList} -\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\item \contentsline{section}{mo\-HCMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{} +\item \contentsline{section}{mo\-TSMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} \end{CompactList} \end{CompactList} -\item eoBF$<$ M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveInit$<$ M $>$}{\pageref{classmo_move_init}}{} \end{CompactList} -\item eoBF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveSelect$<$ M $>$}{\pageref{classmo_move_select}}{} +\item eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move\-Select$<$ 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}}{} +\item \contentsline{section}{mo\-Best\-Impr\-Select$<$ M $>$}{\pageref{classmo_best_impr_select}}{} +\item \contentsline{section}{mo\-First\-Impr\-Select$<$ M $>$}{\pageref{classmo_first_impr_select}}{} +\item \contentsline{section}{mo\-Rand\-Impr\-Select$<$ M $>$}{\pageref{classmo_rand_impr_select}}{} \end{CompactList} \end{CompactList} -\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} +\item eo\-UF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} -\item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} +\item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} \end{CompactList} \end{CompactList} -\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{} +\item eo\-UF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} \begin{CompactList} -\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{} -\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{} +\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{} +\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{} \end{CompactList} \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}}{} +\item eo\-UF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} \end{CompactList} \end{CompactList} -\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{} +\item eo\-UF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move$<$ 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}}{} +\item eo\-UF$<$ EOType \&, bool $>${\tt [external]}\item eo\-UF$<$ M \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} \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}}{} +\item eo\-UF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} \begin{CompactList} -\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{} -\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{} +\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} +\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} \end{CompactList} \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} +\item eo\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\end{CompactList} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/main.tex b/trunk/paradiseo-mo/doc/latex/main.tex index 8dba03e9c..8d5a5e7cc 100644 --- a/trunk/paradiseo-mo/doc/latex/main.tex +++ b/trunk/paradiseo-mo/doc/latex/main.tex @@ -1,5 +1,5 @@ \section{intro}\label{main_intro} -MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par +MO is an extension of the ANSI-C++ compliant evolutionary computation library \doxyref{EO}. \par It contains classes for almost any kind of one solution based heuristics.\section{tutorial}\label{main_tutorial} \section{install}\label{main_install} The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design} diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex index e3dfa08df..708ce406a 100644 --- a/trunk/paradiseo-mo/doc/latex/refman.tex +++ b/trunk/paradiseo-mo/doc/latex/refman.tex @@ -7,7 +7,6 @@ \usepackage{float} \usepackage{textcomp} \usepackage{alltt} -\usepackage[utf8]{inputenc} \usepackage{doxygen} \makeindex \setcounter{tocdepth}{1} @@ -18,9 +17,9 @@ \begin{center} {\Large PARADISEO-MO Reference Manual\\[1ex]\large 0.1 }\\ \vspace*{1cm} -{\large Generated by Doxygen 1.5.2}\\ +{\large Generated by Doxygen 1.4.7}\\ \vspace*{0.5cm} -{\small Wed Jun 27 15:12:37 2007}\\ +{\small Thu Jul 5 12:04:05 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 index 6e526c285..150071306 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 index a39c9895a..c17b99982 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 index 0e152fbc5..e9dc2de1e 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType::Fitness &, bool >\fP. .PP Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index 74d5b675f..6c0e26734 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)" .br -.RI "\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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index 7bede7db1..88c4d2d2f 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index 23653ac78..aadd76c73 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "bool \fBoperator()\fP (double &__temp)" .br -.RI "\fIFunction which proceeds to the cooling. \fP" +.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP" .in -1c .SS "Private Attributes" @@ -63,7 +63,7 @@ Definition at line 31 of file moExponentialCoolingSchedule.h. .PP .SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" .PP -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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index 46e8430e7..f3ef3a983 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &__move, const typename M::EOType::Fitness &__fit)" .br -.RI "\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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 index 63c117866..71cadb395 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,7 +22,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &__sol)" .br -.RI "\fIFunction that activates the stop criterion. \fP" +.RI "\fI\fBFunction\fP that activates the stop criterion. \fP" .ti -1c .RI "void \fBinit\fP ()" .br @@ -67,7 +67,7 @@ Definition at line 30 of file moGenSolContinue.h. .PP .SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" .PP -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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3 index 3bb35e292..dc3a15d1d 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -26,7 +26,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .ti -1c .RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)" .br -.RI "\fIFunction which launches the HC. \fP" +.RI "\fI\fBFunction\fP which launches the HC. \fP" .in -1c .SS "Private Types" @@ -105,7 +105,7 @@ Definition at line 67 of file moHC.h. .PP .SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP -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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index 3e0ba2277..72f274978 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index 5574e902d..5afe1b749 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -34,7 +34,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const \fBFitness\fP &__fit)" .br -.RI "\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, virtual]\fP" +.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline]\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,8 +78,6 @@ TRUE the first time and if __fit > best_fit, else FALSE. .RE .PP -.PP -Implements \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. .PP Definition at line 52 of file moImprBestFitAspirCrit.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 index 0135f2df4..9ee8040e1 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -77,7 +77,7 @@ The constructor. Definition at line 37 of file moItRandNextMove.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP Generation of a new move. .PP @@ -96,8 +96,6 @@ FALSE if the maximum number of iteration is reached, else TRUE. .RE .PP -.PP -Implements \fBeoBF< M &, const M::EOType &, bool >\fP. .PP Definition at line 52 of file moItRandNextMove.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 index ee83baf2d..35057d316 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moLSCheckPoint \- Class which allows a checkpointing system. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP. .PP .SS "Public Member Functions" @@ -18,7 +18,7 @@ Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. .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 (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)" .br @@ -45,7 +45,7 @@ Definition at line 21 of file moLSCheckPoint.h. .PP .SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & __move, const typename M::EOType & __sol)\fC [inline]\fP" .PP -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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index f94474519..690323095 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "bool \fBoperator()\fP (double &__temp)" .br -.RI "\fIFunction which proceeds to the cooling. \fP" +.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP" .in -1c .SS "Private Attributes" @@ -63,7 +63,7 @@ Definition at line 31 of file moLinearCoolingSchedule.h. .PP .SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" .PP -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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3 index 065da3d37..5badf3f88 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 index 2b6b97f73..ecd0ce321 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index ce203ed20..4cf88cab3 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 index 3570e1a1b..d8373783a 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moMoveInit \- Move (\fBmoMove\fP) initializer. .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, void >\fP. +Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, void >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 index c0966a9a6..f9002b1f4 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 index fcc5d2f5f..8d330d181 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -32,7 +32,7 @@ Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBm .ti -1c .RI "virtual bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)=0" .br -.RI "\fIFunction which updates the best solutions. \fP" +.RI "\fI\fBFunction\fP which updates the best solutions. \fP" .in -1c .SH "Detailed Description" .PP @@ -61,7 +61,7 @@ In order to know the fitness of the solution, for which the neighborhood will be Implemented in \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .SS "template virtual bool \fBmoMoveSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [pure virtual]\fP" .PP -Function which updates the best solutions. +\fBFunction\fP which updates the best solutions. .PP \fBParameters:\fP .RS 4 diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 index 9ea9fcf1e..df4e2ba03 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, bool >\fP. +Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, bool >\fP. .PP Inherited by \fBmoItRandNextMove< M >\fP. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index 20ed4144f..be03a8e17 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -18,7 +18,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const typename M::EOType::Fitness &__sol)" .br -.RI "\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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 index 25e1c595d..2b1478122 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)" .br -.RI "\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 diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 index 9b8fcf1ec..5841293a5 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3 index 3195b4d2f..8370d6380 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index 27b236c90..90020e3fa 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)" .br -.RI "\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, virtual]\fP" +.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\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,8 +94,6 @@ true or false. .RE .PP -.PP -Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Definition at line 46 of file moSimpleMoveTabuList.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 index 45e5f0cb8..c81448eca 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)" .br -.RI "\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, virtual]\fP" +.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\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,8 +110,6 @@ true or false. .RE .PP -.PP -Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Definition at line 45 of file moSimpleSolutionTabuList.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 index 3a4f4848b..685bb7b7d 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3 index 6c15780a5..725a4c776 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -26,7 +26,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .ti -1c .RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)" .br -.RI "\fIFunction which launchs the Tabu Search. \fP" +.RI "\fI\fBFunction\fP which launchs the Tabu Search. \fP" .in -1c .SS "Private Types" @@ -56,18 +56,6 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIFull evaluation function. \fP" .in -1c -.SS "Static Private Attributes" - -.in +1c -.ti -1c -.RI "static bool \fBfirst_time\fP = true" -.br -.RI "\fIBoolean allowing to initialise the ptread_mutex_t in the constructor. \fP" -.ti -1c -.RI "static pthread_mutex_t \fBmutex\fP" -.br -.RI "\fIThe lock. \fP" -.in -1c .SH "Detailed Description" .PP @@ -76,7 +64,7 @@ Tabu Search (TS). Generic algorithm that describes a tabu search. .PP -Definition at line 30 of file moTS.h. +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, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" @@ -104,9 +92,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. .PP .PP -Definition at line 59 of file moTS.h. -.PP -References moTS< M >::first_time, and moTS< M >::mutex. +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, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor with less parameters. @@ -124,14 +110,12 @@ The explorer is given in the parameters. .PP .PP -Definition at line 81 of file moTS.h. -.PP -References moTS< M >::first_time, and moTS< M >::mutex. +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, 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 @@ -149,9 +133,9 @@ TRUE. .PP Implements \fBeoUF< M::EOType &, bool >\fP. .PP -Definition at line 104 of file moTS.h. +Definition at line 85 of file moTS.h. .PP -References moTS< M >::cont, moTS< M >::full_eval, moTS< M >::move_expl, and moTS< M >::mutex. +References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index 80b59ee30..961597d11 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 index b8f6d4372..8e56844ac 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 "27 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "5 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP. .PP Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .PP