From d8fd28a1920d3b8e044251d674b66f03664530ba Mon Sep 17 00:00:00 2001 From: legrand Date: Fri, 14 Sep 2007 14:50:07 +0000 Subject: [PATCH] deleted useless mo.doxyfile git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@592 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 | 30 +- .../doc/html/classmo_aspir_crit-members.html | 20 +- .../doc/html/classmo_aspir_crit.html | 26 +- .../doc/html/classmo_aspir_crit.png | Bin 1805 -> 778 bytes .../classmo_best_impr_select-members.html | 21 +- .../doc/html/classmo_best_impr_select.html | 34 +- .../doc/html/classmo_best_impr_select.png | Bin 1074 -> 513 bytes .../doc/html/classmo_cooling_schedule.html | 28 +- .../doc/html/classmo_cooling_schedule.png | Bin 1297 -> 819 bytes ..._exponential_cooling_schedule-members.html | 21 +- .../classmo_exponential_cooling_schedule.html | 30 +- .../classmo_exponential_cooling_schedule.png | Bin 928 -> 565 bytes .../classmo_first_impr_select-members.html | 21 +- .../doc/html/classmo_first_impr_select.html | 34 +- .../doc/html/classmo_first_impr_select.png | Bin 1067 -> 512 bytes .../classmo_fit_sol_continue-members.html | 21 +- .../doc/html/classmo_fit_sol_continue.html | 26 +- .../doc/html/classmo_fit_sol_continue.png | Bin 896 -> 516 bytes .../classmo_gen_sol_continue-members.html | 21 +- .../doc/html/classmo_gen_sol_continue.html | 26 +- .../doc/html/classmo_gen_sol_continue.png | Bin 900 -> 522 bytes .../doc/html/classmo_h_c-members.html | 28 +- trunk/paradiseo-mo/doc/html/classmo_h_c.html | 44 +- trunk/paradiseo-mo/doc/html/classmo_h_c.png | Bin 1507 -> 454 bytes .../classmo_h_c_move_loop_expl-members.html | 21 +- .../doc/html/classmo_h_c_move_loop_expl.html | 30 +- .../doc/html/classmo_h_c_move_loop_expl.png | Bin 1569 -> 658 bytes ...ssmo_impr_best_fit_aspir_crit-members.html | 21 +- .../classmo_impr_best_fit_aspir_crit.html | 30 +- .../html/classmo_impr_best_fit_aspir_crit.png | Bin 1309 -> 548 bytes .../classmo_it_rand_next_move-members.html | 21 +- .../doc/html/classmo_it_rand_next_move.html | 34 +- .../doc/html/classmo_it_rand_next_move.png | Bin 1033 -> 511 bytes .../html/classmo_l_s_check_point-members.html | 20 +- .../doc/html/classmo_l_s_check_point.html | 30 +- ...assmo_linear_cooling_schedule-members.html | 21 +- .../html/classmo_linear_cooling_schedule.html | 30 +- .../html/classmo_linear_cooling_schedule.png | Bin 859 -> 515 bytes .../doc/html/classmo_move-members.html | 20 +- trunk/paradiseo-mo/doc/html/classmo_move.html | 24 +- .../doc/html/classmo_move_expl.html | 32 +- .../doc/html/classmo_move_expl.png | Bin 1884 -> 983 bytes .../doc/html/classmo_move_incr_eval.html | 26 +- .../doc/html/classmo_move_init.html | 28 +- .../doc/html/classmo_move_loop_expl.html | 28 +- .../doc/html/classmo_move_loop_expl.png | Bin 2000 -> 1024 bytes .../doc/html/classmo_move_select-members.html | 20 +- .../doc/html/classmo_move_select.html | 32 +- .../doc/html/classmo_move_select.png | Bin 1886 -> 988 bytes .../doc/html/classmo_next_move.html | 28 +- .../doc/html/classmo_next_move.png | Bin 1050 -> 518 bytes .../html/classmo_no_aspir_crit-members.html | 20 +- .../doc/html/classmo_no_aspir_crit.html | 30 +- .../doc/html/classmo_no_aspir_crit.png | Bin 1254 -> 478 bytes ...ssmo_no_fit_impr_sol_continue-members.html | 21 +- .../classmo_no_fit_impr_sol_continue.html | 26 +- .../html/classmo_no_fit_impr_sol_continue.png | Bin 959 -> 583 bytes .../classmo_rand_impr_select-members.html | 21 +- .../doc/html/classmo_rand_impr_select.html | 38 +- .../doc/html/classmo_rand_impr_select.png | Bin 1076 -> 517 bytes .../doc/html/classmo_rand_move.html | 28 +- .../doc/html/classmo_s_a-members.html | 28 +- trunk/paradiseo-mo/doc/html/classmo_s_a.html | 38 +- trunk/paradiseo-mo/doc/html/classmo_s_a.png | Bin 1521 -> 462 bytes ...classmo_simple_move_tabu_list-members.html | 21 +- .../html/classmo_simple_move_tabu_list.html | 30 +- .../html/classmo_simple_move_tabu_list.png | Bin 1368 -> 539 bytes ...smo_simple_solution_tabu_list-members.html | 21 +- .../classmo_simple_solution_tabu_list.html | 28 +- .../classmo_simple_solution_tabu_list.png | Bin 1376 -> 553 bytes .../html/classmo_sol_continue-members.html | 20 +- .../doc/html/classmo_sol_continue.html | 30 +- .../doc/html/classmo_sol_continue.png | Bin 2035 -> 1264 bytes ...assmo_steady_fit_sol_continue-members.html | 21 +- .../html/classmo_steady_fit_sol_continue.html | 26 +- .../html/classmo_steady_fit_sol_continue.png | Bin 967 -> 592 bytes .../doc/html/classmo_t_s-members.html | 28 +- trunk/paradiseo-mo/doc/html/classmo_t_s.html | 48 +- trunk/paradiseo-mo/doc/html/classmo_t_s.png | Bin 1503 -> 457 bytes .../classmo_t_s_move_loop_expl-members.html | 21 +- .../doc/html/classmo_t_s_move_loop_expl.html | 28 +- .../doc/html/classmo_t_s_move_loop_expl.png | Bin 1577 -> 659 bytes .../doc/html/classmo_tabu_list-members.html | 20 +- .../doc/html/classmo_tabu_list.html | 28 +- .../doc/html/classmo_tabu_list.png | Bin 1770 -> 890 bytes trunk/paradiseo-mo/doc/html/doxygen.css | 2 +- trunk/paradiseo-mo/doc/html/files.html | 13 +- trunk/paradiseo-mo/doc/html/functions.html | 305 +--- .../paradiseo-mo/doc/html/functions_func.html | 170 +-- .../paradiseo-mo/doc/html/functions_type.html | 49 +- .../paradiseo-mo/doc/html/functions_vars.html | 154 +- trunk/paradiseo-mo/doc/html/hierarchy.html | 113 +- trunk/paradiseo-mo/doc/html/index.html | 5 +- .../doc/html/index_8h-source.html | 13 +- trunk/paradiseo-mo/doc/html/main.html | 23 +- 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_fit_sol_continue_8h-source.html | 27 +- .../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 | 29 +- .../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 +- ...mo_no_fit_impr_sol_continue_8h-source.html | 57 +- .../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 | 69 +- .../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 +- .../mo_steady_fit_sol_continue_8h-source.html | 73 +- .../doc/html/mo_t_s_8h-source.html | 49 +- .../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 355865 -> 355897 bytes trunk/paradiseo-mo/doc/html/search.php | 8 +- trunk/paradiseo-mo/doc/html/tabs.css | 4 +- trunk/paradiseo-mo/doc/html/tree.html | 157 +- trunk/paradiseo-mo/doc/latex/annotated.tex | 68 +- .../doc/latex/class_empty_selection.tex | 8 +- trunk/paradiseo-mo/doc/latex/classmo_algo.tex | 18 +- .../doc/latex/classmo_aspir_crit.eps | 18 +- .../doc/latex/classmo_aspir_crit.tex | 26 +- .../doc/latex/classmo_best_impr_select.eps | 18 +- .../doc/latex/classmo_best_impr_select.tex | 58 +- .../doc/latex/classmo_cooling_schedule.eps | 18 +- .../doc/latex/classmo_cooling_schedule.tex | 14 +- .../classmo_exponential_cooling_schedule.eps | 18 +- .../classmo_exponential_cooling_schedule.tex | 42 +- .../doc/latex/classmo_first_impr_select.eps | 18 +- .../doc/latex/classmo_first_impr_select.tex | 68 +- .../doc/latex/classmo_fit_sol_continue.eps | 18 +- .../doc/latex/classmo_fit_sol_continue.tex | 52 +- .../doc/latex/classmo_gen_sol_continue.eps | 18 +- .../doc/latex/classmo_gen_sol_continue.tex | 56 +- trunk/paradiseo-mo/doc/latex/classmo_h_c.eps | 40 +- trunk/paradiseo-mo/doc/latex/classmo_h_c.tex | 60 +- .../doc/latex/classmo_h_c_move_loop_expl.eps | 18 +- .../doc/latex/classmo_h_c_move_loop_expl.tex | 54 +- .../classmo_impr_best_fit_aspir_crit.eps | 18 +- .../classmo_impr_best_fit_aspir_crit.tex | 42 +- .../doc/latex/classmo_it_rand_next_move.eps | 18 +- .../doc/latex/classmo_it_rand_next_move.tex | 54 +- .../doc/latex/classmo_l_s_check_point.tex | 40 +- .../latex/classmo_linear_cooling_schedule.eps | 18 +- .../latex/classmo_linear_cooling_schedule.tex | 42 +- trunk/paradiseo-mo/doc/latex/classmo_move.tex | 18 +- .../doc/latex/classmo_move_expl.eps | 18 +- .../doc/latex/classmo_move_expl.tex | 20 +- .../doc/latex/classmo_move_incr_eval.tex | 16 +- .../doc/latex/classmo_move_init.tex | 20 +- .../doc/latex/classmo_move_loop_expl.eps | 18 +- .../doc/latex/classmo_move_loop_expl.tex | 16 +- .../doc/latex/classmo_move_select.eps | 18 +- .../doc/latex/classmo_move_select.tex | 40 +- .../doc/latex/classmo_next_move.eps | 18 +- .../doc/latex/classmo_next_move.tex | 20 +- .../doc/latex/classmo_no_aspir_crit.eps | 18 +- .../doc/latex/classmo_no_aspir_crit.tex | 42 +- .../classmo_no_fit_impr_sol_continue.eps | 18 +- .../classmo_no_fit_impr_sol_continue.tex | 62 +- .../doc/latex/classmo_rand_impr_select.eps | 18 +- .../doc/latex/classmo_rand_impr_select.tex | 70 +- .../doc/latex/classmo_rand_move.tex | 18 +- trunk/paradiseo-mo/doc/latex/classmo_s_a.eps | 40 +- trunk/paradiseo-mo/doc/latex/classmo_s_a.tex | 56 +- .../latex/classmo_simple_move_tabu_list.eps | 18 +- .../latex/classmo_simple_move_tabu_list.tex | 86 +- .../classmo_simple_solution_tabu_list.eps | 18 +- .../classmo_simple_solution_tabu_list.tex | 94 +- .../doc/latex/classmo_sol_continue.eps | 18 +- .../doc/latex/classmo_sol_continue.tex | 26 +- .../latex/classmo_steady_fit_sol_continue.eps | 18 +- .../latex/classmo_steady_fit_sol_continue.tex | 68 +- trunk/paradiseo-mo/doc/latex/classmo_t_s.eps | 40 +- trunk/paradiseo-mo/doc/latex/classmo_t_s.tex | 66 +- .../doc/latex/classmo_t_s_move_loop_expl.eps | 18 +- .../doc/latex/classmo_t_s_move_loop_expl.tex | 58 +- .../doc/latex/classmo_tabu_list.eps | 18 +- .../doc/latex/classmo_tabu_list.tex | 48 +- trunk/paradiseo-mo/doc/latex/doxygen.sty | 4 +- trunk/paradiseo-mo/doc/latex/hierarchy.tex | 108 +- trunk/paradiseo-mo/doc/latex/main.tex | 10 +- trunk/paradiseo-mo/doc/latex/refman.tex | 5 +- .../doc/man/man3/EmptySelection.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moAlgo.3 | 4 +- trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 | 4 +- .../doc/man/man3/moBestImprSelect.3 | 6 +- .../doc/man/man3/moCoolingSchedule.3 | 4 +- .../man/man3/moExponentialCoolingSchedule.3 | 6 +- .../doc/man/man3/moFirstImprSelect.3 | 6 +- .../doc/man/man3/moFitSolContinue.3 | 6 +- .../doc/man/man3/moGenSolContinue.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moHC.3 | 16 +- .../doc/man/man3/moHCMoveLoopExpl.3 | 6 +- .../doc/man/man3/moImprBestFitAspirCrit.3 | 6 +- .../doc/man/man3/moItRandNextMove.3 | 8 +- .../doc/man/man3/moLSCheckPoint.3 | 10 +- .../doc/man/man3/moLinearCoolingSchedule.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moMove.3 | 4 +- trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 | 4 +- .../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 | 4 +- trunk/paradiseo-mo/doc/man/man3/moNextMove.3 | 4 +- .../paradiseo-mo/doc/man/man3/moNoAspirCrit.3 | 2 +- .../doc/man/man3/moNoFitImprSolContinue.3 | 6 +- .../doc/man/man3/moRandImprSelect.3 | 8 +- trunk/paradiseo-mo/doc/man/man3/moRandMove.3 | 4 +- trunk/paradiseo-mo/doc/man/man3/moSA.3 | 14 +- .../doc/man/man3/moSimpleMoveTabuList.3 | 6 +- .../doc/man/man3/moSimpleSolutionTabuList.3 | 6 +- .../paradiseo-mo/doc/man/man3/moSolContinue.3 | 6 +- .../doc/man/man3/moSteadyFitSolContinue.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moTS.3 | 16 +- .../doc/man/man3/moTSMoveLoopExpl.3 | 6 +- trunk/paradiseo-mo/doc/man/man3/moTabuList.3 | 4 +- trunk/paradiseo-mo/doc/mo.doxyfile | 1268 ----------------- 237 files changed, 2409 insertions(+), 5083 deletions(-) delete mode 100644 trunk/paradiseo-mo/doc/mo.doxyfile diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index daeece322..effb4afc7 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
moFitSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moGenSolContinue< EOT >One possible stopping 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)
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)
moNoFitImprSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moRandImprSelect< M >One of the possible moMove selector (moMoveSelect)
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 stopping criterion for a solution-based heuristic
moSteadyFitSolContinue< EOT >One possible stopping 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 536716069..1817bc53b 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 6fed2e0cb..a57795ba6 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 @@ 		moMoveLoopExpl   moTabuList   
moGenSolContinue   moMoveSelect   moTS   
  H  
  N  
moTSMoveLoopExpl   

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

-

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 41a06b485..bb047ed82 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. + +

moAlgo< EOT > Class Template Reference

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

#include <moAlgo.h>

-

Inheritance diagram for moAlgo< EOT >: -

- -eoMonOp< EOT > -eoOp< EOType > -eoUF< EOT &, bool > -eoFunctorBase - -List of all members. +

Detailed Description

@@ -52,14 +42,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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 4f07e3100..5578fb039 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]
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]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 ca58e3f2f..340431c3f 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,8 @@

Inheritance diagram for moAspirCrit< M >:

-eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -56,7 +52,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 +84,8 @@ Implemented in moAspirCrit.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..ab38bee307992e2dd4d1550be37a74452978b903 100644 GIT binary patch delta 741 zcmVawC6!usrNs^VjB`l(-wDze60MYDzrGSABaP% zTrMiX7&#q-pYMH=;<~JfV)%m-NUo@gLXHAQw}cBX$sSEpdBqH?X(09 zmnos8LuQbgvIidv8YaRnhnvy|f0q!YM7TT{);YNp&}sXPT3cx%ouP%C4-TiHyy&@p z)~NS`raKSrp>t8BPCk2udN*jtqwe8K7wAK+w98#5(7b!Ns;2Wqj#JaLd+GvX=)e2JbUfR!?gqV;`&j5xK0;9FV{d?We{@RdYuuaQ z4V@AC<9gj2L9bInpYujE=&fYXTgjlel0k2!gFvTW=5dOnpa=P~;vipxZWRal8g#2T z$k(7-#X-IX-6{_9HRx7xkgq|vii3O&x>eK!|L)fxMeI-V{-HSGuOjyHD-4l9kMaIA z=t>6N=={)F4In`2`qcLre|(@<6^Y=v>zD5qhiA|@2PzD^pchAvIRV~U_)rGqjMUB( zeGXmD)EKtVNRvaLIVM0PPh{vcb4=^ZQ>JlbCr^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.

- - + - - -
best_fitmoBestImprSelect< M > [private]
best_movemoBestImprSelect< M > [private]
first_timemoBestImprSelect< M > [private]
Fitness typedefmoBestImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline, virtual]
operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline]
update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 aa339cfd4..d33feb2c6 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> @@ -38,9 +36,7 @@

Inheritance diagram for moBestImprSelect< M >:

-moMoveSelect< M > -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +moMoveSelect< M > List of all members. @@ -78,7 +74,7 @@ M  - +
moMoveSelect. +One of the possible moMoveSelect.

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

@@ -115,14 +111,14 @@ template<class M>

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

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

+If the given fitness enables an improvement, 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 >. @@ -153,7 +149,7 @@ template<class M>

) throw (EmptySelection) [inline, virtual] throw (EmptySelection) [inline]
@@ -170,12 +166,10 @@ 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.
-

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

Definition at line 65 of file moBestImprSelect.h.

@@ -184,8 +178,8 @@ References moBest

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.png index e803a39a43bee14670efe218d4fc1ad1dcdaf15e..5c56bea68d405e25fea1d77c03006b244249b9bc 100644 GIT binary patch delta 474 zcmV<00VV#j2!RA4iBL{Q4GJ0x0000DNk~Le0001z0000`1Oos7004C{0+Asze*u?C zL_t(oh3%DHZo@DLfXz#v4L5LhgY80l%KeWpeoRUdH%mKfN+pvN+ZeuLu$1)GOVa1m zM?MDWHBza+MG$qMu6V+Vc{Wf0p$Uz9!u_ zRwTD?Nz8{e2}A>01oAWkvWaQHo&XxjcH2bJk4RYpH4ljv#V-Q0WSup{?Cz(8oaI%b zlQfnUqD7<%(@;>~KuS#_E)U zeO)Jgc6E~8$-U9uC9EXrFrD3}&^vFKllJ#%FL1QEb$vV16Ea9=N!`9uKa3Fs9FR7V Q;Q#;t07*qoM6N<$f|~Qu(f|Me delta 1039 zcmZo<*~FpP8Q|y6%O%Cdz`(%k>ERN@z`zJ(G8|xG29lD87lck!G_Gep;pyTSQZeW4 z?7(TW4R~B1F2C<#EpXRy_rkif|E341cpod9ACVxKPhsTe1 zGuPDo`T30DZnpqP8X25pF4^yR@vj&!1H%TU6<3rZ{|VRspS{#{M&68HX198z%vgk1 zer0|;L08m4b^D9JXZAU(5B}c9wP=4m%Z-FA2A?+;EClFw%^vMKX#sAtKrGHV4@9ku_;Rk zbH#h#hBw7|43`9ppDtvLFy0W!tas3hCsE>6AqK_o3#cDcNE+`SZOOX4l1k-XQ$ovxM~Y#m;i|=jy~lre6)e zHT{)tUc#NSvN#Ut)C_k)eORqRTO zQ*w&+iScYTtkK*H6n9KGxg${KyMPR{K>b2R4bSXtY!}Tu_s-(3&F4S(nxXi`w2hI* z0u0yF6`tFfMBiM~7$Bp+wo#+5I&tBRb<9U~Ixd~>dOYu2T(}d+h2I%U{zu*W+kSF4 zbIJ6#yP$+VSPt1Y^%ndNb8j2OPG}X*Wnp0W#w6f+{MQ7-o5w5cU6&s!<2*3s@74Al ze;E^g`cG%@x%{Zw(wo<0Qq|IO@lw7h8XLbXLF zXcPav^Gy03k6$RL8ylz{Pl>!x($kp8&%2R{hb@%BM)d}-fhEgUhLfr9W*=lz`#Co# z)<)5S#b9k4&x5l2Ya}@uyp0V+F9!4awC-KUSRE6}Y{hNzH&ZMk^ws1XA+_o=O&Wh0 uDsK73aIW9k!t|ilu7}}+JoA@-QUAonZB^f|>0(z0`O?$X&t;ucLK6VnysXOr diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html index 245af13bb..6f8fe127e 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. + +

moCoolingSchedule Class Reference

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

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

Inheritance diagram for moCoolingSchedule:

-eoUF< double &, bool > -eoFunctorBase -moExponentialCoolingSchedule -moLinearCoolingSchedule +moExponentialCoolingSchedule +moLinearCoolingSchedule -List of all members. +

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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.png b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.png index f60c26373fa68cbc49fdab1b9f4dacd895aa4613..9524bf0747fbc983521f9e4a1b1f30270412dda0 100644 GIT binary patch delta 761 zcmVq{SPks&jG0?A24K~!jg?U+%Hq#zK6A)CxI#SL&T zu-QrWJSLm;{g1Fv1&WGFY15+1|1fA#^}{EMJqp2k|lB3L(qQZ@>T=4D$6ZWW}oN7zN3Kz%Oa)(BD*mm$D^ zFfZ5dTICSvj{pjSpd9I&q|ya3+hen`AQ)cp}8^M9BM z5$baP$RG`&hCv!a<{uLmH!`m1MfTK7lzdcCfm!dX24;R%m(L#ROw zp$0XC8q^SKP<;rm52!FgU)W!iU$?%nzi0><>I?gehLEAYu)k;s8R`rBi-wS)zOcV& z2pQ@N`-_HIeHp@f&tLU zEN!s6>i~w_Zb&YX}%f5P@jvqR9w+H0;aoUyw(uhY@F{sLD1mhSm4SvokflB)_yJM zgnFzW1)(E<;~Tspa|9S>5mmTlzpaDBGG2Q}>! z7+K$ud=JolNfnsR_l^-}T75kvm3|opoqIcPdwZQl&;=3pyuHpM7})MVgRtlA^|YUP r1=J97)DU*{5d`KJ52lWMgyHHRpi-kx5r84{00000NkvXXu0mjfAoXLY delta 1243 zcmdnYHj!(BIM)FdW(Ed^Z@Qd%6BUi?S(bacIEGZrc{?{ZZ;1gnR?iKjtEW7sCP91BO-|wUySd!~aEV@lCHaoIxZ%^H!l(3s!R^Y%}ssBlH zOzUM{_5Mp}VwiBLf@K!>xl>XHw;8=`m1N>mDPY!||89>!TcR{${Mlz)_Q@#D^ge9shl2IMv48ZTOtU@X#>sZqwym z_J^K7E-V#3w~DbvY}saof(b~d9+?AY3%Iwi{d2i=NPZQIqX0{yDC6U$lPb1KJYPAv zc1F(Uq!@uukJVcwE*#@kWNTW=k+4TFIh5D6(U)Vw(f-(8gVx7_P5n=L8Y?FpdDPk{ z@+e%hOTYi}ZZXE@_eRROHcg!Gcb*eS;}KUlav`KXho8rrqi){q*u5fdDlTxVT>LgynRmX5bY&+l$4=lJK^Xx{WG)#{c`)vk5oD?E)^_NQ}xTx1uO*RkMN zLqd9)OGN!2ql3Z=y#=OtRXtqseR?+c!R=%t$;35p;;+`f-@b8Ey($O0N!YjbEDsxwo%%ObLFPil&HX|x z%u?FF!$ov!f4 zQ=o5!Da+<>Ecsr>9WOsR-PEj?k$k+-ukV_`m*Q{RlJ0kNbieJte&O?}=c#A!d~|G? zS%0c_ImfZYU?a!f$$y$REbry~8CdHVsI_`y!?HUQt<+SnOoi9cu#wCfU z>YeX-9GyQ+D9Ww5b-ZNqlg)D`MgKCMA!W48Pu1A=;U7uHB<)Gs276P0>J+yKez^GL zv&$ScJIlH--cb9Nf3ssZwHU;jiyrl^e^4#Rc)xzR$U&pl>;&0Hf!eSe5xnP)#Ij7c z7d8_xt68r&W6tzDdi+al1Xuc*sXbA<`@Z!8`_p~b1x(J}e?E_U?z;4=5_2U_GO043 zWS;W7&Z$7VQP%uqm&p;EvpbX|f5prQ<1IfI=iv4>oNLRP^&TZ`4M9g2nY(Cxo2ztY z%X~wVt7UCh+=}O)+kG>9?m49wT^!Z>Jkteva^~ANZ+JfY%B|~rxP)4ig<4|wvM&74 i=f1G6NO)Pue}*sJJm - + PARADISEO-MO: Member List - +
-
+
-
+

moExponentialCoolingSchedule Member List

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

- - + - - -
functor_category()eoUF< double &, bool > [static]
moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
operator()(double &__temp)moExponentialCoolingSchedule [inline, virtual]
operator()(double &__temp)moExponentialCoolingSchedule [inline]
ratiomoExponentialCoolingSchedule [private]
thresholdmoExponentialCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 0ce449583..55457faa5 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> @@ -38,9 +36,7 @@

Inheritance diagram for moExponentialCoolingSchedule:

-moCoolingSchedule -eoUF< double &, bool > -eoFunctorBase +moCoolingSchedule List of all members. @@ -62,7 +58,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.

@@ -119,7 +115,7 @@ Definition at line double &  __temp  )  - [inline, virtual] + [inline] @@ -134,10 +130,8 @@ 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 >.

Definition at line 41 of file moExponentialCoolingSchedule.h.

@@ -146,8 +140,8 @@ References moExponentialCoolingSchedule.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png index 02c711475435533e49c9c1d63701878b8f0800f9..889062daa8011a04ea5522aadf70b1fe3a08b78e 100644 GIT binary patch delta 505 zcmVLyI%4$4dbJw7A&ok{o{YVYA=8EKRM%KU^>rj#~LUpK2meDXTl zIv?Pt#1OPfT$a4!yno_Zk|%L6k;d4Qqdfm9pGuKzmy7ue^(%A5NtS~;P}Sl+{z5%} zzRman#7V2?$$TLSAJO@UPvVpF>o$7yJA6Ymd~BTMT7GdptOu5QrJwx4RGiE={Ukc3 zpIf#k^c_3MPlNeOS0qp5AGOKBKlzhC z`IA5S=jY>4iy;nZ(rxlzh!1?<-7JuQFpF)?^+I#5>sYN?{{AjB3{LS}Xo(#@@MZv| zCQkr#wGM!wVJSk(jgknw!Q`KIKWFP+x>{J@fo`+R%8Y|!~~?N@wgcVWE#`IMPt^Q$(X zy5EW)TwuYC&a^3xf00000NkvXXu0mjf6z2sT delta 871 zcmV-t1DO1^1fU0y7Ye`x0{{R3qeXulks&jG12#!SK~#90?V3xH;~)%%&1Tj}H;_*- zHFKd}<^D$)kc0uh+Sp-YcZo#|0zQLKQuZGWf4i37!=JHdG5+oO08q4Ovf`WgHHRiE zEr+)8DXcrJ5}AfX7%hO&j2QVmfXAHTM`)lVK9X4C9f8*`P1@VZ0Y2~^(yfG#>i=MW z9Z&NEqFjH?7yrbaP<8%I>mT>|d^Wgy&PV-ETE!XvivNrFA!JOjki-xBpMb8!&pV3o zjel=`@8^@o^3^)wUi@FLXY*gLuSfHr9zVu6zVVH3eB&G6_|NC}e!qD7`E57KWN$J|>Pm-JRX(qlEdfVim zq>IWFILc>%4J)Hul#i4DEB@>TGyWubiWZ6E8lMk7RB4r8-(a!+vGmWz`UR`FruFao zpGyBz+Fg_XH4vx@292Mnffn%t=|(N_(^$U$3*Z|6`@b-L=I@*F{~y2i^GWZ2=c{}1 zP5=BX|LO5#eB&G6_{KNB@s0m{e((2-r@wz0|2&^^YFkdzQ)6ydttNhv0pg - + PARADISEO-MO: Member List - +
-
+
-
+

moFirstImprSelect< M > Member List

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

- - + - - -
best_fitmoFirstImprSelect< M > [private]
best_movemoFirstImprSelect< M > [private]
Fitness typedefmoFirstImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moFirstImprSelect< M > [inline, virtual]
init_fitmoFirstImprSelect< M > [private]
operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline, virtual]
operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline]
update(const M &__move, const typename M::EOType::Fitness &__fit)moFirstImprSelect< M > [inline]
moMoveSelect::update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
validmoFirstImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 30722ef55..68541c0aa 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> @@ -38,9 +36,7 @@

Inheritance diagram for moFirstImprSelect< M >:

-moMoveSelect< M > -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +moMoveSelect< M > List of all members. @@ -81,7 +77,7 @@ M  - +
moMoveSelect. +One possible moMoveSelect.

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

@@ -148,14 +144,14 @@ template<class M>

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

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

+If the given fitness enables an improvement, 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. @@ -184,7 +180,7 @@ template<class M>

) throw (EmptySelection) [inline, virtual] throw (EmptySelection) [inline]
@@ -201,12 +197,10 @@ 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.
-

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

Definition at line 76 of file moFirstImprSelect.h.

@@ -215,8 +209,8 @@ References moFir

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.png index a2a1234c8817927ee34de29656b933c61a3cce65..d7c432afcbda7dfd6fd498436992efcd4ecc2018 100644 GIT binary patch delta 473 zcmV;~0Ve*d2!I43iBL{Q4GJ0x0000DNk~Le0001!0000`1Oos70PnY2Jdq(Ye*u6hShT|8W_4@|S2|DeC`o#T@P_2m)426>E(2fOoll*B5lj-9qd7Iwn zgJhtdKsEm@0_aqeKK3=+bx^Fw7F~NNm}w8y8e2CwN*3~gT}5RjRFC>SszP9ukQ9=_P75YH^5LLJh#g`iw1!RZIf2}F@%h?W< zml;K-xS0@CDf$&gfi9^Wl@RC9g6qb67LHk3hHh0usf*W1d1#vAJ(V>bv>%G zqL5IRwQ|S%TCE+_1j%X8FGm5CI~Z*XROh+s$OHd{zlnN42I>*iaWAhgRXquA{Te;v P00000NkvXXu0mjf-HX?D delta 1032 zcmZo*SERN@z`zJ(G8|xG29lD87lck!G_Gep=;`7ZQZeW4 z?7*_e3Oufl=l^uO)o5cq<7UAAUH?^iI5?RL{odTrJNu zm|u54BSV8YL&plM$w^PwGiAtnZah_cbuy#My~;iQVdXl9PCCswbB5DFJ7aD(!=&pk zjxk1TQdOMjrZE51yofza4pOY?^(Pr}ECtqnE@imrF54)k!0*`AYT{X?#_)W1HP3>d z2X{~U_*6!q`n2qUrIrC_nG(MW>rP5>wa zUd~)oSNEr&;h`r7NE#U&XKefLVE9K}ih&`4(Ico^tGU{d6rwe;`qT*HXFagJL)S2u_*<8wIL7t4^tv+B0UM3?mfvmI}|+xsO! z%KK8ZRKucw6<43QtNcBCRbWNqQ@#ctuOicxW+lxLDXM1rx(qX)xE1pr;60F|9P7T| zMaU`*FV(!K%WBvs=+_4@UXb%B?EJ3 z2i=CNajY7(=VTr749#u7FnF_s6(3NE_^4RoY|TBR_JnnVD*KXoCs$iO*xayUmh(~h zLdBDNe^~`QN+?R2XcFqRF0JwV0>#MLtmjWBYnF7r&$i8Bsd$r|YI&>v>fwv$o6;g{ zm)5N2S7!JV((thV>EZn|_E;Y%xS3}GAwHT*jFyqkmb6oU$@k6+wODQVkW*fz9Jibonb=m8?PvyaHqK+Y|5=- z*IJya7gJ1(X31fX=ARH#pgOs5xkaAh4R(cZYC9L`tbHlxVw>_cYu%T9WI6LR}FghXC~q3^MEs4n7t0>p0YC1oV(JquL^awWc#QQWj5rFjeceCPV+M zmYSD*3i~ceG6b(On0PnPX0deZf@=b@EfZ$F{#wy7UCl~bVS<%$!;e+ - + PARADISEO-MO: Member List - +
-
+
-
+

moFitSolContinue< EOT > Member List

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

- - - - -
Fitness typedefmoFitSolContinue< EOT >
fitnessmoFitSolContinue< EOT > [private]
functor_category()eoUF< const EOT &, bool > [static]
init()moFitSolContinue< EOT > [inline, virtual]
moFitSolContinue(Fitness __fitness)moFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moFitSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(const EOT &__sol)moFitSolContinue< EOT > [inline] +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html index 82b457327..66eea757c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moFitSolContinue< EOT > Class Template Reference - +
-
+
-
+

moFitSolContinue< EOT > Class Template Reference

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

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

Inheritance diagram for moFitSolContinue< EOT >:

-moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +moSolContinue< EOT > List of all members. @@ -120,7 +116,7 @@ template<class EOT> - +
const EOT &  __sol  )  [inline, virtual] [inline]
@@ -135,10 +131,8 @@ Indicates if the fitness threshold has not yet been reached.

__sol the current solution. -

Returns:
true or false according to the value of the fitness.
+
Returns:
true or false according to the value of the fitness.
-

-Implements eoUF< const EOT &, bool >.

Definition at line 43 of file moFitSolContinue.h.

@@ -174,8 +168,8 @@ Definition at line moFitSolContinue.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png index 76c36e46ca77d18247f108197d0a2e3656cbc8ca..84c76d5a43b8e43c2c138a6c9fec2e33870a437f 100644 GIT binary patch delta 477 zcmV<30V4i@2ZRJ6iBL{Q4GJ0x0000DNk~Le0001=0000`1Oos70QHNyvXLP(e*v0F zL_t(oh3(Z#ZUZ3<24K9&n%_5o6IAVmx|;hRq1ZeJm?(-!n@Uh6ZH)Oac+{A$wd2El z`lVxoF901_e|Zm-nCD?3WIDVYYTguNvBYq`Fm6%_$2j|LvjQ?pQ5+MIi;@7sJ3A*+ z?7hi!$p1dA~Rf#{7# z#s$dtL7z@MfR`0=JzK-Xzg%~RO_%3)C_Qxg%FiLc?PYdM?jBk zbfrxtShD&7@xxp21Y1DaH&84CY4`aR$GIkx=jU+f^2)Kn4L${~{u=!O&yF2@ TKM9>}00000NkvXXu0mjffn3#! delta 860 zcmV-i1Ec(e1b_!2iBL{Q4GJ0x0000DNk~Le000230002M1Oos70EFxQ^pPPme*+dt zL_t(|ob8%TZsRZvg{94`Mc#lqK{0cou5$k)j6~{(wk0QNsssi|pshnwpV?;ub{^#Z zEr~DpH?9cdev}IU>JzmrzR2CKr0?|>( zT;m$oxW+ZE#H#n|t9`#P?w(88!e-BDI-s7_W zvFDa#w$9imscbrMK@l{!**BF7u_wjG!6Ucn0I?fD*|r&S0m=f3+C8fJ>VCVesJQ|b zE-z^PLfml)NByQGj<^gi{l<+B`+nn4hvt6H`#sY)ZuC|2fK}kBzU6N6Y#!!8bb#3B zx9SVA=rfy#7h+~GzsP;sf1i9cjC)n?s^|Qw_maaTTxH;NBVb@OP`UWXF4*{T6uavI&8}e& zEpIQv;+|B0i(++w?r;(64zpNno!GaZk@9h>1GM21&bW1FRfHY4f1RpaajbYVS?^ba z$J~Y*aTBdOY#SXEc*Lc1E?a*i?!A5+w{JA-r(mnEnul|Ji;pIo&!~H7^_J>+sPlVg z9)2^7Yuxv6S3T!fy_bBRYyR0Pc}Ty5_kou{ zP~713)puO*nJk=qz#Rl%8uE_S37#`t$R&F&9JstHuLoY|q_NHot)g&!sQT)DVa6@} zx`rBZ0R(&00nWMMoa>4V2kyOoL;r^rO^*CdUo{V7ecL>wGL`9&=Yi)JMC?$6Rr65i mcRCNh9L6>7d$^09^Zx - + PARADISEO-MO: Member List - +
-
+
-
+

moGenSolContinue< EOT > Member List

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

- - - - -
functor_category()eoUF< const EOT &, bool > [static]
init()moGenSolContinue< EOT > [inline, virtual]
maxNumGenmoGenSolContinue< EOT > [private]
moGenSolContinue(unsigned int __maxNumGen)moGenSolContinue< EOT > [inline]
numGenmoGenSolContinue< EOT > [private]
operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(const EOT &__sol)moGenSolContinue< EOT > [inline] +
Generated on Fri Sep 14 09:52:19 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 b6c525e2d..121688595 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 stopping criterion for a solution-based heuristic. More...

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

Inheritance diagram for moGenSolContinue< EOT >:

-moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +moSolContinue< EOT > List of all members. @@ -119,7 +115,7 @@ template<class EOT> - +
const EOT &  __sol  )  [inline, virtual] [inline]
@@ -134,10 +130,8 @@ 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 >.

Definition at line 42 of file moGenSolContinue.h.

@@ -175,8 +169,8 @@ References moGenS

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.png index b40e349915ec015116a4058123385084528f5689..571c39c65df18e400112d5e85da958b160ab62e6 100644 GIT binary patch delta 483 zcmV<90UZ8>2Z{tCiBL{Q4GJ0x0000DNk~Le0001}0000`1Oos70Dq(-^N}Gle*vIL zL_t(oh3%C~Zp0uAhViCr|GokA2JMBqn)@H27z1HK2DMVsDv})q955e#NeQ19Ncc#n z%ezDW0vaJ@N(ty|Nv5OF?fgb;b}yl#JmtjHQSrbZv2{t)g#%PXof9)gb50kKM~P9l zBtZtKr19zlD57HXQ|^{nU5N?heQIL|)STXqRTU8F^&e;?P54dufI;bY?OurmPX0 zT3w-l@jQ;bKRp!U%JiUa|i{DIfsuUC^yCu8fx?t zbn;XS(1PPF&H-f_?Q%L)Ie(W^Qolh~aw>gl4N)4=63jK3L-kvqPSrnK9O}^1p;!E( ZzX9jhG(Xx>J?a1e002ovPDHLkV1gQ4+Qt9? delta 864 zcmV-m1E2hg1cV16iBL{Q4GJ0x0000DNk~Le000230002M1Oos70EFxQ^pPPme*+px zL_t(|ob8%jj;k;Xg~`i(j=ckC1*3a6G*8|C5^iEUe~`3gI%$PuOH9EeALd{Q<|y00 zCGoZW4J*R9ALRl-b3`SJFLL|&RI+p&`W%;Hov|up3KC(;0H!oz;_?6+G7z%}Pf2p3h~f0zxYxp8V+Z_gDSQsvY=*Qe?Y_qnV+PM_a1`jYPA zj{6gRn|>hV=`lmn53DZ%{iGjW4dWX3J=|6A`4jPdX7J~^e{R>}-frKQ;$E#EjB8xu z8rQhSHLh_bR()4r?f(no?zxmajEOgvl5C~{n=kCXKy$7TX57j3Q8(frf0W_)h|B)R zo~y}Zov}}n*>vDSLuk3hzR6q&H7Pa@9=Sya2-N^ew#|?Wpc5#x?ormat+(2WEmy$8 z&7(r*G2_m<68dt51`A^Ux2X1BBYY zSzidM&#WI_h?&9sBKNdEfB9+{_p01g@A*~VC7f$8i#Y!3j2aIGLPg>7&Fx^Jn#=xmYz`$rAz4*v3=zKW})%Ad4*RY3{ zmKUMAC)wYkkX@h$T!g&BEU2v$>hd#ce4Ok6bzH(3H?OP;u;Z3ff0-+e6)z^M^|s(K zx1dJcNUIK8r$YlCap^vnt-lfXQN4v*7n;>m(Cgdu!+m|#N0Y^8R6Vr(NZWqM{rjLF zelv_~-1l%-z2{ebmwcXU{@GgY)%wA>#x<^SjcZ)v8dn0Agx~yPRGqb9e3dRf5ho_UHZvm+;$8vdB1fe;ks0a10}^@r+LUFriO(0*UKrtl^gT2 zxgpm>n(v*aT-RjJeC*RE7h0RBw77`7V9E;f5xAZl`b44@Z5YHneeb(gcqCS6YM{RK)fw qY|{_9e@FfB`(a$;zK6T$J^vq0?UF9hobA5=0000 - + PARADISEO-MO: Member List - +
-
+
-
+

moHC< M > Member List

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

- - - - - - - - - - - -
className() consteoMonOp< M::EOType > [virtual]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoHC< M > [private]
Fitness typedefmoHC< M > [private]
full_evalmoHC< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< 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]
operator()(EOT &__sol)moHC< M > [inline, virtual]
OpType enum nameeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moHC< M > [inline] +
Generated on Fri Sep 14 09:52:19 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 c00e93970..0adbbc011 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...

@@ -38,19 +36,15 @@

Inheritance diagram for moHC< M >:

-moAlgo< M::EOType > -eoMonOp< M::EOType > -eoOp< EOType > -eoUF< M::EOType &, bool > -eoFunctorBase +moAlgo< M::EOType > List of all members. - + - + @@ -71,7 +65,7 @@ typedef EOT::Fitness  +eoEvalFunc< EOT > & 

Public Member Functions

 moHC (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
 moHC (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
 Full constructor.
 moHC (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)
 moHC (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)
 Light constructor.
bool operator() (EOT &__sol)
 Complete exploration of the neighborhood.
-eoEvalFunc< EOT > & full_eval
full_eval
 A full evaluation function.
@@ -119,7 +113,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -134,7 +128,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:
@@ -164,7 +158,7 @@ template<class M> - + @@ -179,7 +173,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.
eoEvalFunc< EOT > & eoEvalFunc< EOT > &  __full_eval 
@@ -204,7 +198,7 @@ template<class M> - +
__move_expl a complete explorer.
EOT &  __sol  )  [inline, virtual] [inline]
@@ -213,16 +207,14 @@ template<class M>

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:
__sol a current solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.
-

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

Definition at line 82 of file moHC.h.

@@ -231,8 +223,8 @@ References moHC< M >::fu

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.png b/trunk/paradiseo-mo/doc/html/classmo_h_c.png index 6a4aadb1edb175af9af669e32b1b3817d6762449..cfc80cfae172a1a7f196f054f6737e8070b8b185 100644 GIT binary patch delta 414 zcmV;P0b%~*3&sN>iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*s)c zL_t(oh3(Z*a)clZ24H#Vvwv<7PS9yDv`^mu2n{4C3R{(7I?j~rx+{nuF)-uw-6cM! zFW)1EbIYOl&4TUl0K$*wcyi(}7mhSxGkC5{lsj@e$wbKk$42RpQF7f=NRJKdtIsZ<V^moq3@+@arUXOB~wqC;-&Txh^oZ&prL6?}Pbh%5)!)bS1 z`~q7u9&L`B(g-L2csI7@I47MB>TH+qJ2S%lbLK#K=ghn21R^-HPxUgU%&9`ZIw>Ed z?%AzR*y30|$!W?**DKaXTQ}>I)+^sXu5JI^iQ)WLr_+1q2mfyZY^u^n<^TWy07*qo IM6N<$f_LS_hX4Qo literal 1507 zcmcJPdo+t8I6OoY%#;I48~B+Y0{E`v?XPJ7Otz5TuCyx;fvKHq z>-@A=r0SAm`E!wMVE69Q54rn--d>+l_c@Ul%Fg>Rg@v+`g?sEqyl^E+H%fX^hj+3g z`WDMDQe#+FvR`rXm8N7MQ?;|t9nc|1`vE3Bx+!LYIk-z+s3?SUTbKgRa_2_k`F?!_ z06OM2YDH%6C?Ox{Kb;(FzI3K$6~?c1;hITkh{M54n_OtCU5CTeC)*gSC7nqGcysS!oxl(0T%rYSPpHLz6FzW%-X4&2d0&C2e9W8p;;olw--SxIOr`WT;P3Pboe_55ruEN;poMZL#s(WAMW^W88RGxkzEr#xE*(8|OA<=BSX7Bitl`J0N6q2CLv^YA+IHRhCmk1#O@grnXqJgXT zJeOywzdHMd}l(Piu7BM9QG9j2i?;$6w6A#dHsX zBh`IjeC9UBEt8S9e1mk9=z1WMguxwjs3t5uC8kLu3RpCO~-I zShxm^{%sk`Gr*czeG5H|WKRu4?v20gOyCgR8tgp}1D>0<ckBAk&T3ch4uQ(&; z)t$=_L-+jLB*23Lc$FWaL7Hd)Z*dySZvo8TQj>o`^Ud`&&$GX^ezcHMLi@L4$?zspl z!1*A~v-(6{(<)-+z&CM`&uI7~;KBfWtLSO~{wP?`YRxo|#Cy8V(({~6=4|`T`;e}J znx-`eEBRdH<5ck6y^58ucm0=BybnnF8-5LuJ=ZqxCbl+HGEe1ya7Z1<`)zHE^U4K- zqing_#>(PIyfSw#p>Zs%lzRPIXsxu>n_Mce3rG{us1OH3`IafVF?wF|kz(bj+N5}R z?tt}jTwiBOS9MMPdVT40K1^Xj;pxdcc;m~m2O@H5hhCxUJy%6VM5WvP<3b6CyNnC& zbW0t+5~qEZSHAqdql_9j>8jC$rs_#-WQQgOol=MkF(`=*otTIfim#U6N*ij#u>ZyJ z=QsWpKW2vSD(pz$6isW&Lp<9{&vs*UePQ&sYh^WBF!PKD - + PARADISEO-MO: Member List - +
-
+
-
+

moHCMoveLoopExpl< M > Member List

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

- - - - -
EOT typedefmoHCMoveLoopExpl< M > [private]
Fitness typedefmoHCMoveLoopExpl< M > [private]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
incr_evalmoHCMoveLoopExpl< M > [private]
moHCMoveLoopExpl(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select)moHCMoveLoopExpl< M > [inline]
move_initmoHCMoveLoopExpl< M > [private]
move_selectmoHCMoveLoopExpl< M > [private]
next_movemoHCMoveLoopExpl< 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline] +
Generated on Fri Sep 14 09:52:19 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 3847a4fa5..0f0878f61 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> @@ -38,10 +36,8 @@

Inheritance diagram for moHCMoveLoopExpl< M >:

-moMoveLoopExpl< M > -moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase +moMoveLoopExpl< M > +moMoveExpl< M > List of all members. @@ -83,7 +79,7 @@ typedef M::EOType::Fitness  - +
template<class M>
class moHCMoveLoopExpl< M > -Iterative explorer used by a moHC. +Iterative explorer used by a moHC.

@@ -166,7 +162,7 @@ template<class M>

) [inline, virtual] [inline]
@@ -183,8 +179,6 @@ The exploration starts from an old solution and provides a new solution.

-

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

Definition at line 59 of file moHCMoveLoopExpl.h.

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

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png index 8c76fd46e7d798861365f4696569afed1df2dafc..52db31402e40706c36b86156899aef33dbc52afc 100644 GIT binary patch delta 620 zcmV-y0+aor43Y&QiBL{Q4GJ0x0000DNk~Le0001`0001p1Oos70CYDt0g)jye*!2; zL_t(&f$f+}a>F1DhGEk+;s$VnPJ5xOa{nU~Az`oqn`Ce^PNX#EVd)D<_SpT^?{xcC zKYq3e^PiZOzsUfAd#>Yg%nSrqM&!Qhc=Vaph8VCM5jyyZ4Z^I2Cz#-n>O!>Vj_1Z> z2k=0w=t1nGbvoZr9&t zE$0*aWj^C)G@q&5v4e4V9RO_Vo|u(AdLK0*AHp0lVa{fr@hl#;+qmm1nP2y7Fz@%< zC74&KyD)_*OkoOBn8Lgc^Ne@etGv$(Guu`+TL0HNA~V&@zOb|&^(CRqf7}t4uyNp> z8O9gXKW@<2NVQC|W9mz}wOsYyPvF*xC4Q5MND)V_LGp(6z zVaXPCACZ|JxsP1#?#egs$Q(6c&SswREI#9%;gw9$mnPc@NMQ<7n8FmMFopTqOqgy) znduu6=7~%l{{Zk9zr~4ie}tt?;mi5#Q!~TC=r9R=X1OGqS@}n%*5Rmum}c>bGn!9e zqwvzBQSjH=>@f`>%Vege-!WRH6KMoA(zu!E42wUp6H^%q4L89NliZA=Js4VEViI)C zT-K=!&4f18Y|F%GW&&r}&}@VbFpW|*Q>PKEn4NXTy7R_N9JTU^LNzM#NpV#^Q{CzM zHPpnL|G-%(=`Hp2dH)VoWKkjlYcm0000Br;9LJ|nnJFr?ZaAltOH)GA53Mbk((x;?*@n!TpHmkplzy?f#=Sb`XT`Wk z_T9|AYje3V+0~db#jIOti6M&IF~73i-P<|$^zZGQ`^WP<@6UPuc%J9|dB2`)f8S#e zBd8Gw1cG=S_Xq%i^z3zdL4UPwcK->Ir&}!jy#vu&tyU+s+BPOL{H9L*GuqnPF12e% zbfw<;0N+y})adg_5Xhj>%i~C3%AF5)2>HWy8_*o)qWOCer-BrDbRL)&W|}&#>ypDe z+grWYeA^sq?klR>)JbG0#mH@cPR`6fvlg++i9u2XjO3j#BEVd#@{=Nf;qkL^$<6V$SGB1-KMw9y< z;0eW!1kUQ>ri1tnmvP>x2{1H_aUC7v2bCnL2XTt0zqW!Yrx;Y1b!w{-*t-W2H zRT*Lx?--Rrp0lnbVv(=zum$PE6mn6E)0B1Asb8!fRrUGDh*Rx*-cWn*Q$M`Dr|yze zw_M>-%9K9SPhztf$~}Rv8K*ZA@Ikb*n93c|Xc$QnQmQag&%Mjw&s8B$TUHjPkpQjg-oG;-^Wf& zKt&3t!#plOlVJ57hR)54tbjqVS^JNTa5ES~6E(|Pf^maH4!?;tdhPKuH_o|x`@X?Q6>nR^lv54Uu+ z@LO0`J~+YGQ{2L)zN5O;*$~UHweS*7ecz`Sn({~4I&hfkiBDd-)U@F16l5n)L`LRk zH$EE^wcOAQ`r2TA8RZ+a^g84b((KZ@kp>nySf--Mn!Ja8W%gIIhaiBQYAmkWYM^hy zzG8RAuC=?;3nwxFtc|uvrW1pq1@MqAS&locofU)=xnZPK<65(uFUgRLoFZ!Q;O@8- zF@3XhfokFkPK1Vqb%y7_pI5Uh-|<@(Jg;9O%;}Isj>;Cn#z0ycKS03|V&G=8PPr35hVBrMiRTFsBxxa)l6W&Kk*fAw5z1 za#&n4fSG)9h$D68awHm3w|#52Y%hn%$i}E#PehkKTdfg`PRG1`3Pt*;qBxPm@uP#W z^t-Cr&h;bPH|E(gdpA%73(@kP2`BMG`Q+49Tt~yAscOG?6B#(c$-xlnt&%9XtMxoB zMag8ay{Bvh12O!DTh@6|fW38ThD@Bec_92CB58kwN+MN9gmsLihleTQmRxMi4AoW$ z^=UGcC#B&tx>)&Yxw=INhWe!&151ZBT5gXb;$L_)7L2viP}&d}qWjN5UT9yBdiU@f Fe*v>R - + 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]
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]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline] +
Generated on Fri Sep 14 09:52:19 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 f665a05ef..2ece728e4 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,7 @@

Inheritance diagram for moImprBestFitAspirCrit< M >:

-moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > List of all members. @@ -75,7 +71,7 @@ bool  - +
moAspirCrit. +One of the possible moAspirCrit.

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

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

) [inline, virtual] [inline]
@@ -119,10 +115,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 +125,8 @@ References moImprBestFitAspirCrit.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..c0203e510601c0db60e4481368099a0b8377c47c 100644 GIT binary patch delta 509 zcmVpOv9}>|<}` z{kV&D@K1y55Q*KGJ*<;=avxaE=GEjhur5=#fyIhq2{0e4PS-0|QO9yGn5&`NB~>3p zF(HRb;Xskt65n32(FSnP{jxD1f6C%ht0nSfu$>mq!6|?Sd3X!ti(v87lGTbEcyq;) zp#<2wLM9sLV%s#fuJDS7u82N1aJIs*i<`mUtX|FdH{iRhgP#H3?eo9E4qK9c1^D#& zV&KE+^kU!_?1~QV;12HK4({L%?%<2Y`xq74XLlX^WH2TJU>kaLu 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 558606166..391321d1f 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]
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]
rand_movemoItRandNextMove< M > [private]
~eoBF()eoBF< M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 176752c8f..3eec412df 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,7 @@

Inheritance diagram for moItRandNextMove< M >:

-moNextMove< M > -eoBF< M &, const M::EOType &, bool > -eoFunctorBase +moNextMove< M > List of all members. @@ -74,9 +70,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.

@@ -111,7 +107,7 @@ template<class M>

The constructor.

-Parameters only for initialising the attributes.

+Parameters only for initialising the attributes.

Parameters:
@@ -145,7 +141,7 @@ template<class M> - +
__rand_move the random move generator.
) [inline, virtual] [inline]
@@ -161,10 +157,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 +167,8 @@ References moItR

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..e2933b6747b0b37b44de22d09ce536aca0505028 100644 GIT binary patch delta 472 zcmV;}0Vn>62>$~iiBL{Q4GJ0x0000DNk~Le0001+0000`1Oos70Q_JY$dMs4e*u+A zL_t(oh3%C|Zo@DPMa50lq;BAxplC1DRqlU;lK)$ZJOyqlplKn>uuMvP<{-oAqo=&3 z_iINPxZb#oi;t7vrp=Ch>jBPMT!y~J?OIp39I;sT*>MKN=s5Wm!@h%a-yB|n!yK1C z_%s`?Glo`TkE5F!Oazm6a0sg4e^$H$T%>JA97>R3^V~C2q;fQ#efTU=3vDsepN7~5jl1Du9ugofw@VJU7(6-&bR(vW5ht;7}_w$lf- zyL$;|(H$IuDmd~sxP-(SFT6px%54#|e@|BGty0t8;wq=&*w!U3La_zzAi4$@L5eaP zWzukv)YJ}RTRXI@be0{RF3%l08{H}`b@kra8Mkxpel7zya3^tne~e$C0002M1Oos704^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<$f`PLPD*ylh 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 81a1d0641..08c6ae14c 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]
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]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 d3a290677..d96fb07fc 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>

-

Inheritance diagram for moLSCheckPoint< M >: -

- -eoBF< const M &, const M::EOType &, void > -eoFunctorBase - List of all members. - + @@ -122,7 +114,7 @@ template<class M> - + @@ -148,8 +140,8 @@ References moLSChe

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 d2e032e7f..62b5742fb 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.
void add (eoBF< const M &, const typename M::EOType &, void > &__f)
void add (eoBF< const M &, const typename M::EOType &, void > &__f)
 Procedure which add a new function to the function vector.

Private Attributes

-std::vector< eoBF< const M &,
+std::vector< eoBF< const M &,
const typename M::EOType &,
void > * > 		func
void moLSCheckPoint< M >::add (eoBF< const M &, const typename M::EOType &, void > & eoBF< const M &, const typename M::EOType &, void > &  __f  )  [inline]
- - +
-
+

moLinearCoolingSchedule Member List

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

- - + - - -
functor_category()eoUF< double &, bool > [static]
moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
operator()(double &__temp)moLinearCoolingSchedule [inline, virtual]
operator()(double &__temp)moLinearCoolingSchedule [inline]
quantitymoLinearCoolingSchedule [private]
thresholdmoLinearCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 036b3f9ab..9064fef9b 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> @@ -38,9 +36,7 @@

Inheritance diagram for moLinearCoolingSchedule:

-moCoolingSchedule -eoUF< double &, bool > -eoFunctorBase +moCoolingSchedule List of all members. @@ -62,7 +58,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.

@@ -119,7 +115,7 @@ Definition at line double &  __temp  )  - [inline, virtual] + [inline] @@ -134,10 +130,8 @@ 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 >.

Definition at line 41 of file moLinearCoolingSchedule.h.

@@ -146,8 +140,8 @@ References

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..969ab05a507d19f745263f7bfe0ce8e471e341d2 100644 GIT binary patch delta 455 zcmV;&0XY8K27?5U7Ya}W0{{R3Y;$7=ks&jG0hvieK~z|U?UhS%!!QVj#incE26AuE zUMQ>F{|E&MJ!3m|tG4b`cp@Y8>kAl-?cN8Qds~Lu>jZum&=V(@eHSeAX0{LHBIG`J z2I#%+B9qdxNKTR=tLFn+7d^){jmWC{n?O#gkdUf%pg0I91lcqcZ(J4e09<$tXr2;( zSw%VWRbW5_AW;DleHO?CSSMQJwt%*`0a6o8kM>B(+BH3LRhQ)=pMnasE_;5`sEIuMJbP83U1R!TM;R%KOBtgV&u^Q?i|HXGC;SIjzm=Ng#{{I@;gx$KE#o1vvUM`T@;kCmxjR-aY^T002ovPDHLkV1nX8%I^RG delta 802 zcmV+-1Ks?C1ltCX7Ye`x0{{R3aTRq$ks&jG0`W;iK~#90?V3??;~)%%&C5O`-9X+O zv={1A?tg?ufIv8y+78_$Q>jx2Wbs9yOdS4U`J8Oa$2!&i8t_Mf0HAtQym%GZ4y59x z`_ONI6fz5WU>uG_$R0p;BQh`s#F%41ri5VvL`oih3y2w}F757>;%NThQYgk z9tVaoI>Q#2rp&ogQ?zl0>lhf<7rVvzb`2>vaRWTHhN{Yhaa{0Fs&ZUI0yVBDr}fsnR;^2~s&)@UH8VOwC)6$A*;2}N-c%|T5W)+$G^ zmaq#1$b*Vgi5S6KH7gAiq5uJOhOqX4Spr%Sd%#RA8LrKgcQQ;II+EdV4MDFV$|4Te zFqbRLYQ3v6zvwE1kVjQMYx|nyHQ+#!e77$L16~78e~eCl&_4@ky3GWe%`>2X0S#zC z0~*kP?+Bd!gY)%&V;e9TRqdwAB-vT}O>YcThiY)^JOd=&@yixn&SOy8yC=pfqOG9O z2i8M16$p(}miEY$xoRXjPCfm9MB=2i$T{gW&Y;R88=m$$59}T%dIZ=#PV^A)s2Oku zaQb6(`h)&iK+|m|*leBw4QN0E8qk0Sd`BQmw#Cn#h%?|^pbP&SzJucMZsV+d)w=_3 z%vY!1I`@H&uMSd%&c*f;vT!bire4U - + 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 07cf941ac..424d21455 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. + +

moMove< EOT > Class Template Reference

Definition of a move. More...

#include <moMove.h>

-

Inheritance diagram for moMove< EOT >: -

- -eoUF< EOT &, void > -eoFunctorBase - List of all members. @@ -61,8 +53,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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 054585e6d..09f97896a 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 - +

Public Types

- - +
-
-

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> @@ -38,29 +36,27 @@

Inheritance diagram for moMoveExpl< M >:

-eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase -moMoveLoopExpl< M > -moHCMoveLoopExpl< M > -moTSMoveLoopExpl< M > +moMoveLoopExpl< M > +moHCMoveLoopExpl< M > +moTSMoveLoopExpl< M > -List of all members. +

Detailed Description

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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.png b/trunk/paradiseo-mo/doc/html/classmo_move_expl.png index 66c1602bb04d70818190b561768c8297e0e2f84b..1b27438a76a121d08784a4aedc4de6fba1e03040 100644 GIT binary patch delta 948 zcmV;l155ne4%Y`EiBL{Q4GJ0x0000DNk~Le000400001p1Oos707^FwW|1K?e*bX~Z8N)V@yO$GRgR}A zp-e7=Km!hkX6eF|#=i}!bpUGL@Gs1j0C2`Q?C6jefsDj`LckfKURQ6;3P5>iwNDXN6}qyG44)bCcq4>8nuw%!$0 zQ5AKmkiW}*(R0q{rr)-|5;Y;Xebjr?Z`)sh8bX>pxI8s9;BXYR#FC=vsh7+`vg(NH z9l-j89Ht^+TWznpGP{%1=8VGfuf8wQqP)Ax;iYg&R zm5`!JNKqx!8}%k60n|?cpGM{mdR(V(N^dw-Pm3zfON^PN=85eOFXPJzH0x2K;jFU;)(%)j_d{qp|>BjF)Y+s-|1o zuTi03;#dLII;vQNe*vWzMS;Z%b^Xuor9Gm~byHYCF;D%~0;(C6{Sqoqjp5BFbO{p# zE`ITOf<08Oo0?G%6;Rz#vtNvXk64UzcNqwddgKd+X#(_w_K~ANs9ZJ!>GA-zp@8a+ zn*DNZ%|B2f2oCGvsE41KQE8GT>KxTW1ytLp*vrLC@X;tLe@k#i&9@!xITcz^pDv)< zMD;Z)Eu;!{E{gIC)Sal}4sfV|Y9E!IU~eN=;YyjS(Z{V^;NfOs~vz*iyhz@HI({%;kVU#t6ob{zXfW8^e-z#{qIqmpKY7<+{1Od{sM(@ WTFj-d;Ya`g3IG5}MNUMnLSTa2?zFxD literal 1884 zcmbW2YgAKL7RLi(C#CZ6!5F|Q)`m6(Z_C3nK`iAV%3~oAAQHF=A__8s=na)XM#L(h z26QNmf)Jpf7~oO~N#!OWj=VGo1ju6mjq)&%5Gh0;20|ufb(XF*{nGhxerunz_B!Y6 zv-f|W+@QdHCdO9AC=|-XcfWTC3S}6jx79{#^yJ%M^$RFWP(bKjold7Wb-GptBl?=& zS{<#et?B>Ljq9fdP)HyF_3bOkF%;^9IbUy&(6hIcB{4~re>3;7ra3>jmmDoKtN{~x zo%;Qnbn8VE4Ycy9@9Sf&Tr%pN3`R@|ZdaeJPf6kK8W+2N+&_mJp5rfeb_znadV%JH zYdwC$>_)H$6M1qdM6;2&!b4sabAA|FLeO^xEJ%e;!Ss*5OsxEL)Bbx`kfS?AW{JzoA*(19NZ`UG;%B+SN~#BV8Gj~ zzvo-oB>K6r+*7T6n+Bn0jL0!R*JPIgXnEHEiTmFJEBGx&I?0B2r&si23Fn_uHlT^x z0awR#HQc~b$*q~;IuBf$8MrVDMbl0D)X>2q`y&y<$m8}7CRtECc{+un@FW61T&(T> zSW+3|w_`R)>=HJ%Jai-YB?wJ44MxyegqZI2F^9RAUi!tr1NcSt32=&c0LciH9+@{TaOPA zo@Z(nBIm&bbLZQE1;Lm2XB~#7TamdKrt>Ywk(<69BBn#h<8<0p_m@DVSS!Qbm*c7$K_k*nMPmS8teB4L&|r+Qr6XV-q^6`k|;JHcdM7e;dUFV z+~f+wWXJT4@XmRwrOr2or6P;U!8QM2Gg6v6Rvem9&W$l>*AEJgc3tKLj2t){i=G$^ z6Kh(ij3vaU1JsL)8tyh}e?+%m@6C9~oq^ zSODFOBKXG~J}%z%D&oT3d}IFH!;PXONeATZ!SyvtNVPY*tw42p8TvTnqKvk5O%KMHoHxiuFq>R+&a2(IK0 z&p?koHNeTVaO*J9TD5B-kW9wfQ?If5uwey2!MQ;HUzS|!fMUj;!-~^s{B8(jld(>p zoM6xV6K;`nM-@d>;#TvqgOj7zFq9g~(RFm$k)r_!s;4Y*4PnVZYrm@c`#EsypKT2Ta&}6248YRT6v|0<4PkU61ZpZ^dQS$+$dahOIKHU2D&Y(16&#Hh}PcxBlv6W$b2+P88Mz!%!u`UvVUz9P0@b9GH4OjWtN z-L*@q3NSvM^=71JA`Zmm9h4^WtmDgTs4Lkr=-*W^W-x^KxT~zrPBBzRZoi%)T{d&? zD}0m_X-B2=2#erz4OIiXIm%@)sB+Il{I-bb+Z{@)CBdOPVkfzO-4QEdUteIzBfI;g zV+5@>`{8G+NqkW+d9SXwnIzw0|1?WuU0OCPiyNHHo~kA3ze1Gn-av2IGdk-(;*yhP 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 ff471c60f..040c053e9 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>

-

Inheritance diagram for moMoveIncrEval< M >: -

- -eoBF< const M &, const M::EOType &, M::EOType::Fitness > -eoFunctorBase - -List of all members. +

Detailed Description

@@ -56,8 +48,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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 bebc1182c..2c37bd245 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>

-

Inheritance diagram for moMoveInit< M >: -

- -eoBF< M &, const M::EOType &, void > -eoFunctorBase - -List of all members. +

Detailed Description

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 +48,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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 e715b8d5a..18a672d4c 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...

@@ -38,13 +36,11 @@

Inheritance diagram for moMoveLoopExpl< M >:

-moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase -moHCMoveLoopExpl< M > -moTSMoveLoopExpl< M > +moMoveExpl< M > +moHCMoveLoopExpl< M > +moTSMoveLoopExpl< M > -List of all members. +

Detailed Description

@@ -53,14 +49,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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.png index 82d725cec160ec109fdc0604bc0692bb3176ad12..3fc99c0f6b664ce32dcff9c3a63462c1b96c8d4d 100644 GIT binary patch delta 989 zcmV<310wv;4}b_EiBL{Q4GJ0x0000DNk~Le000400001p1Oos707^FwW|1K?e*>0D zL_t(|ob8-#Zrd;nhGi7!Z%H?hdx2pCcAf$Sa{nVtBqc{*j+Mc*qLyzq*s>Yw2}7yN z(7a0Z>+R3!dSdpc^tPU@4?z`FL2b%~zuVXt8%}LIVjQXmG6i~pT0~rq>YPV$CV;>R zJPe}x8_r*U8B}Wk)_P<|Cu=xBe`T$+FhWF%AmlNqt8Jq~uTqUI6*Hn%te2y%mQMU} z^_U11P)&@at0n7DR2$d3O{*GF$5%DH^8guo6_!=ftN0k*t8wAO3E;rkH$kxj1k_3| z^3$rxCa6CLwMT*~sDe7rhwE;=j|S-1M5wpV(FEO^2lf4S8;#JbiBM-+e^!FZAwlJk zpmIo1IV7kY5>yTeDu)D>LxRd7LFJI3a!61)G#+&^r;81Bf{bj51yxXaR3=`EYx#Y@ zU+8eE+woVTdIYn3KN;zE`~|4X;wN8Bm>N#tVW?`J#aC0)$cHUHY9OjM0INOnLMJL5 zR2&%^`OAxjdx%K!gnSjMf6_;&aDZN=ifbxnM7^_KhpIH4_@nY*1uBFFR1=>^S2xx% zs9LESb%`UBp^m6(pn^NiUWH|q^eR5C@71{Qam_Ed^nG`xJAiMAVh0GQbw)PS4sCUN z{3JpBuBgK@vLzN&LFLgzAFjJK{=Y1`H4*AOzq~XN>O{Z1G!g1df6GcxIV7kY5>yTe zDu+g+-k8LI`pJ+}@w@|{3^|pcGUQZ(%8*kDDnm{ss0=xkpfcoCg36FneOJ`(Z^wT1 z2L6Jy-CxiB+YO+8pZ@J+LOnh0hoB1T*}4MN;U8mahpOy3M}AcmssT41LoO_-Nlb1S zZCZK@AR7wPD$wUsV&;mZ-Fl3e?SY%4VoLRmB~k=}?vS z>Lb6Zebkr)M~z;EJ87@3c5U@)+yQ7`tsJV-9pJ#PDo5S2*mYa__!65^E_W?;RP~e00000 LNkvXXu0mjf^6bW4 literal 2000 zcmbVNc~H~W77m*rVqjE61QoU7fn?w^Jd!qaliS_nLB6ZeD|F1W_o(K ztykZw4uL?{yMN#3V4)<7sTOhe>eo98t(4m==~jak`|IphikcR%(AGj#sz;=@wM(MC}muiExY;E zR%m29A4!Vbpud3qh&S=h9SfNtt9=l&cGWNApXXcG!0P{#l61ycXxXFU2xzT>eWx~c z&ZqNQbjsL)DRf_$oGlR!HcsIg{@PTLy11qGv0>$N<|WZf4Tj#W0J30Kx`3VTq1x16Bv)nVqGPS z1MK$VZ=w0SN3$Y&IJ^XY!3@GvN15RGXK>+jId$Jyw)CQ~Pp2z4es`#B-Iz39sxhK2 zaavfKXA{(?l?fp~mS+^f)Fi3@65wgD^V^`QL7cQN1z-Y`c; z4>jqe`Ql8#1WjQ1!(_u#Vh3W#c-z5}tPde)t4&zgc|&gMtC2y`0i!u*Yz=<&c#{SB z=i|URC*iWc?#VX*J}vB!}m4nkii$)pst2QaA|uwbSFy37+;Fq@&C)dJcc~ zjiC@y+XYRb=Q;h$%rOvB^Awfa^A^z(?_9m?&Q#3bSwt) zG$taQ)e5*#05*d0uy|L69!HoxUv$Z>2A-9zwRvQ^<^(`QFXzE@(;L^Q<{Ui?HB?v} zq{DO<9lnkEcti_9Mo^5dhiy{s=o=w?>e7^PiQ2$@K!PCTT{K{oR}I4Sj-|$+#adxM zuGLf9MawzP_iG-xFmN5Tws~86@mFQW;9TETvZ_-_1P~DP)tyt(`>RH^C}DkHsvIsd-AixjA+^2`nXsJ#W_y9E`F$o&)45-1oQi|Nl{(FkusHA_)v{f{#F&Lf8T7Fc#Aty_u#r53Nc z^LCsaVjRYG9QDB~)Dam{3y~AaW{*`Cs2{}*Oeg?>spyB?%iUuCzDGBywm3L`(#-r* z`GXkrw-P1?c|Lo9m>O>?g5(d>(0Z!2igC> z%}YA%mScZk-XkACv$>N5D@=*sxd zy?5y1dI46<7r(BI5ac@&Vrb7acJ!n>{BE;9fClyL11yn_o+LLujDxd}Q8ny+MtEey ze$pMulHP7k*7HH#=O~%qurD$?LEe7G?0r;IQn@Hms7~Y4^-U`l$H&Q!;z-V5#m`` zscWQ5oq;dyP?&)qCj#ACucq0L`&XNz0gz=ye^D7^7|70K3U%2#`E)U+C3 zN?rZUzyt-LwpBjlcQ;vNC0%&mk9}#xJ*b&^Eq_|Ew}WBqL^rybd$qc2zI9L-0OWcz znG=};utXZkMv|Iy)9zVy6NUHcqH5nKoH$+U5A0dLzl{YXAcu*F9fjS*yn>VV=P;Cg zOlr?!MZ~evh;H+IF#Q6z*(OQ9*2T)R%hTKTR8(z#LAA*LxvWr9Wj{1(^NZKge8yAN uRj(gSsowd;zwCS;$8xqC1;GQZuPD@14v_iYK`rv{7vhfaZ~>iyQ~wJzu){0> 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 32a6107b3..50cdc7db6 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.

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

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 bc6c71ee3..6efb759c0 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> @@ -38,11 +36,9 @@

Inheritance diagram for moMoveSelect< M >:

-eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase -moBestImprSelect< M > -moFirstImprSelect< M > -moRandImprSelect< M > +moBestImprSelect< M > +moFirstImprSelect< M > +moRandImprSelect< M > List of all members. @@ -63,9 +59,9 @@ typedef M::EOType::Fitness 
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.

@@ -138,7 +134,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 +142,8 @@ Implemented in moMoveSelect.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.png b/trunk/paradiseo-mo/doc/html/classmo_move_select.png index 10bda515a7357fea269e9504ccda8891cc87c296..0781eef978a681677ee59b2cefa2fa33f49bd163 100644 GIT binary patch delta 953 zcmV;q14jJb4%`PJiBL{Q4GJ0x0000DNk~Le0005m0000`1Oos70H>i6m60Jce*j@uv*#cfsEzs=kLdVy6d^*l(Ga{nWg8D{M9N3txz#;$qY^*VTXem}q@ zP1hAxZ_253w({yvX|A=2mDg zKDXl%M$VpT*UxPi2jjxet!%|~LRN-XHe#XOvO2GB{#oi2R(q+@f7Z9!OO3X^ z)n00}^{w{Oy}n^hldm1%Q2E*cj?~Aac7h{yFWSe$*N$+Y?nQgAU8>Rk$MUrU94cQs zz@hTB0~{(}JHVmxwF4X~Upv5|^0foJ(#PZMDoR_@4CM>^6%E*E-;yuv*J#gShVq5| z8tpmEP`)o9<+oYop6r(ks%w}aG4k!o{Wv?g?fY{M0; z%7=Z_t-~eIMsm&Swk7R!uUR;0Uxo|!wl8Vb#SFtWt#+K#LiAYCe*&3~0nyB2PivxE z7$ghUgr*SChH`7kBechh#u@m67Q4m{=onsQ8IH8ed=To;kJ|AC0QRB^i`T%K7qnog zpQR~48~ibrVqyUUF0J}JYc(_J79OJ05K&Ki{tBL z44GESjB#8F!fa`Ee;6IkS?(?2IGvhXt~E4&kZCy4s(j8(MAA+cplIV5E86J4pmj_P z%W$zh9vm&l*eDN=*{0={oN2hG#jez2O&iCS502J%B;ySO@32AZ#)dJRwDYJDjc(Kf>2Eb!{lTd3@t63%VWsy#W=a85hz$v_>)0W|df!$!O(%LI%Mj+YiJd(nPN7yDnq+h&b6Uyb%H-HkTstI0Hd;~UmArGLYk brq6%As5t(r4}fw@00000NkvXXu0mjfqa@~h literal 1886 zcmcIlc~BBq97gjBLd^xm3y&Rks zExe*c%{0wwbOCP-vJ}g*WAhF}VcB-J-Ddh@|7d5v_rC9&_nY_L%=>=x&SSiGgMnH= z0002q4S0IY#Xb-Uae=^XXOUO`GQ%-#bii9{lm5=nb$X;8jYeID)Y?a3XI7g8$| z>+R(OKu(RG000yg_P9A8NWAv`8a77YsEV59iqO2XJGKYe4j!yE5e0Vmc%JgK%^yX! z@}bWQ*U3yAGEObn=&c!G0T+T4R_C`1Y+aYr#ml<)5l`FyM)VG%YR3%1oKb+i`)C$1 zym7y0c=N6ztj+`yvYDK@!XwjXEa_F|2B&@`X`vjbI-Q6k<4A~~#6LR6u##6kan8!* zO=s-!l&wV0EW$-o^O8rd;hiSKMh;1UQg$o2;gm;=gDlF@CpR!Ei7m$CMkjGRQYU! zFqwYgD^LVdOIj8fNbuE%q9+ucL8`93vJX_5082S@(+m$T8;J-fV_Jmo5B~H8XW6mb?vphRa?$L2?2z5B~ow~gEP`urNoG|94>BFsIxhZMlm7pi{ardNb}I%y$=ygV{~8BlM9uB z)DB0YZ(|nLZ0NcjcJRX$T<9qJKDK^p+P}}1=@nnyn7IfvK~uDBu?tOxxo?khpj=H~ zjKMn7KKh)2Me*P#o`@K7n)yETG8^Bc{<0I;&B0`@#bNe8S&S4d$9J#3ndfQ3P@y;o z_r~gY?z1v$X_AuL(*0J|CZRA?R-1C{8d~%}kO-$n^uuI=mHhBFtfp#hScdjrr1!r( z^}j;20+)p?a6e?5-Vv?kx0*^1{sLvUGh;eCGv>myN~6dLxGUILY4kNp1`>t0)#ogT z;SRBSr1D!Eh;O%Pn33^XsCzWMmpOSPe|Act-hPHy+A8sG>ooKreBc8Nrsp4$pEk0-nAKd6w7sy79p`yAA|27eE$@2NGb^n9#QnN&!= zahYCyq|c(IAqa9EM`I116eZPDcAA(0^N7cE&IdPHomBG45v0|y1}p4wI>$pHccM)a zJo;*1rgqg48bS(D_0nx8S|aSW0>6P7a#R|apst@um3L34P@4Y?{$~<8|A%J7gYLPz z_F~)RA237eJC0KKv@w@ee?+~V6idcA`^_u z#&KDTU&mc!Eyl}%7Div0c;Gozeyh!+GN+-X<7Aqy4KsC1T^n$-r%|0-JPe-FADjR= z<1p4N8BQDdS?p;4vvIUOan{1!knPIVyDhXNR@HXuG%ghqN^D+iipzE`9TLYRCtFoU z-;@L#M2ubZT2N$@0cz>4W{bTgG5l9%X(U4@YS@gF~z10??UPjX)JCVJfYXxeLWv;sm94*&Q6c?(j&o zJ4t!|Y0s)d&KUNA`tH%CKt7-C|L{~?g!MbJtYSIh<04^M;#o2AvZUoFSXZ)oR(W>o z(do9^jTEtWop_g{$&|W0GB`SHk(DFZmy?cNP#Xjt*Wrz5JodfC{S8V%sH&;ZluDVS z(2N?`g5UrS69OOMVuqs(@_G~wn;w$vYS>P^M<7VA>_@J;sL~TI_(47DE?+!NzeBcr z{<=9|NRp=s@p8224Kiebwf*wGYoN6(e2xh#9}i+x5xzF(6C^KQ1b9FZ1gl65=8g|ph-P> diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_next_move.html index c05be5a02..8beb64130 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,27 +36,25 @@

Inheritance diagram for moNextMove< M >:

-eoBF< M &, const M::EOType &, bool > -eoFunctorBase -moItRandNextMove< M > +moItRandNextMove< M > -List of all members. +

Detailed Description

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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..17c4c95d1c0b922769b4ccdf0967f15527be7712 100644 GIT binary patch delta 479 zcmV<50U-XG2!;e9iBL{Q4GJ0x0000DNk~Le0001+0000`1Oos70Q_JY$dMs4e*v6H zL_t(oh3%C~Zp0uAhG8>n>>I!dMy=HIbd~!bq4@tpLS7@0W`QCM^!czQ-@)bBU{Qv{)sB4Q zT`{;BLo2b@+4%}%$%GRek}9|zfA0ckWs4Ap76jOG?SUoIdf>glEqaABXW8J|vh#t} zu$RPnSM?67p?8jd3-e@y_+_M7T_-!^cJdd0WCQmfaGgJlZSv?@LwDTtd1KsTnr@7{ z`D6!f;0A8s25#U6?kBkSCi!S{d%CyOQ3kFPE+&m48$HvsHwF=4MM?;M5{5HDni&mg1yT@hI}WG^80rE3pL! zcgCQ1YgFVl>In`>6&!g7TtZ=06y6Z|lx~)@h)U_V#-;2dZs9CAj&+N(RAhs@$gaX! zl2KWWvS{EiuhKiLWA8AsH8NRFbl!KEtWB$oG^^`mXWYrY`@Ia@z%}C9zIcuD`~o{D V6NzN?Dh>bu002ovPDHLkV1i?4;9UR! delta 1015 zcmV0002M1Oos704^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]
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]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 f40dd8b27..16f625eeb 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,9 +36,7 @@

Inheritance diagram for moNoAspirCrit< M >:

-moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > List of all members. @@ -50,13 +46,13 @@ - +
 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.

@@ -100,7 +96,7 @@ Does nothing.

__sol a fitness. -

Returns:
FALSE.
+
Returns:
FALSE.

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

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

Nothing...

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

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..79fd6d32db3ee10700b17b50c3a92acfa0bf07a0 100644 GIT binary patch delta 439 zcmV;o0Z9Jl3El%CiBL{Q4GJ0x0000DNk~Le0001i0000`1Oos70L<(Q>5(Bbe*tt! zL_t(oh3(W!j>8}f08qS{wapEj6O3jq)K%_(gfaevGz29Q8Z`@?Dp2aaItDfU4#s!- zS;k@tT_MMW^+s8zxvuer!0!p!zYv0qbS`lD8731XFOz(gjgx`tTF6ukzgW`b#@U3d zPeJxWs&a0HCGUjA81`OhA86SLf0bwjlGbr<1&TDQYa<$gwb$IOA%uPn>{IK5?S%=} z2UmN2V6p+KsUnb{@(k_9E(P&%-fp9oNST hw_*w*4FB8z0hBcKd#9da4YdFO002ovPDHLkV1mg$zg++T delta 1221 zcmcb|{ESnvGr-TCmrII^fq{Y7)59f*fq~Ht$UeZr3?#eKuWy>DXk5=ylKlMGu@f+~a`^~I$LJ(BqCKFzb^{`806e`o)g zdN0<#S#VLp5spI|E_ZC6Mpf;5sl)U5m*(}LeQT>7)Fq$);1qS6neVeRMeoGXAc@am zD~lzQ8NJ{1Ofh$TuQL5tu$^dNJ&$r=_v)T${X4%z9g|$#`M7OkkLlBmapzZx8!!7Z zW8Rwkc4(YDi~{+0HT zumGue!&%u4^%aMA+)!GxYF6Bq31#v5PudD{o|k$#5Mvl@IS>b(LK0 zyIe+ODevM9visOiM8!x# zLoRRcd_NiYZFyT@#?1?y5yxiDHT37Sw!fAU}j{#y36>3ep4<%Pe&uihFT-K`~I_^SEiEAGqcE&CJxFS{Rn;A&&} zGWKI~dyH)j$_&$Ck%SaqsLVt6KQDXr`1gkdmlwMYuCaQ@-dw)5T=nm5rMG zWIp*J^o`T)|3T#3j;fX9+O4|nKdo}@bN8(WBTXxtKQDecDxUf57AY`ou%>W)aB- zPC$iolVwiFU%Mi5w%lZEZol)|@-@?gdnSLiT_?DwV%1ePtBa= - + PARADISEO-MO: Member List - +
-
+
-
+

moNoFitImprSolContinue< EOT > Member List

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

- - - - -
countermoNoFitImprSolContinue< EOT > [private]
firstFitnessSavedmoNoFitImprSolContinue< EOT > [private]
fitnessmoNoFitImprSolContinue< EOT > [private]
Fitness typedefmoNoFitImprSolContinue< EOT >
functor_category()eoUF< const EOT &, bool > [static]
init()moNoFitImprSolContinue< EOT > [inline, virtual]
maxNumberOfIterationsWithoutImprovementmoNoFitImprSolContinue< EOT > [private]
moNoFitImprSolContinue(unsigned int __maxNumberOfIterationWithoutImprovement)moNoFitImprSolContinue< EOT > [inline]
operator()(const EOT &__sol)moNoFitImprSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(const EOT &__sol)moNoFitImprSolContinue< EOT > [inline] +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html index 9eaf85d42..056195951 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moNoFitImprSolContinue< EOT > Class Template Reference - +
-
+
-
+

moNoFitImprSolContinue< EOT > Class Template Reference

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

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

Inheritance diagram for moNoFitImprSolContinue< EOT >:

-moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +moSolContinue< EOT > List of all members. @@ -132,7 +128,7 @@ template<class EOT> - +
const EOT &  __sol  )  [inline, virtual] [inline]
@@ -146,10 +142,8 @@ Indicates if the fitness has not been improved since a given number of iteration __sol the current solution. -
Returns:
true or false.
+
Returns:
true or false.
-

-Implements eoUF< const EOT &, bool >.

Definition at line 43 of file moNoFitImprSolContinue.h.

@@ -187,8 +181,8 @@ References moNoFitImprSolContinue.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png index a727d6003d5dbd84b5aa3fd7373cd4b1d99caa0e..dfd768a2f9c12a2074763981733d8f24ac4c6316 100644 GIT binary patch delta 523 zcmV+m0`&dA2gd}E7Ya}W0{{R3Ur2loks&jG0o_SNK~z|U?Uq4u!ypVr(I#s?HxMW2 zv={0s_di0B5H<$ti91dvNl|ON!C(I&5S_TM`^Sg-jCYR-c_|1Z=p#m88H=IQL0+ee zvFdJy1o0PNj*B%9bs{pj2R+f+G! zLO-yMs6r(zWUyqTN_e%{K*I9MAe>#(R@9aBls(AeJA?q4(Jxm=*@1+8NVL`JAcram z>$+6d`7dtvr0TBQ_e6S!^(yBCd4oz%RNYn1$)WB#KPF^CULNw0uSAFAay;cpA=mFW zfn2WFH-WrScTLEIOvr>x$b?MDgiOePpCGt@c;`gDqA5$IzxGqK1EGPqX|TUCQXrsw^C(T6{6Op z6+(rxg?N!C1JRq2E*B_a1eD5m>gH{#IxGsgQMN%3A-_UIspj?sY>cvpB%pzIR9P8< zvL|&VN@*apt)zx5z9UGo#(24eaw~-PA>KKwq=Aeoku`21ego0;27>LLRNd9?N$#q( zyBrLX8(Yqa{yQb)PBevVM%`WIoOIo_8~uSh9RCS&LQKdrLLTvz=m-1jWdNm}k?H^d N002ovPDHLkV1lEx?MDCr delta 902 zcmV;119|+%1iuH67Ye`x0{{R3LN01eks&jG164^xK~#90?V4S3qc9A|?Uz0y-M~IU zXZJ$;l=~lHE%{3}4h2FOLgjWKQDps)B|79^o4@ZL-{y~h`%uV-LL2~!w^*!)LfW@j ztT^}G0SOs6V2BGp2xJKcGCPLQEB4tB;m95{1n8xU2S?WY7MF8c2LX`02uU>|>x+2niu)whB(Cv)>h9V< z-15iAKwi@74;l*jwUARDiB5UAyCy_+;mbj8)LjZuh(Z*i5QQj2Aqr7lSRtPRad9uG zBi*pr27(Z4$h3X*iI}_ysUl<5nnuDF`YaMYQ=~@XGpT?{f8*_(QBq`Wm^N@a%v(Dv z1Q+)x4C<_o=hIpYI@6QD5y0qGGDvYd&=&toO$@*~IEDS{(E&dGn+Sv6<6CCUOq}$Ug<* - + PARADISEO-MO: Member List - +
-
+
-
+

moRandImprSelect< M > Member List

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

- - + - - -
Fitness typedefmoRandImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
init_fitmoRandImprSelect< M > [private]
operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline, virtual]
operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline]
update(const M &__move, const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
vect_better_fitmoRandImprSelect< M > [private]
vect_better_movesmoRandImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 5a65c605d..e79438b0f 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> @@ -38,9 +36,7 @@

Inheritance diagram for moRandImprSelect< M >:

-moMoveSelect< M > -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +moMoveSelect< M > List of all members. @@ -52,7 +48,7 @@ typedef M::EOType::Fitness  - + @@ -77,7 +73,7 @@ std::vector< M > 

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.
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 improvement of the objective function is choosen.

@@ -103,7 +99,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:
@@ -157,7 +153,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 >. @@ -188,7 +184,7 @@ template<class M> ) - throw (EmptySelection) [inline, virtual] + throw (EmptySelection) [inline] @@ -206,22 +202,20 @@ 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.
-

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

Definition at line 77 of file moRandImprSelect.h.

-References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.png index b935a8e2fa9abdb9411bab10b463c3c2bc1e48d9..38a074a5885148f0380567bc14b83fea38063b35 100644 GIT binary patch delta 478 zcmV<40U`dh2!#Y8iBL{Q4GJ0x0000DNk~Le0001&0000`1Oos70Onl!Mv);ie*v3G zL_t(oh3%C~a>F1DhGCPner|wI&}lE!RqlU;>VX^)lQe0WX*z=(0|MzoLS&pi=E+-n z-=@ie&4AVR?gD66!n*5a>tq093-s_Zg27D3uv*!^qQPV!56l^b7oqDYkH889R~TAt zuxY1WGHiNnkW%E=Wf5RvH-c@5e=r$a+6@+H0~p&Fg>9ipmC8l1MvlXhE4pPz`vz95 z0Cn>wMCP#jk$HYv$6~O-nb{fKIWsS!3}k( zKY*P-UlevapI;RA!qr@`1zWHMTd)ONFcr)bN;EJ21^Xo|13~Gw$sn8DfBll{``i^Q z1+9mX`5a)}BN(xo#WBNRa$9&EJg4)b5Rpd57FpIP<2H<-ZUSR-UM6c~9kthO3&=#;PbX&fN2IPz>Lz>%07*qoM6N<$g0`s8MF0Q* delta 1041 zcmZo=*}|dN8Q|y6%O%Cdz`(%k>ERN@z`zJ(G8|xG29lD87lck!G_Gep<>}%WQZeW4 z?C7$`3OsFZr&qe&YMdc^CTE5J-Ty*toSe*Melqc1#-h1*BiOz~ay)us?^Dk{{iVN5 zRGoDLvkU`6!>gVy(fwQtN?ne6y6F6=%ok(+Go4^(HT#n(}tUD46 zLE8+3JXk(y?iK1*W>5$;n8s7zFpK%5)O%(RyH^}r7%Dj|#IC5koXRlc{X4^kC+z#C z^t2Z@d{Hf9*#6AHl$+zI|E7R>tdp2oN?z;iSZvY2Y;nMxLE>LT-L{%J?;f6ItgHQ3 z(s2HKzdWCT4X5k@Mj2Fej+y6wQ__!c6TSxw+zj5jAy4esWF)X8Yx|8ygg7 z1gw@XXidswklNWA?fE|~nkQ;|xWLyM-VFz@Fm~MdD8!)E{KCvtWukUNmco^4ecKhs z4pn(G2V9X~eX6eGhk2N@0^1T%h80s%vVwA7ux&iywIVKxA>br$5^n>q!nR3sYemv-f(EViFH!Kxzl9Mf~R<_q~e$RS#Q`M51 z)#l3VKUOjvmOtHIZ%|p@@Nm=J0x046f&my{sA$*2pX)P#!5eow^JXlXAbT_<9c+Gf&HOxq|tn0B{({%=q_zm1AF3o!5IK??^ebUnRZxt>01bnw|IV{A; zyu*%3_1m(Wm(uuVJgUg#i}-Y!yRdZ=U&!VILHjlOs!vs~Z2>v8fd9aUvUpm;RIS^r48fu6 zbA>m}7j^g*?sZ(w(vmVVZhft{^MPEB&g z9iuasi<|B;h}{=;I8pl|v9p0OMzoQOL4-l8p_K2$c~i>`XPOTDTj0WwBIL9py>aP2 uMjP$)utVP00@y32gQ9OeqnrJ-|IBi8Rex;Ke{~O(**#tTT-G@yGywqTdac<2 diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html index 5394d105a..b6b47c25a 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. + +

moRandMove< M > Class Template Reference

Random move generator. More...

#include <moRandMove.h>

-

Inheritance diagram for moRandMove< M >: -

- -eoUF< M &, void > -eoFunctorBase - -List of all members. +

Detailed Description

@@ -50,14 +42,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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 6d45f05cf..37646e5af 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.

- - - - - - - - - - - -
className() consteoMonOp< M::EOType > [virtual]
contmoSA< M > [private]
cool_schedmoSA< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoSA< M > [private]
Fitness typedefmoSA< M > [private]
full_evalmoSA< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< 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]
move_randmoSA< M > [private]
operator()(EOT &__sol)moSA< M > [inline, virtual]
OpType enum nameeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moSA< M > [inline] +
Generated on Fri Sep 14 09:52:19 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 1319368e0..4f4a94726 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...

@@ -38,16 +36,12 @@

Inheritance diagram for moSA< M >:

-moAlgo< M::EOType > -eoMonOp< M::EOType > -eoOp< EOType > -eoUF< M::EOType &, bool > -eoFunctorBase +moAlgo< M::EOType > List of all members. - + @@ -84,7 +78,7 @@ double  +eoEvalFunc< EOT > & 

Public Member Functions

 moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)
 moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)
 SA constructor.
bool operator() (EOT &__sol)
 The cooling schedule.
-eoEvalFunc< EOT > & full_eval
full_eval
 A full evaluation function.
@@ -138,7 +132,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -182,7 +176,7 @@ template<class M> EOT &  __sol  )  - [inline, virtual] + [inline] @@ -191,26 +185,24 @@ 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 >.

Definition at line 74 of file moSA.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 moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand.

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.png b/trunk/paradiseo-mo/doc/html/classmo_s_a.png index e14866c803c7c4f0523a036fb3d13d1120177e24..36c618c68525187b2324503495a949df66643a5e 100644 GIT binary patch delta 422 zcmV;X0a^a>3(f-}iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*t7k zL_t(oh3(Z{Zo?o90AP68GxiP438w8reaiihFdGaDf&7r7Dbk>68xr&37^Il*A??$A z`4Me8T@Hq0)kwb{0OZG0I5}~MDu=tEGk9uDw03wn@wDp?Kbfz<%=}hN&4h(6|e7GSgPv;E> zAVlO)vmboqSh;O&R{2Vo!$WyI7^|JzjsqKRKne)sos%PY7ailGBSYjrrjeW`bnHk@ z;Ph!+c-|f8$dNi*>1sa7>CGoQS|1JWs}HZ2?4Ri5&|CYbr%mU-I)mOjKT0+Om}JGv Q0RR9107*qoM6N<$f{1#)djJ3c literal 1521 zcmcIkeKgYx7@m9$jf+UiF41*Ek!#G)XYjG;_iU81`rVaazN7^i3lU0N3Nk*RCK zRn2^*D589fX~~pk*=P=C?8ff8=bn4cJ?Gv(?>X=DywCgm_nh~ z*SX1P5J-`LbUz$;v3!vn+RV1vp4*=^=NKt;{j3Bm=6-p$RXV&*(u*uA^KMRC)re80 zzxXk`YIx}e{hgIa8A%;}#8L8a$-z={B%A>A+6#?_mg8=i(j;OjqGKM+d@y%$h`M%N z-<7e?o6(DPz;#{bL>uA=ZO!{|kdyfi>fA(waD=(wSLOiE!N9e0qKU?;jkeXMmhgS8JSj_Jv)=*1P7tP3d+>bdsE}{`Gt;Gwpz)sItuirq10siMlYMl@s2W~qx&Yan9k>Zz^^<=cJJ>*mW0R@I{_3{HDl@dR7cv54q z=^YIjW>~MF)tB85S)}Gogoe49 zEsWs}{6aX5kDx^o{J?rE^uz6CTLfJ1#U>ErDE{W=((5&%wXmR9IgG($gI_;w?fX>Y z+&Qs|KE@(Vz#bQ4BhhY&kAd|p@%(&CHzG`NCx5S%8H}B^HF7Sr{AR~*A`gn9m)iAR zd&b*yb<xD~A?s$-5E)mF$Ev1|ZNDb&;k-`=(G z#-=EkY`sm(-z&|>6*E1?C2J8ie)7vWtzc4x3N|_0Qxa}ANopUm9PSH}lxPz3v8Mcm zmgW0{NMl1y{PGvMvKanx>{Ktk%D&!f zerLLw>n6MGx9DTV%H*=F8)SWc zKB=6;U`M>z=`NA|XAsf@ - + 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]
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]
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]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 676a39b0e..0dba441ba 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,7 @@

Inheritance diagram for moSimpleMoveTabuList< M >:

-moTabuList< M > -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase +moTabuList< M > List of all members. @@ -114,7 +110,7 @@ template<class M> - +
) [inline, virtual] [inline]
@@ -125,14 +121,12 @@ 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 +256,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 +270,8 @@ Referenced by moSimpleMoveTabuList.h -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..796402f17fd76fef5e883c7d8eecac48a6186152 100644 GIT binary patch delta 500 zcmV6hS08negTJjB)6EN+Cy5jyvs6MtMCuEoaX@Rk!QB0f{S#}xH_fhSf zzNUlPpkIY1qAY>Ery+FhJl{(fg=1%qB&WM+W=V(16bUSXygX}~C_h4HQamfIX68n- zMI&?8w>@G9J>^Cl7isBuvX$Pje{a)F9X)w{{E=Li@v42B&VANCiQLimW?gH|>ss6E zo?5pZ!dd~&nTfn0Wm{BwqkZB(`k)7WP6z&2*waqCM!yPu`FTV7bh*4C{iZu)(1RZI zpa(tZK@a+wG#%A2;V~0TY0&>g6D0_j${~yZS@|@7BmqJf%HI_lI>t@~e}Zma7>;dp zrO|GPG=Lm|%2N?RKG6%ZHJ!FSYC(rI9_?oIN9kqoX=$Kx z)l#vjBxp{l&J)9B8{p@Vw&^tY{NChA&9vJKy10cVO|JCxHeEur#f~&seNroCwL2OX zv^^@&K22C;ZIL>9opqp_O1~&_tTnA_?L$_z)@7zv>$*dhTf+lt1!U>v>&*&McSxbH q?CWlaKiocwenuPgU((0@Soj6?Tt!_$I-Rfp0000z$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]
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]
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]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 dd6858a19..f38d50a43 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,7 @@

Inheritance diagram for moSimpleSolutionTabuList< M >:

-moTabuList< M > -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase +moTabuList< M > List of all members. @@ -147,7 +143,7 @@ template<class M> - +
) [inline, virtual] [inline]
@@ -158,14 +154,12 @@ 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 +303,8 @@ Referenced by moSimpleSolutionTabuList.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..3838fd0123f34867813a5a14b4fa7348007583bd 100644 GIT binary patch delta 514 zcmV+d0{#8q3aJDkiBL{Q4GJ0x0000DNk~Le0002M0000`1Oos70KJrFcab48e*wQq zL_t(oh3%G0a>FnPhNVr{{JMeM8?+b7D)&D^c?elj;+ecWbuuD}u`uQXfin)jJ4^Uk zc9ri5I6fc)5S?tvDmTkqeop{AR%#b3fHfWjq{OKqX)IO=oNBfTa>{rffGmhC08v;{ z1tirHIA{49=r3^e>-5Ca2tU8+yb)h*ka&hP2M8h1js`Ls?h>K_lp;fXE2GOE~JO zG3+2FSXp9ldngwzFy}#JAP1BPVv9A99)c&i0?7BxR|QbgSpiBI03}KRz&)-3xcx04 z*p3<4JBtAj2S91^bpZ7hSXe>S0WKo1M?kY%!9KDGXMYp07*qoM6N<$ Ef?*BQX8-^I 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 c982c96e6..97b11475f 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 b23c175f8..12912c61e 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 stopping criterion for a solution-based heuristic. + +

moSolContinue< EOT > Class Template Reference

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

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

Inheritance diagram for moSolContinue< EOT >:

-eoUF< const EOT &, bool > -eoFunctorBase -moFitSolContinue< EOT > -moGenSolContinue< EOT > -moNoFitImprSolContinue< EOT > -moSteadyFitSolContinue< EOT > +moFitSolContinue< EOT > +moGenSolContinue< EOT > +moNoFitImprSolContinue< EOT > +moSteadyFitSolContinue< EOT > List of all members. @@ -58,7 +54,7 @@ Class that describes a stopping criterion for a solution-based heuristic.

-It allows to add an initialisation procedure to an object that is a unary function (eoUF). +It allows to add an initialisation procedure to an object that is a unary function (eoUF).

@@ -90,8 +86,8 @@ Implemented in moSolContinue.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png index 71ed9397db73dede548c264e7c7df0751dd998e3..c6ccfa6a69983c3f5670bc31a8b5328a68272f35 100644 GIT binary patch delta 1210 zcmey&|ABLYI9C7*GXn#IvV^SKL`CCzmNrip$B>FSZ)fH9%{CBdYu5T|{#d%Fx^dOi zD!CGb@Z zkX8A#3p+P|i++ARYIEeZvx&E3_|3cR%vltAs|{OUbe2V%3(jD-J)3#K?YH{&+FSgp z^(DJPx8}`yQ&MPsCa2(XtC`PdmNfOZvof5y9Qq?)#H^on&WGcSyp2xVP5-`|2Ns$; z_~)_kYQFUO`bEg!b+aHEac3kfv=<~4RV zwQQW0NAE6KW+v;zpxAI`uK%TCt8MRDWh3ItH<{MYjwxSv#Y{G8;>EvwXa3ct7l|+2 zkZ|I9&cizQYdP1w_i69g+;VQNYRNmDg~jQdbFIA*KK+x_HGSGe)()vCH*tkq*T45) z6z%v1RJo?VKedE&Q7q@&=xoW@h7}7_OBffm!Bu8uAPLsP^dm$UfBoxxW%*Otl6w;l zXH^Evg|$V@RNQEE6~k2O3SjhvHGJElqsX*;huGa*7UDYfm$DFJO`6+%ki z<-GVF_}8-Li2te2Z$Bi~^UK#CJbyv|@5`bzJNxte-t8a@TFw=6&h_J*E5|vPuU6EG zV?ls6Z^C`8&5o_LX~(Y>SOX)|`%`Z zPhM-}!W^`=@?3D`w--kgPPK+vvE9kA|Me&8dgk^sO9CSHxb$is4l{VVZFT)xt1K(S ztPPW=-^pKVv?MG&XyRsje@FISnFB;A~sPsVEbdk6UJ&dwjk1Sfi`EdRwci z?9|p}%XVyztlY$Pm!0LpWZ4y&9+Fbs$Ld2%Ht8s8X??%s&o}?DYRS!*8%^h4UDmzG z$yqb?ULR+dR*H49uGFTFTh`mDHLs3}xO8!!^aKB74X5RTb|yQ5nL_yX9SFYYX{hl2 zZ&zQnaQs4kuj#XE-aV-hnmZ#Ql|9+x%JMZ!cQ!|U)yvWO*(CPv;>Cxv)<`Y%b@4caznV+e?`rIET&8k(|eCwPT*OUvPPHeR{WF#FH6|-<)mb<*A$6 zTIcEXe<`bb#G3ZZpG>k=5{%AQW+*%j`8a9z+M9>|`cbP0l+XkK Dfi^xh literal 2035 zcmcgteNdA}9)3v#C8DHwxr!KSuYL?4Mbngsyh23;q{R@0QWX?1CNYwN6@4)VLeK)W zd}%>I$xFs55~+Ly32`Wx1TY{Fl1MZ_0_7t@6q5!BRv2k>@#d~~ow>hmIydwDcAwpO zcIWroXLt4ri5Rv9wE+bHz?$&=`wjsB(%;6VE0DG}kiD8>>(-MZqC>1!tBqQ%QXVhi zs*U|4q*5uX!}`oNv^#f*7zON^9-;!k$}8dff}$^QO>k1O&L160{>$@}VsKMyR$lCQ zJ&l7Hwz|~kY(Lo0c;GYF(j{WWlj;`}PDLJ%Lw`t5KPN958~py5eyqE1SOEGZCt1elGfrueOeYG#X4(%3q*x-GCeP6%k9;|wQAq)0G zn*`tW1c}JU7>V&)YvBunJ$F|@H*NbkzTB4gEyVCQN7T7P^?QYQ$2)_H0pjj^bDn4O zjvc5^c%`OslW7G9pl<^TmzHW^J3j~L;?Xj3o~U!T9)AUtZcwGd});L=^Qh3#NL4iP}Cbj!o$ve$b5f z)dqmq-G}Ja$3ga2Cu1A164psC$z4Q}0a3ZzyeMPxwN1n6lkH3cg1{2Z9;c3$7c#n( z=CpZc_u{#Sot36^;!^FN-+aRbYPl;k%R<*9culXIj0=AN`^0JQe;zQ0d`6~!d%xN- zMJxyC$DIG86K^e-?wq97hqZP|%5>=9eAIs=DxZ6D`++7ys~JtzW#}@r3o@TB`LC55 z5xd9F%p`kHUzUs-h@d(%&vai;vXx7nNxmZ&G9LQ{V?K_?$w~HW zK6k=L2L)p~ojzBQWIO)nX?1FlBz{U##+!34vgoJyzcQCx^_YbQ3HPx4m3|oo<#?XD zb0WcTK7s$v5Zw;iu;>GEaT?~!0>?DdlLQM{jbx1mze}EG<8x)v2i5%^&<6a-umgU1 zc410BlHx<9bZ1L$b3-Q0B_fY+KzWOXEcR7ggIykWsWfFAP;DMq{3#`O)Qh@yDrP5~ zW?98*XE5%wm<&_NoffYD)Gq@B`(c?E-Iw~t&kI!8_uR@&-Fog>S;$4-h%ZZH>m1e3 zBQV+}8Dp?EuO=+~puV;uZgUa6+Dr&MnZXPgUYyzoQaB|P4;pHHXzI^(1D^(MRCb@& z`;E=+E_Bh0LEDQLq56wm;`<3Vntj|iIc2WK2BaOyh3;O_4b_D99E1yYswel8AKK|p z;f%eC$>#)J53(P99?zy9#k?49)R!jlMV3%{EI84V*z_F|#%15bZp#%h z&uVV*j)S=U`CGIeL4%NcEgTG{To*NxQ>)q(G>SRjQUx>Tr`@ScRV`tovl8?OJ^WPk z!}bT$#@<4&u%iA-(|8-cEKvj*JBXjr!=PSuno*eFMBA2fwwji`^WFCa;jP|fqRq?7 zwuwg-uiCtMg3d^&Yw8Y#!;FX}wmhx;P%?JyH6zva{H`A22u%{D?I={HL{Ao=w|tnD z#-DX##|YjaE*5m#o7%po1JKb6hgFW`9RhVn=Ox7v|FOpk$8r3OLjvD^h`s_k%7Gmm tgqHcpxi+HSdHn;Tz+$gYKN4g`O51}U_P#i?*7idK;UUC*^?MU8{T*$V%+3G+ diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html index 12e6666a8..2e65cbb33 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
- - +
-
+

moSteadyFitSolContinue< EOT > Member List

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

- - - - -
countermoSteadyFitSolContinue< EOT > [private]
firstFitnessSavedmoSteadyFitSolContinue< EOT > [private]
Fitness typedefmoSteadyFitSolContinue< EOT >
fitnessmoSteadyFitSolContinue< EOT > [private]
functor_category()eoUF< const EOT &, bool > [static]
init()moSteadyFitSolContinue< EOT > [inline, virtual]
maxNumberOfIterationsmoSteadyFitSolContinue< EOT > [private]
maxNumberOfIterationsReachedmoSteadyFitSolContinue< EOT > [private]
maxNumberOfIterationsWithoutImprovementmoSteadyFitSolContinue< EOT > [private]
moSteadyFitSolContinue(unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)moSteadyFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moSteadyFitSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(const EOT &__sol)moSteadyFitSolContinue< EOT > [inline] +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html index 91a4aa899..5fd1711be 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSteadyFitSolContinue< EOT > Class Template Reference - +
-
+
-
+

moSteadyFitSolContinue< EOT > Class Template Reference

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

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

Inheritance diagram for moSteadyFitSolContinue< EOT >:

-moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +moSolContinue< EOT > List of all members. @@ -150,7 +146,7 @@ template<class EOT> - +
const EOT &  __sol  )  [inline, virtual] [inline]
@@ -165,10 +161,8 @@ Indicates if the fitness has not been improved since a number of iterations (aft __sol the current solution. -
Returns:
true or false.
+
Returns:
true or false.
-

-Implements eoUF< const EOT &, bool >.

Definition at line 46 of file moSteadyFitSolContinue.h.

@@ -206,8 +200,8 @@ References

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png index 702e690a244f9d9eaebebcd697821d21c1abe375..1fa229f5a6f621f9a28cfe41d6fb900ea669c685 100644 GIT binary patch delta 532 zcmV+v0_*+92haqN7Ya}W0{{R3u!|WK~z|U?UqfB!ypWW@n+V3+;zL}rx+4j8{pTYpbkKG(>+Ow{cIY1>q z(LKm;5xR}Vc_56Db=R)f0;WN|JWy4tqe^YKb*(eN`Fpn~<1o9tjA()MS ziCT}43&@u$MA9-`U+RD%F=B*0Bi~94XoawK9X({m$YDne9~t9k)j{qv+?*kSFk&33 zBQt_`!@#~D)m%N^51AS{AF%O!IBiZEhkCBk`8Y6F=i6c|#^*9#@!#jLeI0jsOUCW* z5{$3g?GlX3%++En#$qhSVl2jDEXHDgObyRB!{=Ap7%j#dGyDipxnkY&V?l<%Di_Tp zKaqzpxTEtCxMgrskuJz&k4n1pQAvp#7!+b?4PcT?{54DZLCWCZiOq-CHm)R|>3F0v~S7Df{;485R#BBav3 zst)uFSxD5NtT!`t%m5V8KPxm0?K$TlhBJfb3=aLAWz;T;1&Uw#F8RwL7(f96R%o#8E@AD7X W31ZLPn9xlC0000UE=D|R-66oA0%b(Ye<#%}X_@#``V|V~34qdUH$!HH< zvAVVIaYkIf2W0s8=O9_4A(=fg(hPlm%)r3GWd@|Frw^a3`Or->+Q$HpIAU-;lJz-% zMhqkJ=oq+HkoKzWiKBUhIRiiagW4ac2dCtF#*_6BeHDO0MGN&6)dQS+vaik=%23AV zGOoDyIXu3OpYoQB@4vTTe0_i4f^nO^Qid{=p$ugxLmA3Y#&lfqjB}UgL1p}$fzsE8 zc$bWTvK1ux3RNo*-<1e^7#k~c{7=$k;Ef9)*EtcMNFjA^K{6Jy_?(zQX2bjW@T0?5liz9O$d_hccA$xr{6B zeXh8NdrOAuyKlv~O~S!F61S} zuPww+YfPNQKd^#f7rBzmuwclQ3>4f{Mx5Zvtl@>41$PjA*dJYb22=)}Y?F;AQyL3(%m5(7das~kP|a-#ve?3~bH>73wPLLD$c$W% z5rcdhhUw}d`l_pk;l}2^if7uqoD>Ce=K-}{VpuMO=&O8vtomwmjIMy=W6n6|cV@~s kCykr_?kZ!>xZvLBAKYc`9sYAAg#Z8m07*qoM6N<$f{oO+`v3p{ 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 9f862d481..140900fc7 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]
contmoTS< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoTS< M > [private]
Fitness typedefmoTS< M > [private]
full_evalmoTS< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< 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]
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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moTS< M > [inline] +
Generated on Fri Sep 14 09:52:19 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 1a0a8a14f..7e8046ace 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...

@@ -38,19 +36,15 @@

Inheritance diagram for moTS< M >:

-moAlgo< M::EOType > -eoMonOp< M::EOType > -eoOp< EOType > -eoUF< M::EOType &, bool > -eoFunctorBase +moAlgo< M::EOType > List of all members. - + - - + + @@ -75,7 +69,7 @@ typedef EOT::Fitness  +eoEvalFunc< EOT > & 

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)
 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.
 moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
 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)
 Stop criterion.
-eoEvalFunc< EOT > & full_eval
full_eval
 Full evaluation function.
@@ -135,7 +129,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -148,9 +142,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:
@@ -188,7 +182,7 @@ template<class M> - + @@ -206,7 +200,7 @@ Constructor with less parameters. The explorer is given in the parameters.

Parameters:
__move_init move initialisation
eoEvalFunc< EOT > & eoEvalFunc< EOT > &  __full_eval 
- +
__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
@@ -229,7 +223,7 @@ template<class M>
EOT &  __sol  )  - [inline, virtual] + [inline] @@ -238,16 +232,14 @@ template<class M>

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 85 of file moTS.h.

@@ -256,8 +248,8 @@ References moTS< M >::co

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.png b/trunk/paradiseo-mo/doc/html/classmo_t_s.png index 8932f0e2f1113b44d96354bb83e87f7b227be69a..bf447bc07990b392e4e01573044a737e8ff50e84 100644 GIT binary patch delta 417 zcmV;S0bc&!3&{f^iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*s@f zL_t(oh3(Z#j>8}f08rS>8v6$31f%JNy2|~JFg7+R1loLrMv(^cX_CUjv612)L)y3d zi6h!{PC1zNqLCdD0OS-YUF&4Ga|L`r4w4l1*#mf%QBvx z!_TaHKc4KA`H2>NRWHQ%`QZ|&Q`bwALF@Wiqw3Ua+o-ofHXSyrsN>MS)2_x|Jb=xk zCY&SAl{TF{XViD+KzknP^moqJaxZ6Dp0{%DRpSPcNh}#bgny| z>%isAcXnKfC&)g0INJK#mqP|{F2c`v(qN8|Bsb;L+kcKXo1 zP71B^aBoz?sh1e)-D!7>$Ga;>1Bnuzusdjvu zsbC5^CDd}*YZ^<&%4c2mu&EnF(|E8tCL!7Z*?`LSf~C(Z*MR2zIIYq>YXNF zi6F$(=vN@nIywd!9CM~ZRT+Cq?z0|MITQH<>J4bt0H(@Y{B6~{c8Yi-kz`>HI-V_e zj#uhI?`@crr2j5AC2EUvjWbth`1i3~7KtmqMsgEo7-aCEW!*P(?pi6L&^3AJLWeES zs-nS(B4m>25Dl&Jdn;d$RN)c>?7>5QG=7q zl_jv4i$B4v53Rz@_W6{mEy7chc=#80llu zSi`FevL!utMPkgQ2Y$TvTW+a~lowgPF;e$Cm8V$FB8TQ2dxBv?4TK(tckvian{AZt zdsF}x>gq`tQAw7q6HaK|)Kt*|oZIc)++)1*dn*hC^Peg zYg&{!o!*iZmjmYk27oX7R?fLQ>A1Od)(ZDd{N@YMyy3NlqAdBV=GpodZ(}ci66MJY z?iA4RB8^a2CVQGagbAE}?kdf_H~d+h0osJK)y~U@da|RJ`?tnhc*9e!V5ZczCL$!t zrM96IKZ4=TI7?4kP+<@?bD4G8cGdg~U=VE`_G!&0>I;vQIl6MPlAgJJ?&u{X4N#aP z;Uv1mC>&|8+MySffxDi*4-s_HOI^FM_#*7^l@17z!K2XTcZ(6W2WN<3i0#x$Zu^i# zu+ydBJW~32!I1Jn+7_m1Y6{sJhWMUbZcUe{cPXxIEba`sWVn4)b1be8=6^!}rphU` zslUIu<1jOPk7K69sQ>KOdv+%Han8pRMSMUR0Y7$KPD7;;isqA4 zKon**qdK*!H-P67Xv-?Y{?jT@nfq5e$xab4*Nt0-u<<79qFVlTbJz|o6b?u&0sA3w zA4-)OHMrlByQ$f_+;U;AEt)3Gy3REtF4bd(%%&&61E`)=18MSe7+iZKe*mEpt2Rp> zYYL|(>67U)%j|!rVdmvC1P?L}+`2u8`$e-n zx!;=)BzFZ>us=T2F#pXRZiZ7{%D^U!S4c~%3jV{EZm_;)YWDr%?1%!ZgIpR!eIO)G zxn4+vICOb&<$&gCtKYKE~dC1*FM$AZ18IJiPXJSYb+aHN<_oA z51k(6F9RPOr9}*g^JQYtLMqE0PZXm<}y5L j`P-zi5PD1S8&8d4XM$4H3$|O)ePa*?g+=m1DA|7iQoqp{ 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 d5b570756..4a5bf1448 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.

- - + - - -
aspir_critmoTSMoveLoopExpl< M > [private]
EOT typedefmoTSMoveLoopExpl< M > [private]
Fitness typedefmoTSMoveLoopExpl< M > [private]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
incr_evalmoTSMoveLoopExpl< M > [private]
moTSMoveLoopExpl(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit)moTSMoveLoopExpl< M > [inline]
move_initmoTSMoveLoopExpl< M > [private]
move_selectmoTSMoveLoopExpl< M > [private]
next_movemoTSMoveLoopExpl< M > [private]
operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline, virtual]
operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline]
tabu_listmoTSMoveLoopExpl< M > [private]
~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 d432e6af7..464ed9adb 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...

@@ -38,10 +36,8 @@

Inheritance diagram for moTSMoveLoopExpl< M >:

-moMoveLoopExpl< M > -moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase +moMoveLoopExpl< M > +moMoveExpl< M > List of all members. @@ -93,7 +89,7 @@ typedef M::EOType::Fitness  - +
-It is used by a moTS. +It is used by a moTS.

@@ -184,7 +180,7 @@ template<class M>

) [inline, virtual] [inline]
@@ -201,8 +197,6 @@ The exploration continues while the chosen move is not in the tabu list or the a -

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

Definition at line 69 of file moTSMoveLoopExpl.h.

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

The documentation for this class was generated from the following file: -
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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.png b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png index 717f30a1788ac8ef51945255e8a0eb8afaa89080..34c2223210a45d169763090d8dab455f64c59c67 100644 GIT binary patch delta 621 zcmV-z0+Riy43h;RiBL{Q4GJ0x0000DNk~Le0001@0001p1Oos70G8`5c#$D9e*!5< zL_t(&f$f+}a>F1DhS4T#!404{XfM=N?tg?LA#BXUAv1K6ctoa=2-0Ve>T&X$pVh;B zhqdENiT_G;@|TCTRy;q5ctni(zKq{}KZqC+or@XPNqltZ#fDJM*{6xt6Vu1sAWjey z$g%X6NF0&K=X>;_OQbq_Co>lce`1Xs61_Ol`beW(A<9`fBDBaUVhH)vk}u25?2w|KV4_XZ94LG#QX2t6L0tX z+Y>*c*Gg2P5|yY#B`WcC#P#1uKjC}05<@HF9DiF*$UY5mEc6^_Ly=}9f1U_EWPJSb z@26y+jd&vT5?2w|KV8><19%-#^`1q@)j%aGQHe@aq7s#ODWY9H z3@$zkC~-Y8HVVNae^g%Re|S-9XHMSNx0vG|fmXo83>Xu!3{Tf6XfaTgya7 zwnUymN{$xNZFS^lqMViExAWITtcj@?6%paE$4u<*5mRbP=2@qXL$p%X(V*$nQF;y1 zVs0`mMq@1&y^eLPdYy@#|Hp>|c6XF_LE_X!mAHnu{OS4!jpr#8)AimZ00000NkvXX Hu0mjfUl<=2 literal 1577 zcmcgsTTqe-6h`xwiq@!GS}m(PvuKQEq~&@kGTU@BHIv^3Hcd?h6-o%@l3mnr)=M%| z;+mG)u2%klVv15;P*V#P@*4VXg03E8s$9bCl&qkO|4V^Zy;}{(=Ku$C!(anjV5}c8i$9) zrc?oSShj+73LBULIyL_Zsqh`l zPe|xv^_4Se^5%fZMqbU{^X8l$Stp$Pt|R&FqYU! zCzYk_vT8;pcRWkZv~TAdOeSO6Pk{snpuXFV|BJwfMGjZ&PH-o5nAs)@j9^X)v?Wnf z!yR!GZ&gPUwy0b){9i~Sp~&V=W7zmfoyv3#XSghSYESmEo91QA=L0)aJows{TzbEx zOV*UvegRHNM6`X_PTU-?fA*|LO)B>9p~tqqrzX?#!|Hdu^++@(>_pE z+Q+oLD{A8S5CT?6bJb*6IC*s(ePqmAgA7aJW?x9O9~XB{C*?RvfI4g#x9x=A<2ARu zgk_-W-ut`>dbUc9o#C;XQ QbblSR 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 c6fd0d86c..697819d04 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]
init()=0moTabuList< M > [pure virtual]
operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, bool > [pure virtual]
update()=0moTabuList< M > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 b129a30ef..c5788ea20 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,8 @@

Inheritance diagram for moTabuList< M >:

-eoBF< const M &, const M::EOType &, bool > -eoFunctorBase -moSimpleMoveTabuList< M > -moSimpleSolutionTabuList< M > +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > List of all members. @@ -65,9 +61,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 +162,8 @@ Implemented in moTabuList.h -

Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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..792ce859bfd32e95ee4464dc75892c1464e7f8ed 100644 GIT binary patch delta 854 zcmaFG`-@GnGr-TCmrII^fq{Y7)59f*fq}6L$PQp(29jT!^zThnG_GeB@N{tu$!L5# zBe&?W0#DoF`TyK@HQtckBL3>kxhMbJBPIwu__5eRn&az&EouTY!}|p+Cf|O$MKUA% zTaAbRj7*#VOIB?63{0N9=w98Tj^jNi@3~IDFMr&U&9%fJRek$|`+Yu%J^Tk4tbZK) zk?`018dKgc35j`!oE~gAsMwP4TffNQPSKZZZT8DE0=aLBbW<`@bf-KLU(@=Id-FZvo2pL`bm46^8Ff4h? z{>POc=bLH1$_=`51MaeQAHB~-{;nuz(BGIHaA*I0*@N0|ghb@O|K45iT+tZY{77kc zbx=?8B~k<)Xii)|`P=s; z_3{(_uV49R;95Mq)bCs)}C*uQ+(g6J#vh^H$yyZUeipF;RZ#|%VG^&x|Yh3-o zC&v#@QP3hM?j8uZF_Y>>^?&Zx2$qU*NEDVFT9#G0g>!W*yra>#|ftq{u;_ zxYMJKsw4-!>V}DUxb}&PV$430s@cU95n9PBz`KYf!St}g94}V z9o{FQe|k^U7cR;;6{E89v)#wwzRu_gIRZPK6ocPr3oK__%yjIgtJfYS)_RTN;t;)M zI)O(#4;d`o`As9{U7}9vl%G?S5>vWrS(m>&C$b`S+SIuUM`liKO1&;pxM&5V;?r41 zT+z{5Tw)?BsuQx79=Nd}LUYNIH5z~R>1)mrnQ`HzB||n>)rI1++Az8YM7kjJk1;UjyvKlcj3)j;_h6W3C&K&<-fVcT>rX{gPnKD zsENxmZ4ad89kvW#=M|iq=BCB#)PYT}LIin%$DL z&tyOUPF!<`XQ1wfu&(KxI%nQ*xvDgIkyk=cNcWt-6Q8cJ{R&De>`@_`?szM%Rt07i N22WQ%mvv4FO#qk8hLr#S literal 1770 zcmbW2e>Br;9LHDstyI*#!fq)g`5o>t-$_EFGGf(TwS=*eq*jyG#Vw~5Yl`IOMhO+i z%!Vc87M6`|O0pkGt(hPDCJp(Kc2|Gs+|KQv`^WovKF{a*d_Lzn=lwe8x#EvREL&o< z1OkC9^YQi!fI#NDXye9tI@(q9p|eQ48T#)*d1*A7uNh5ae*V#G+UT1a8yiWFHSe^? zIi~}VfspNe-Qf_(f6T=iU^3lg zW{eMnCDr5q@-)q}iXtcH%#55|@#qV%Tw`*^pFG0PUnp@G>0KbMU|-}=p*YIEl|ZBWkV^=D=`wF(K=asROq3-)5le3Q^7mOK4o-F>JvLTfjQTQz&emqC_wjM z7xQz@3wUxWbNsjv?Y0P9hhOLpESi0k^DSD(+UJ`EIHh5Hs!eaFNbju!rM$OIq}TgN zsqEKBE(NzcZ`ttgrUK}^ALslmRUS#!yh`d#Xfd4~u|s@?u)2Lb=~PL)oZYglY|1zN z1*Qj6!`z!&^XH>P=tH-lj@1?e-DOfqQ=f<5V4kWxzq*J1=8THtXv$!1u$24Ov4Tt5 zKBgE1xWW7Pxi(AayP}TVazJqG?EV&DeU8&N3PR2GGKYlH|?Yt}3W4#!GdB=^?gA zm9gcA#n&^P7%zw-PNEaZh;QC?ek;?a-o(w!XXNv7{yZP!9jl5dpL18 zR~g?gg_%!o4dE8qwmuz>y)(axaC4=vEkQ6fH}^ywv0|o+6m%+P4d8b^iKb90_&jog71RNi+4erDaQ zVc+PTt-4$)$!?3wLhw1kMwrC!cjX}^c}I(@mse%IPf&O>LQ3FK&vd~qtJv2a0!M4I zUG`{&BK)A4Ri=#CMy?BvI|Q(<#P>~9+zq4Or&+w(WT`euNGmEi8wacps)+N&8`NrrL@Tt;F5>kydlI!&InI^Q6k;$v!s_SRiqaX>qzhgyfyPS^!;y2>TDX zo1DP&^s9D~%bO@R1?Ci+?FKu46=_wlxKOuWD^XI%{86p&kNfAI)52|dcUqj4xKSNC7|7nkDi>9{LOlYpv=P?Qr5ZwEYU(A4#E&Zrwkzm_bx0^~O_AXZg z^|5D;6gt3`*EgR6s{SzO7+$T;qDdnUBmIOCtSXyy4-&?5hxIt30wdZ$ltsGf+t=$Q z)C|@}TN9)BcP=%!V>5K`4lK65NDieLRpEWgaimX(kz}(>&+1;`iMnX*p56nKX7?1h>>K z+!n2bp*X@6O%81)vd%FzoVzRbxv3C#yB>RD_vMKOIs&|5Zarq0?of*nIH&UO;aQdP zQ|fVR^)!`E24$$gpe$oRP^OxYbyPa7c@#Sa59gj4d)m;9JXg8zT1{pdfmKQHmWuC( zzZAG^b49Q-wNy1oi73~p*0IDwE|lQ#-h2Jjrxqy6cQq>*(G@F4Mvz|{#|AXSfdilw za~oP=ocoN2+2hSXD|rIwZ%h{EYU$#klXuJK7t<91cWc|_?pN@iczRa-4{C~qP1$bk z&xbP-*hYSUp~U?I!~Z*OpJDwvX`#*^401y!bWIjqG|P(GX{-I1AU - + PARADISEO-MO: File Index - +
-
+

PARADISEO-MO File List

Here is a list of all documented files with brief descriptions: @@ -59,8 +58,8 @@
index.h [code]
mo.h [code]
moTS.h [code]
moTSMoveLoopExpl.h [code]
-
Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
Generated on Fri Sep 14 09:52:19 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 82e0f6ab9..79e26a99a 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 >
  • counter +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • 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 >
  • firstFitnessSaved +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • Fitness +: moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >
  • fitness +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >, moFitSolContinue< EOT >
  • full_eval +: moTS< M >, moSA< M >, moHC< M >
  • func +: moLSCheckPoint< M >

    - i -

    -

    - l -

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

    - m -

    +: moItRandNextMove< M >
  • maxNumberOfIterations +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsReached +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsWithoutImprovement +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • maxNumGen +: moGenSolContinue< EOT >
  • maxSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • moExponentialCoolingSchedule() +: moExponentialCoolingSchedule
  • moFitSolContinue() +: moFitSolContinue< EOT >
  • moGenSolContinue() +: moGenSolContinue< EOT >
  • moHC() +: moHC< M >
  • moHCMoveLoopExpl() +: moHCMoveLoopExpl< M >
  • moImprBestFitAspirCrit() +: moImprBestFitAspirCrit< M >
  • moItRandNextMove() +: moItRandNextMove< M >
  • moLinearCoolingSchedule() +: moLinearCoolingSchedule
  • moNoFitImprSolContinue() +: moNoFitImprSolContinue< EOT >
  • moSA() +: moSA< M >
  • moSimpleMoveTabuList() +: moSimpleMoveTabuList< M >
  • moSimpleSolutionTabuList() +: moSimpleSolutionTabuList< M >
  • moSteadyFitSolContinue() +: moSteadyFitSolContinue< EOT >
  • 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 >, moSteadyFitSolContinue< EOT >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moNoAspirCrit< M >, moLSCheckPoint< M >, moLinearCoolingSchedule, moItRandNextMove< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moGenSolContinue< EOT >, moFitSolContinue< 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +: moFirstImprSelect< M >
  • vect_better_fit +: moRandImprSelect< M >
  • vect_better_moves +: moRandImprSelect< M > +
    Generated on Fri Sep 14 09:52:19 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 badbca243..f5aae612f 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 Fri Sep 14 09:52:19 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 ea2aa0308..045395d40 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 Fri Aug 3 16:38:57 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 >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M > +
    Generated on Fri Sep 14 09:52:19 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 149c0da34..58c9fc868 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,125 +57,65 @@

    - 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 >
  • counter +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • currentSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >

    - f -

    +: moImprBestFitAspirCrit< M >, moBestImprSelect< M >
  • firstFitnessSaved +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • fitness +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >, moFitSolContinue< EOT >
  • 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 >
  • maxNumberOfIterations +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsReached +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsWithoutImprovement +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +: moFirstImprSelect< M >
  • vect_better_fit +: moRandImprSelect< M >
  • vect_better_moves +: moRandImprSelect< M > +
    Generated on Fri Sep 14 09:52:19 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 371b95ddb..33a076ad9 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:

    index.h

    00001 
 00022 // coding: iso-8859-1
 00023 // mode: C++
 00024 // c-file-style: "Stroustrup"
 00025 // fill-column: 80
 00026 // End:
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 b5106d2c3..948a4455f 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

    -intro

    -MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
    +Introduction +MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
    It contains classes for almost any kind of one solution based heuristics.

    -tutorial

    +Tutorial

    -install

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

    -design

    -
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +Overall Design +
    Generated on Fri Sep 14 09:52:19 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 7277825bc..4aec89a6f 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"
@@ -71,8 +70,8 @@
 00047 #include "moTSMoveLoopExpl.h"
 00048 
 00049 #endif
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 ed2d1eabc..90d0b5b79 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 01245c2c0..0fce3ecad 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 cce6bfc35..f40494d56 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,58 +38,58 @@
 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     if ((first_time) || (__fit > best_fit))
+00049     if ((first_time) || (__fit > best_fit))
 00050       {
-00051         best_fit = __fit;
-00052         best_move = __move;
+00051         best_fit = __fit;
+00052         best_move = __move;
 00053 
-00054         first_time = false;
+00054         first_time = false;
 00055       }
 00056     return true;
 00057   }
 00058 
 00060 
-00065   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
+00065   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
 00066   {
 00067 
-00068     if (!first_time)
+00068     if (!first_time)
 00069       {
-00070         __move = best_move;
-00071         __fit = best_fit;
+00070         __move = best_move;
+00071         __fit = best_fit;
 00072       }
 00073     else
-00074       throw EmptySelection ();
+00074       throw EmptySelection ();
 00075   }
 00076 
 00077 private:
 00078 
-00080   bool first_time;
+00080   bool first_time;
 00081 
-00083   M best_move;
+00083   M best_move;
 00084 
-00086   Fitness best_fit;
+00086   Fitness best_fit;
 00087 };
 00088 
 00089 #endif
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 cd0aaf31c..2c47ecdf8 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 2264d0aa1..6b7dc4c8c 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 e0f32e291..bcc78f7d2 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html index bb7569151..a766fd675 100644 --- a/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moFitSolContinue.h Source File - +
    -
    +

    moFitSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moFitSolContinue.h"
@@ -39,40 +38,40 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moFitSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moFitSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
-00027   typedef typename EOT::Fitness Fitness;
+00027   typedef typename EOT::Fitness Fitness;
 00028 
 00030 
-00033   moFitSolContinue (Fitness __fitness): fitness (__fitness)
+00033   moFitSolContinue (Fitness __fitness): fitness (__fitness)
 00034   {}
 00035 
 00037 
-00043   bool operator   () (const EOT & __sol)
+00043   bool operator   () (const EOT & __sol)
 00044   {
 00045     if(__sol.invalid())
 00046       {
 00047         return true;
 00048       }
 00049 
-00050     return __sol.fitness() < fitness;
+00050     return __sol.fitness() < fitness;
 00051   }
 00052 
 00054 
-00057   void init ()
+00057   void init ()
 00058   {}
 00059 
 00060 private:
 00061 
-00063   Fitness fitness;
+00063   Fitness fitness;
 00064 };
 00065 
 00066 #endif
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 b8ec255c6..89a2570c6 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 // "moGenSolContinue.h"
@@ -39,37 +38,37 @@
 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 
 00034 
-00042   bool operator () (const EOT & __sol)
+00042   bool operator () (const EOT & __sol)
 00043   {
-00044     return (++numGen < maxNumGen);
+00044     return (++numGen < maxNumGen);
 00045   }
 00046 
 00048 
-00051   void init ()
+00051   void init ()
 00052   {
-00053     numGen=0;
+00053     numGen=0;
 00054   }
 00055 
 00056 private:
 00057 
-00059   unsigned int maxNumGen;
+00059   unsigned int maxNumGen;
 00060 
-00062   unsigned int numGen;
+00062   unsigned int numGen;
 00063 };
 00064 
 00065 #endif
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 706a60b8d..741420d21 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 5f133cad3..09284e4f5 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 4489ccc51..9efe3385e 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 0dc6ae800..3059feeab 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 c9df6ef9b..a662a222d 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,43 +38,43 @@
 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:
 00056 
-00058   std::vector < eoBF < const
+00058   std::vector < eoBF < const
 00059     M &, const
 00060     typename
 00061   M::EOType &, void >*>
-00062     func;
+00062     func;
 00063 
 00064 };
 00065 
 00066 #endif
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 4087b7230..4630f45f6 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 158857f03..205e80dab 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 67629cc2c..9c2bd2077 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 701066310..3affb5032 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 72ce4883c..bcc26247e 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 dca67ccb1..5ddee19ac 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 19345ace6..13eb0fca9 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 0b951a11f..7cb1bc970 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 c508f30cb..9b3d6648c 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html index e01468880..5b3703006 100644 --- a/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moNoFitImprSolContinue.h Source File - +
    -
    +

    moNoFitImprSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moNoFitImprSolContinue.h"
@@ -39,70 +38,70 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
-00027   typedef typename EOT::Fitness Fitness;
+00027   typedef typename EOT::Fitness Fitness;
 00028 
 00030 
-00033   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement)
-00034     : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) 
+00033   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement)
+00034     : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) 
 00035   {}
 00036 
 00038 
-00043   bool operator   () (const EOT & __sol)
+00043   bool operator   () (const EOT & __sol)
 00044   {
 00045     if(__sol.invalid())
 00046       {
 00047         return true;
 00048       }
 00049 
-00050     if(firstFitnessSaved)
+00050     if(firstFitnessSaved)
 00051       {
-00052         fitness=__sol.fitness();
-00053         counter=0;
+00052         fitness=__sol.fitness();
+00053         counter=0;
 00054         firstFitnessSaved=false;
 00055         return true;
 00056       }
 00057     
-00058     counter++;
+00058     counter++;
 00059 
-00060     if( __sol.fitness() > fitness)
+00060     if( __sol.fitness() > fitness)
 00061       {
-00062         fitness=__sol.fitness();
-00063         counter=0;
+00062         fitness=__sol.fitness();
+00063         counter=0;
 00064       }
 00065   
-00066     if(counter==maxNumberOfIterationsWithoutImprovement)
+00066     if(counter==maxNumberOfIterationsWithoutImprovement)
 00067       {
-00068         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00068         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
 00069       }
-00070     return counter!=maxNumberOfIterationsWithoutImprovement;
+00070     return counter!=maxNumberOfIterationsWithoutImprovement;
 00071   }
 00072 
 00074 
-00077   void init ()
+00077   void init ()
 00078   {
-00079     firstFitnessSaved=true;
-00080     counter=0;
+00079     firstFitnessSaved=true;
+00080     counter=0;
 00081   }
 00082 
 00083 private:
 00084 
-00086   unsigned int maxNumberOfIterationsWithoutImprovement;
+00086   unsigned int maxNumberOfIterationsWithoutImprovement;
 00087 
-00089   bool firstFitnessSaved;
+00089   bool firstFitnessSaved;
 00090 
-00092   Fitness fitness;
+00092   Fitness fitness;
 00093 
-00095   unsigned int counter;
+00095   unsigned int counter;
 00096 };
 00097 
 00098 #endif
-
    Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 e04c9991f..893f82573 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 ff506836b..1cfd52790 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 8579100ee..065b36b90 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,57 +47,57 @@
 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 typename  M::EOType  EOT;
+00034   typedef typename  M::EOType  EOT;
 00035 
-00037   typedef typename  EOT::Fitness  Fitness;
+00037   typedef typename  EOT::Fitness  Fitness;
 00038 
 00039 public:
 00040 
 00042 
-00052   moSA (moRandMove < M > &__move_rand,
+00052   moSA (moRandMove < M > &__move_rand,
 00053         moMoveIncrEval < M > &__incr_eval,
 00054         moSolContinue < EOT > &__cont,
 00055         double __init_temp,
-00056         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
-00057   move_rand (__move_rand),
-00058   incr_eval (__incr_eval),
-00059   cont (__cont),
-00060   init_temp (__init_temp),
-00061   cool_sched (__cool_sched),
-00062   full_eval (__full_eval)
+00056         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
+00057   move_rand (__move_rand),
+00058   incr_eval (__incr_eval),
+00059   cont (__cont),
+00060   init_temp (__init_temp),
+00061   cool_sched (__cool_sched),
+00062   full_eval (__full_eval)
 00063   {
 00064 
 00065   }
 00066 
 00068 
-00074   bool operator   ()(EOT & __sol)
+00074   bool operator   ()(EOT & __sol)
 00075   {
 00076 
 00077     if (__sol.invalid ())
 00078       {
-00079         full_eval (__sol);
+00079         full_eval (__sol);
 00080       }
 00081 
-00082     double temp = init_temp;
+00082     double temp = init_temp;
 00083 
 00084     M move;
 00085 
-00086     EOT best_sol = __sol;
+00086     EOT best_sol = __sol;
 00087 
-00088     Fitness current_fitness, delta;
+00088     Fitness current_fitness, delta;
 00089     double exp1, exp2;
 00090 
 00091     do
 00092       {
-00093         cont.init ();
+00093         cont.init ();
 00094         do
 00095           {
-00096             move_rand (move);
+00096             move_rand (move);
 00097 
-00098             current_fitness= incr_eval (move, __sol);
+00098             current_fitness= incr_eval (move, __sol);
 00099 
 00100             delta = current_fitness - __sol.fitness();
 00101 
@@ -107,7 +106,7 @@
 00104                 delta=-delta;
 00105               }
 00106 
-00107             if ((current_fitness > __sol.fitness()) || ((rng.uniform ()) < (exp (-delta/ temp))))
+00107             if ((current_fitness > __sol.fitness()) || ((rng.uniform ()) < (exp (-delta/ temp))))
 00108               {
 00109                 __sol.fitness (current_fitness);
 00110                 move (__sol);
@@ -119,9 +118,9 @@
 00116                   }
 00117               }
 00118           }
-00119         while (cont (__sol));
+00119         while (cont (__sol));
 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 c70a93f9a..960494f1c 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 d1feb399a..a4ee4c131 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 72ef78e1d..b60524861 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html index f4b9acc7f..0e8be7d36 100644 --- a/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSteadyFitSolContinue.h Source File - +
    -
    +

    moSteadyFitSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moSteadyFitSolContinue.h"
@@ -39,28 +38,28 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
-00027   typedef typename EOT::Fitness Fitness;
+00027   typedef typename EOT::Fitness Fitness;
 00028 
 00030 
-00034   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
-00035     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
-00036       maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
+00034   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
+00035     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
+00036       maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
 00037   {}
 00038 
 00040 
-00046   bool operator   () (const EOT & __sol)
+00046   bool operator   () (const EOT & __sol)
 00047   {
-00048     if(!maxNumberOfIterationsReached)
+00048     if(!maxNumberOfIterationsReached)
 00049       {
-00050         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
-00051         if(maxNumberOfIterationsReached)
+00050         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
+00051         if(maxNumberOfIterationsReached)
 00052           {
-00053             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
+00053             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
 00054           }
 00055         return true;
 00056       }
@@ -70,55 +69,55 @@
 00060         return true;
 00061       }
 00062 
-00063     if(firstFitnessSaved)
+00063     if(firstFitnessSaved)
 00064       {
-00065         fitness=__sol.fitness();
-00066         counter=0;
+00065         fitness=__sol.fitness();
+00066         counter=0;
 00067         firstFitnessSaved=false;
 00068         return true;
 00069       }
 00070     
-00071     counter++;
+00071     counter++;
 00072 
-00073     if( __sol.fitness() > fitness )
+00073     if( __sol.fitness() > fitness )
 00074       {
-00075         fitness=__sol.fitness();
-00076         counter=0;
+00075         fitness=__sol.fitness();
+00076         counter=0;
 00077       }
 00078   
-00079     if(counter==maxNumberOfIterationsWithoutImprovement)
+00079     if(counter==maxNumberOfIterationsWithoutImprovement)
 00080       {
-00081         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00081         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
 00082       }
-00083     return counter!=maxNumberOfIterationsWithoutImprovement;
+00083     return counter!=maxNumberOfIterationsWithoutImprovement;
 00084   }
 00085 
 00087 
-00090   void init ()
+00090   void init ()
 00091   {
-00092     maxNumberOfIterationsReached=false;
-00093     counter=0;
-00094     firstFitnessSaved=true;
+00092     maxNumberOfIterationsReached=false;
+00093     counter=0;
+00094     firstFitnessSaved=true;
 00095   }
 00096 
 00097 private:
 00098 
-00100   unsigned int maxNumberOfIterations;
+00100   unsigned int maxNumberOfIterations;
 00101 
-00103   unsigned int maxNumberOfIterationsWithoutImprovement;
+00103   unsigned int maxNumberOfIterationsWithoutImprovement;
 00104 
-00106   bool maxNumberOfIterationsReached;
+00106   bool maxNumberOfIterationsReached;
 00107 
-00109   bool firstFitnessSaved;
+00109   bool firstFitnessSaved;
 00110 
-00112   Fitness fitness;
+00112   Fitness fitness;
 00113 
-00115   unsigned int counter;
+00115   unsigned int counter;
 00116 };
 00117 
 00118 #endif
-
    Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 8246fe73e..07d013a64 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"
@@ -47,47 +46,47 @@
 00023 
 00024 
 00026 
-00029 template < class M > class moTS:public moAlgo < typename M::EOType >
+00029 template < class M > class moTS:public moAlgo < typename M::EOType >
 00030 {
 00031 
 00033   typedef
 00034     typename
 00035     M::EOType
-00036     EOT;
+00036     EOT;
 00037 
 00039   typedef
 00040     typename
 00041     EOT::Fitness
-00042     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 >
+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)
+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)
+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)
+00085   bool operator   ()(EOT & __sol)
 00086   {
 00087     if (__sol.invalid ())
 00088       {
-00089         full_eval (__sol);
+00089         full_eval (__sol);
 00090       }
 00091 
 00092     M move;
 00093 
-00094     EOT best_sol, new_sol;
+00094     EOT best_sol, new_sol;
 00095     best_sol = __sol;
 00096 
-00097     cont.init ();
+00097     cont.init ();
 00098 
 00099     do
 00100       {
@@ -96,10 +95,10 @@
 00103         try
 00104         {
 00105 
-00106           move_expl (__sol, new_sol);
+00106           move_expl (__sol, new_sol);
 00107 
 00108         }
-00109         catch (EmptySelection & __ex)
+00109         catch (EmptySelection & __ex)
 00110         {
 00111 
 00112           break;
@@ -114,7 +113,7 @@
 00121         __sol = new_sol;
 00122 
 00123       }
-00124     while (cont (__sol));
+00124     while (cont (__sol));
 00125 
 00126     __sol = best_sol;
 00127  
@@ -123,16 +122,16 @@
 00130 
 00131 private:
 00132 
-00134   moMoveExpl < M > &move_expl;
+00134   moMoveExpl < M > &move_expl;
 00135 
-00137   moSolContinue < EOT > &cont;
+00137   moSolContinue < EOT > &cont;
 00138 
-00140   eoEvalFunc < EOT > &full_eval;
+00140   eoEvalFunc < EOT > &full_eval;
 00141 };
 00142 
 00143 #endif
-
    Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 f5eacabec..832ba0619 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 12d3f0cff..06f4a6b55 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 Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
    Generated on Fri Sep 14 09:52:19 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 1fb0fa716edd96f87eb5c802ba0ab7aabee44cfb..5b4149957314bd4ae52711ce8cbd32fa10dbd542 100644 GIT binary patch literal 355897 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 aA|cdX9hp{6%j8Xjmn^Tj(jwASAN~Ne%lA|O literal 355865 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 Zgiw2RWLh~blQ$7wvb^R>i%3&__yg9fi!=ZL diff --git a/trunk/paradiseo-mo/doc/html/search.php b/trunk/paradiseo-mo/doc/html/search.php index c06ff54cc..4316d0b4b 100644 --- a/trunk/paradiseo-mo/doc/html/search.php +++ b/trunk/paradiseo-mo/doc/html/search.php @@ -1,10 +1,10 @@ - + Search - +
    • Main Page
      • @@ -374,8 +374,8 @@ main(); ?> -
      Generated on Fri Aug 3 16:38:57 2007 for PARADISEO-MO by  +
      Generated on Fri Sep 14 09:52:19 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 b8960b17b..0a57ebd15 100644 --- a/trunk/paradiseo-mo/doc/html/tree.html +++ b/trunk/paradiseo-mo/doc/html/tree.html @@ -1,6 +1,6 @@ - + @@ -104,119 +104,62 @@

      o+Class Hierarchy

      |o*EmptySelection

      -

      |o+eoFunctorBase [external]

      +

      |o*moAlgo< EOT >

      +

      |o+moAlgo< M::EOType >

      +

      |o+moAspirCrit< M >

      + +

      |o+moCoolingSchedule

      + +

      |o*moLSCheckPoint< M >

      +

      |o*moMove< EOT >

      +

      |o+moMoveExpl< M >

      + -

      |\+eoOp< 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 32bd0f949..b077d601d 100644 --- a/trunk/paradiseo-mo/doc/latex/annotated.tex +++ b/trunk/paradiseo-mo/doc/latex/annotated.tex @@ -1,37 +1,37 @@ \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 moFitSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{} -\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stopping 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 moNoFitImprSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{} -\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 stopping criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} -\item\contentsline{section}{{\bf moSteadyFitSolContinue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_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\-Fit\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stopping 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\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{} +\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 stopping criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_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..ad07def4d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex @@ -1,29 +1,23 @@ -\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] -\begin{center} -\leavevmode -\includegraphics[height=4cm]{classmo_algo} -\end{center} -\end{figure} \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..fbf0b26ef 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 109.29 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.175 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.575 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw -(eoFunctorBase) cw (moImprBestFitAspirCrit< M >) cw (moNoAspirCrit< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moAspirCrit< M >) 0.5 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moImprBestFitAspirCrit< M >) 0 0 box (moNoAspirCrit< M >) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex index 78dea621f..ae5da71d1 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=2cm]{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.eps b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps index e1504ce28..f9c367972 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 259.74 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.925 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moBestImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moBestImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex index d97f88b80..8bb7f5475 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex @@ -1,66 +1,66 @@ -\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} +\includegraphics[height=2cm]{classmo_best_impr_select} \end{center} \end{figure} \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) +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) +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. -If the given fitness enables an improvement, the move (\doxyref{moMove}{p.}{classmo_move}) and the fitness linked to this move are saved. +If the given fitness enables an improvement, 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 improvement, the move (\doxyref{moMove}{p.}{clas \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]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -90,16 +90,14 @@ 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 $>$}. +Definition at line 65 of file mo\-Best\-Impr\-Select.h. -Definition at line 65 of file moBestImprSelect.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.eps b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps index 099ff0bb2..a1d0c2d59 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 203.046 +%%BoundingBox: 0 0 500 101.523 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.925 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moCoolingSchedule) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw (moExponentialCoolingSchedule) cw (moLinearCoolingSchedule) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moCoolingSchedule) 0.5 1 box - (eoUF< double &, bool >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moExponentialCoolingSchedule) 0 0 box (moLinearCoolingSchedule) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex index 47648d9d0..d0d7d7b80 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex @@ -1,14 +1,14 @@ -\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} +\includegraphics[height=2cm]{classmo_cooling_schedule} \end{center} \end{figure} @@ -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.eps b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps index 92ecef949..9a4b2773b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 406.091 +%%BoundingBox: 0 0 500 203.046 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.23125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moExponentialCoolingSchedule) cw (moCoolingSchedule) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moExponentialCoolingSchedule) 0 0 box (moCoolingSchedule) 0 1 box - (eoUF< double &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex index 4e4147f0f..3e5a85dc9 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex @@ -1,47 +1,47 @@ -\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} +\includegraphics[height=2cm]{classmo_exponential_cooling_schedule} \end{center} \end{figure} \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 Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (double \&\_\-\_\-temp) +bool \bf{operator()} (double \&\_\-\_\-temp) \begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -double {\bf threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} +double \bf{threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} \begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item -double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} +double \bf{ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} \begin{CompactList}\small\item\em The decreasing factor of the temperature. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -One of the possible \doxyref{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} Basic constructor. @@ -53,12 +53,12 @@ Basic 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]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} Function which proceeds to the cooling. @@ -74,12 +74,10 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. - -Definition at line 41 of file moExponentialCoolingSchedule.h. +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.eps b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps index 7057473a9..04ffcb96d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 258.065 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.9375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moFirstImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moFirstImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex index 606114484..bc7cc1662 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex @@ -1,81 +1,81 @@ -\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} +\includegraphics[height=2cm]{classmo_first_impr_select} \end{center} \end{figure} \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) +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) +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 improvement 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. -If the given fitness enables an improvement, the move (\doxyref{moMove}{p.}{classmo_move}) should be applied to the current solution. +If the given fitness enables an improvement, 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 improvement, the move (\doxyref{moMove}{p.}{clas \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]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -103,16 +103,14 @@ 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 $>$}. +Definition at line 76 of file mo\-First\-Impr\-Select.h. -Definition at line 76 of file moFirstImprSelect.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_fit_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps index 020df214d..fba9a3dd0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 441.989 +%%BoundingBox: 0 0 500 239.521 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moFitSolContinue< EOT >) cw (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moFitSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex index 56dec57e3..ac4cb93aa 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex @@ -1,41 +1,41 @@ -\section{moFitSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Fit\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_fit_sol_continue}\index{moFitSolContinue@{moFitSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$moFitSolContinue.h$>$} +{\tt \#include $<$mo\-Fit\-Sol\-Continue.h$>$} -Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_fit_sol_continue} +\includegraphics[height=2cm]{classmo_fit_sol_continue} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f} +typedef EOT::Fitness \bf{Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moFitSolContinue} ({\bf Fitness} \_\-\_\-fitness) +\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} \_\-\_\-fitness) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) +bool \bf{operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} +\bf{Fitness} \bf{fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} \begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moFitSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Fit\-Sol\-Continue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -43,12 +43,12 @@ The stop criterion corresponds to a fitness threshold gained. -Definition at line 21 of file moFitSolContinue.h. +Definition at line 21 of file mo\-Fit\-Sol\-Continue.h. \subsection{Constructor \& Destructor Documentation} -\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}} -\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moFitSolContinue}$<$ EOT $>$::{\bf moFitSolContinue} ({\bf Fitness} {\em \_\-\_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_b14f37ba88de4e12583b22f5aabeb682} +\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!moFitSolContinue@{moFitSolContinue}} +\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} {\em \_\-\_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_b14f37ba88de4e12583b22f5aabeb682} Basic constructor. @@ -60,12 +60,12 @@ Basic constructor. \end{Desc} -Definition at line 33 of file moFitSolContinue.h. +Definition at line 33 of file mo\-Fit\-Sol\-Continue.h. \subsection{Member Function Documentation} -\index{moFitSolContinue@{moFitSolContinue}!operator()@{operator()}} -\index{operator()@{operator()}!moFitSolContinue@{moFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27} +\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27} Function that activates the stopping criterion. @@ -81,23 +81,21 @@ Indicates if the fitness threshold has not yet been reached. \item[Returns:]true or false according to the value of the fitness. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Definition at line 43 of file mo\-Fit\-Sol\-Continue.h. -Definition at line 43 of file moFitSolContinue.h. - -References moFitSolContinue$<$ EOT $>$::fitness.\index{moFitSolContinue@{moFitSolContinue}!init@{init}} -\index{init@{init}!moFitSolContinue@{moFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} +References mo\-Fit\-Sol\-Continue$<$ EOT $>$::fitness.\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!init@{init}} +\index{init@{init}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} Procedure which allows to initialise all the stuff needed. It can be also used to reinitialize all the needed things. -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 57 of file moFitSolContinue.h. +Definition at line 57 of file mo\-Fit\-Sol\-Continue.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moFitSolContinue.h\end{CompactItemize} +mo\-Fit\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps index c73c60ba3..c9e65107d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 441.989 +%%BoundingBox: 0 0 500 227.273 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moGenSolContinue< EOT >) cw (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moGenSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex index 986c3d8da..0e3f26d83 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -1,38 +1,38 @@ -\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 stopping 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} +\includegraphics[height=2cm]{classmo_gen_sol_continue} \end{center} \end{figure} \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 Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) +bool \bf{operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \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 stopping criterion for a solution-based heuristic. @@ -40,12 +40,12 @@ The stopping 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} Basic constructor. @@ -53,16 +53,16 @@ Basic 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]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} Function that activates the stop criterion. @@ -78,25 +78,23 @@ Increments the counter and returns true if the current number of iteration is lo \item[Returns:]true or false according to the current generation number. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Definition at line 42 of file mo\-Gen\-Sol\-Continue.h. -Definition at line 42 of file moGenSolContinue.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 all the stuff needed. It can be also used to reinitialize the counter all the needed things. -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 51 of file moGenSolContinue.h. +Definition at line 51 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.eps b/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps index 184d2041a..648f11f20 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moHC< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moHC< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moHC< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex index b402914eb..f1438b252 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex @@ -1,47 +1,47 @@ -\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} +\includegraphics[height=2cm]{classmo_h_c} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\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, 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, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item -bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb} +typedef M::EOType \bf{EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027} +typedef EOT::Fitness \bf{Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf 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} +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}, 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}, 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]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} 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,10 @@ 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 $>$}. +Definition at line 82 of file mo\-HC.h. -Definition at line 82 of file moHC.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.eps b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps index 1240e010d..1383bbf1b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 327.869 +%%BoundingBox: 0 0 500 346.821 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.44167 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,8 +176,6 @@ boxfont setfont (moHCMoveLoopExpl< M >) cw (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moHCMoveLoopExpl< M >) 0 0 box (moMoveLoopExpl< M >) 0 1 box (moMoveExpl< M >) 0 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box - (eoFunctorBase) 0 4 box % ----- relations ----- @@ -205,11 +201,3 @@ solid 0 0 1 out solid 1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -0 0 3 out -solid -1 0 4 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex index 776f8a638..aebc0a6a4 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,62 +1,62 @@ -\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} +\includegraphics[height=3cm]{classmo_h_c_move_loop_expl} \end{center} \end{figure} \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]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,12 +89,10 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Definition at line 59 of file mo\-HCMove\-Loop\-Expl.h. -Definition at line 59 of file moHCMoveLoopExpl.h. - -References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move. +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..41cee35a0 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 218.579 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moImprBestFitAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moImprBestFitAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex index 6647d77fa..b65f6e478 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,59 +1,59 @@ -\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} +\includegraphics[height=2cm]{classmo_impr_best_fit_aspir_crit} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf 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) +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Function that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3} \begin{CompactList}\small\item\em Best fitness found until now. \item\end{CompactList}\item -bool {\bf first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265} +bool \bf{first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265} \begin{CompactList}\small\item\em Indicates that a fitness has been already saved or not. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class 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. @@ -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..bc4ea56dc 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 245.399 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moItRandNextMove< M >) cw (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moItRandNextMove< M >) 0 0 box (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex index e7abc9a90..7187c8a34 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,63 +1,63 @@ -\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} +\includegraphics[height=2cm]{classmo_it_rand_next_move} \end{center} \end{figure} \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. +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..6f1982128 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,33 +1,27 @@ -\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] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_l_s_check_point} -\end{center} -\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) +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{add} (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$<$ 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,12 +29,12 @@ 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. @@ -54,11 +48,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 (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 +64,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.eps b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps index 3e62629a9..35d64af4d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 476.19 +%%BoundingBox: 0 0 500 238.095 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.1 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moLinearCoolingSchedule) cw (moCoolingSchedule) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moLinearCoolingSchedule) 0 0 box (moCoolingSchedule) 0 1 box - (eoUF< double &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex index 59b77e02d..ed86431f0 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex @@ -1,47 +1,47 @@ -\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} +\includegraphics[height=2cm]{classmo_linear_cooling_schedule} \end{center} \end{figure} \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) +bool \bf{operator()} (double \&\_\-\_\-temp) \begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -double {\bf threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} +double \bf{threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} \begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item -double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} +double \bf{quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} \begin{CompactList}\small\item\em The quantity that allows the temperature to decrease. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -One of the possible \doxyref{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,12 +53,12 @@ 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]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} Function which proceeds to the cooling. @@ -74,12 +74,10 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. - -Definition at line 41 of file moLinearCoolingSchedule.h. +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..9c7d8c243 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move.tex @@ -1,26 +1,20 @@ -\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] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move} -\end{center} -\end{figure} \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 +22,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.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps index 18fb8889f..708dd0b50 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 163.934 +%%BoundingBox: 0 0 500 173.41 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw (moMoveLoopExpl< M >) cw (moHCMoveLoopExpl< M >) cw (moTSMoveLoopExpl< M >) cw @@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveExpl< M >) 0.5 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box - (eoFunctorBase) 0.5 4 box (moMoveLoopExpl< M >) 0.5 1 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box % ----- relations ----- -solid -0 0.5 2 out -solid -1 0.5 3 in -solid -0 0.5 3 out -solid -1 0.5 4 in solid 1 0.5 1.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex index 0e4a7e621..614132a6c 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex @@ -1,29 +1,29 @@ -\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} +\includegraphics[height=3cm]{classmo_move_expl} \end{center} \end{figure} \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..6b4bd7289 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex @@ -1,20 +1,14 @@ -\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] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move_incr_eval} -\end{center} -\end{figure} \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 +16,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..556b323ee 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex @@ -1,29 +1,23 @@ -\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] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move_init} -\end{center} -\end{figure} \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.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps index c6a78b5b1..76326be37 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 163.934 +%%BoundingBox: 0 0 500 173.41 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw (moHCMoveLoopExpl< M >) cw (moTSMoveLoopExpl< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moMoveLoopExpl< M >) 0.5 1 box (moMoveExpl< M >) 0.5 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box - (eoFunctorBase) 0.5 4 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box @@ -204,14 +200,6 @@ solid solid 1 0.5 2 in solid -0 0.5 2 out -solid -1 0.5 3 in -solid -0 0.5 3 out -solid -1 0.5 4 in -solid 1 0.5 0.25 out solid 0 1 1 conn diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex index 15968268f..8bbfd3542 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex @@ -1,29 +1,29 @@ -\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} +\includegraphics[height=3cm]{classmo_move_loop_expl} \end{center} \end{figure} \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.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps index b61e2bf9f..86a37c002 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 101.01 +%%BoundingBox: 0 0 500 83.8574 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.95 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5.9625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 3 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw (moBestImprSelect< M >) cw (moFirstImprSelect< M >) cw (moRandImprSelect< M >) cw @@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveSelect< M >) 1 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 1 2 box - (eoFunctorBase) 1 3 box (moBestImprSelect< M >) 0 0 box (moFirstImprSelect< M >) 1 0 box (moRandImprSelect< M >) 2 0 box % ----- relations ----- -solid -0 1 1 out -solid -1 1 2 in -solid -0 1 2 out -solid -1 1 3 in solid 1 1 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex index 82d8378b7..3d80f533f 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex @@ -1,46 +1,46 @@ -\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} +\includegraphics[height=2cm]{classmo_move_select} \end{center} \end{figure} \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 +virtual bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)=0 \begin{CompactList}\small\item\em Function which updates the best solutions. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class 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,9 +54,9 @@ 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. @@ -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..d9586a593 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 245.399 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw (moItRandNextMove< M >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -189,20 +187,10 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box (moItRandNextMove< M >) 0 0 box % ----- relations ----- -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in solid 1 0 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex index 3fdea7d9d..e51cd5566 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex @@ -1,29 +1,29 @@ -\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} +\includegraphics[height=2cm]{classmo_next_move} \end{center} \end{figure} \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..4a1de4c86 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 291.971 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.7125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moNoAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moNoAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex index c9169ff46..d176e272e 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex @@ -1,40 +1,40 @@ -\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} +\includegraphics[height=2cm]{classmo_no_aspir_crit} \end{center} \end{figure} \subsection*{Private Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) +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} +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. @@ -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_no_fit_impr_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps index 67d7d5048..6c532ffcd 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 386.473 +%%BoundingBox: 0 0 500 193.237 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.29375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.5875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moNoFitImprSolContinue< EOT >) cw (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moNoFitImprSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex index 41af5bb73..390a2c38b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex @@ -1,50 +1,50 @@ -\section{moNoFitImprSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_no_fit_impr_sol_continue}\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$moNoFitImprSolContinue.h$>$} +{\tt \#include $<$mo\-No\-Fit\-Impr\-Sol\-Continue.h$>$} -Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_no_fit_impr_sol_continue} +\includegraphics[height=2cm]{classmo_no_fit_impr_sol_continue} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3} +typedef EOT::Fitness \bf{Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moNoFitImprSolContinue} (unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement) +\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) +bool \bf{operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b} +unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b} \begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item -bool {\bf firstFitnessSaved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef} +bool \bf{first\-Fitness\-Saved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef} \begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item -{\bf Fitness} {\bf fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} +\bf{Fitness} \bf{fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -unsigned int {\bf counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb} +unsigned int \bf{counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb} \begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moNoFitImprSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -52,12 +52,12 @@ The stop criterion corresponds to a maximum number of iterations without improve -Definition at line 21 of file moNoFitImprSolContinue.h. +Definition at line 21 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. \subsection{Constructor \& Destructor Documentation} -\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moNoFitImprSolContinue}$<$ EOT $>$::{\bf moNoFitImprSolContinue} (unsigned int {\em \_\-\_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_a447aa0d8ed4ddf6fe47c805269cac6c} +\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_a447aa0d8ed4ddf6fe47c805269cac6c} Basic constructor. @@ -65,16 +65,16 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} +\item[{\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 33 of file moNoFitImprSolContinue.h. +Definition at line 33 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. \subsection{Member Function Documentation} -\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!operator()@{operator()}} -\index{operator()@{operator()}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed} +\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed} Function that activates the stopping criterion. @@ -88,25 +88,23 @@ Indicates if the fitness has not been improved since a given number of iteration \item[Returns:]true or false. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Definition at line 43 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. -Definition at line 43 of file moNoFitImprSolContinue.h. - -References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, and moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!init@{init}} -\index{init@{init}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moNoFitImprSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} +References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::fitness, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!init@{init}} +\index{init@{init}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} Procedure which allows to initialise all the stuff needed. It can be also used to reinitialize all the needed things. -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 77 of file moNoFitImprSolContinue.h. +Definition at line 77 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. -References moNoFitImprSolContinue$<$ EOT $>$::counter, and moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved. +References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moNoFitImprSolContinue.h\end{CompactItemize} +mo\-No\-Fit\-Impr\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps index fe55210a4..74d2fc0f6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 251.572 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.9875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moRandImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moRandImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex index 93c93e0ee..a0169f782 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex @@ -1,63 +1,63 @@ -\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} +\includegraphics[height=2cm]{classmo_rand_impr_select} \end{center} \end{figure} \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) +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 Function that updates the fitness and move vectors. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) +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 improvement 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,13 +68,13 @@ 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. @@ -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]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -111,16 +111,14 @@ 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 $>$}. +Definition at line 77 of file mo\-Rand\-Impr\-Select.h. -Definition at line 77 of file moRandImprSelect.h. - -References eoRng::random(), moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves. +References 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..ff3370a8d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex @@ -1,29 +1,23 @@ -\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] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_rand_move} -\end{center} -\end{figure} \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.eps b/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps index efa0100f9..90945c761 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moSA< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moSA< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moSA< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex index 428739912..7e3a1d139 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex @@ -1,57 +1,57 @@ -\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} +\includegraphics[height=2cm]{classmo_s_a} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\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, 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} +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}, 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 52 of file moSA.h. +Definition at line 52 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]}}\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,10 @@ As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the S \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. +Definition at line 74 of file mo\-SA.h. -Definition at line 74 of file moSA.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, and mo\-SA$<$ M $>$::move\_\-rand. 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..624cb75de 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 213.904 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.3375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moSimpleMoveTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleMoveTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex index d80f3328b..1c09f442a 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,68 +1,68 @@ -\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} +\includegraphics[height=2cm]{classmo_simple_move_tabu_list} \end{center} \end{figure} \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) +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) +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. @@ -70,19 +70,17 @@ 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..e46012fd0 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 200 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 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 /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moSimpleSolutionTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleSolutionTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex index 9437723d9..9fe2bc6d6 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,67 +1,67 @@ -\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} +\includegraphics[height=2cm]{classmo_simple_solution_tabu_list} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} +typedef M::EOType \bf{EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf 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) +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) +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,14 +73,14 @@ 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. @@ -88,19 +88,17 @@ 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.eps b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps index 3914bf1d9..34ec5563d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 96.6184 +%%BoundingBox: 0 0 500 48.3092 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 5.175 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 10.35 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 4 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw (moFitSolContinue< EOT >) cw (moGenSolContinue< EOT >) cw (moNoFitImprSolContinue< EOT >) cw @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moSolContinue< EOT >) 1.5 1 box - (eoUF< const EOT &, bool >) 1.5 2 box - (eoFunctorBase) 1.5 3 box (moFitSolContinue< EOT >) 0 0 box (moGenSolContinue< EOT >) 1 0 box (moNoFitImprSolContinue< EOT >) 2 0 box @@ -201,14 +197,6 @@ boundx scalefactor div boundy scalefactor div scale % ----- relations ----- -solid -0 1.5 1 out -solid -1 1.5 2 in -solid -0 1.5 2 out -solid -1 1.5 3 in solid 1 1.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex index 262dbc62e..e22f85346 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex @@ -1,46 +1,46 @@ -\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 stopping 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=2.70531cm]{classmo_sol_continue} +\includegraphics[height=1.35266cm]{classmo_sol_continue} \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 the stopping 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 stopping 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 (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 stopping criterion needs. Generally, it allocates some data structures or initialises some counters. -Implemented in {\bf moFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, {\bf moNoFitImprSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and {\bf moSteadyFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}. +Implemented in \bf{mo\-Fit\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, \bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, \bf{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and \bf{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}. 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_steady_fit_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps index 944e80b1e..ab211e5df 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 388.35 +%%BoundingBox: 0 0 500 194.175 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.2875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.575 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moSteadyFitSolContinue< EOT >) cw (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moSteadyFitSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex index 473136fe8..5a4f980aa 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex @@ -1,56 +1,56 @@ -\section{moSteadyFitSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_steady_fit_sol_continue}\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}} One possible stopping criterion for a solution-based heuristic. -{\tt \#include $<$moSteadyFitSolContinue.h$>$} +{\tt \#include $<$mo\-Steady\-Fit\-Sol\-Continue.h$>$} -Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_steady_fit_sol_continue} +\includegraphics[height=2cm]{classmo_steady_fit_sol_continue} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007} +typedef EOT::Fitness \bf{Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSteadyFitSolContinue} (unsigned int \_\-\_\-maxNumberOfIterations, unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement) +\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int \_\-\_\-max\-Number\-Of\-Iterations, unsigned int \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) +bool \bf{operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxNumberOfIterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8} +unsigned int \bf{max\-Number\-Of\-Iterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8} \begin{CompactList}\small\item\em Maximum number of iterations before considering the fitness. \item\end{CompactList}\item -unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40} +unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40} \begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item -bool {\bf maxNumberOfIterationsReached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887} +bool \bf{max\-Number\-Of\-Iterations\-Reached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887} -\begin{CompactList}\small\item\em Flag that indicates that the maxNumberIteration have been reached. \item\end{CompactList}\item -bool {\bf firstFitnessSaved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3} +\begin{CompactList}\small\item\em Flag that indicates that the max\-Number\-Iteration have been reached. \item\end{CompactList}\item +bool \bf{first\-Fitness\-Saved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3} \begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item -{\bf Fitness} {\bf fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} +\bf{Fitness} \bf{fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -unsigned int {\bf counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} +unsigned int \bf{counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} \begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moSteadyFitSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} One possible stopping criterion for a solution-based heuristic. @@ -58,12 +58,12 @@ The stop criterion corresponds to a maximum number of iterations without improve -Definition at line 21 of file moSteadyFitSolContinue.h. +Definition at line 21 of file mo\-Steady\-Fit\-Sol\-Continue.h. \subsection{Constructor \& Destructor Documentation} -\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moSteadyFitSolContinue}$<$ EOT $>$::{\bf moSteadyFitSolContinue} (unsigned int {\em \_\-\_\-maxNumberOfIterations}, unsigned int {\em \_\-\_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_5f50fb18e380230e37301f33319786a4} +\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Number\-Of\-Iterations}, unsigned int {\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_5f50fb18e380230e37301f33319786a4} Basic constructor. @@ -71,16 +71,16 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumberOfIterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} +\item[{\em \_\-\_\-max\-Number\-Of\-Iterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 34 of file moSteadyFitSolContinue.h. +Definition at line 34 of file mo\-Steady\-Fit\-Sol\-Continue.h. \subsection{Member Function Documentation} -\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!operator()@{operator()}} -\index{operator()@{operator()}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3} +\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3} Function that activates the stopping criterion. @@ -96,25 +96,23 @@ Indicates if the fitness has not been improved since a number of iterations (aft \item[Returns:]true or false. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Definition at line 46 of file mo\-Steady\-Fit\-Sol\-Continue.h. -Definition at line 46 of file moSteadyFitSolContinue.h. - -References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, moSteadyFitSolContinue$<$ EOT $>$::fitness, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterations, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!init@{init}} -\index{init@{init}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moSteadyFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} +References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::fitness, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!init@{init}} +\index{init@{init}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} Procedure which allows to initialise the stuff needed. It can be also used to reinitialize the counter all the needed things. -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 90 of file moSteadyFitSolContinue.h. +Definition at line 90 of file mo\-Steady\-Fit\-Sol\-Continue.h. -References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached. +References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSteadyFitSolContinue.h\end{CompactItemize} +mo\-Steady\-Fit\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps b/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps index a62652ad5..7f23b6aef 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moTS< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moTS< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moTS< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex index 28299680d..e0c9281b6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex @@ -1,50 +1,50 @@ -\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} +\includegraphics[height=2cm]{classmo_t_s} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\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, 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, 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) +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1} +typedef M::EOType \bf{EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca} +typedef EOT::Fitness \bf{Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf 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} +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{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTS$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-TS$<$ M $>$} Tabu Search (TS). @@ -52,17 +52,17 @@ Generic algorithm that describes a tabu search. -Definition at line 29 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}, 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:] @@ -71,9 +71,9 @@ In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl \end{Desc} -Definition at line 58 of file moTS.h.\index{moTS@{moTS}!moTS@{moTS}} -\index{moTS@{moTS}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +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}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -83,21 +83,21 @@ The explorer is given in the parameters. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{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 71 of file moTS.h. +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]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} 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:] @@ -108,12 +108,10 @@ Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. +Definition at line 85 of file mo\-TS.h. -Definition at line 85 of file moTS.h. - -References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, and moTS$<$ M $>$::move\_\-expl. +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.eps b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps index fd31fc02a..d8324527a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 327.869 +%%BoundingBox: 0 0 500 352.941 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.41667 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,8 +176,6 @@ boxfont setfont (moTSMoveLoopExpl< M >) cw (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moTSMoveLoopExpl< M >) 0 0 box (moMoveLoopExpl< M >) 0 1 box (moMoveExpl< M >) 0 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box - (eoFunctorBase) 0 4 box % ----- relations ----- @@ -205,11 +201,3 @@ solid 0 0 1 out solid 1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -0 0 3 out -solid -1 0 4 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex index 2a5d367c6..c8e967f77 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,70 +1,70 @@ -\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} +\includegraphics[height=3cm]{classmo_t_s_move_loop_expl} \end{center} \end{figure} \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]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,12 +97,10 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Definition at line 69 of file mo\-TSMove\-Loop\-Expl.h. -Definition at line 69 of file moTSMoveLoopExpl.h. - -References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, moTSMoveLoopExpl$<$ M $>$::incr\_\-eval, moTSMoveLoopExpl$<$ M $>$::move\_\-init, moTSMoveLoopExpl$<$ M $>$::move\_\-select, moTSMoveLoopExpl$<$ M $>$::next\_\-move, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. +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..63ca07c99 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 100 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.6 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw -(eoFunctorBase) cw (moSimpleMoveTabuList< M >) cw (moSimpleSolutionTabuList< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moTabuList< M >) 0.5 1 box - (eoBF< const M &, const M::EOType &, bool >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moSimpleMoveTabuList< M >) 0 0 box (moSimpleSolutionTabuList< M >) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex index 1ed7c1b47..9e5560916 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=2cm]{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 2d3a9ff18..b9d41f781 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 Fri Aug 3 16:38:56 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Aug 3 16:38:56 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Sep 14 09:52:19 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Sep 14 09:52:19 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 cc114dc6a..212806dbf 100644 --- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/doc/latex/hierarchy.tex @@ -1,92 +1,56 @@ \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 \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} \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\-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} -\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\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \begin{CompactList} -\item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} +\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::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{} +\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} \begin{CompactList} -\item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} +\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} +\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} +\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} +\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 \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\-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 \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{} \begin{CompactList} -\item \contentsline{section}{moFitSolContinue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{} -\item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} -\item \contentsline{section}{moNoFitImprSolContinue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{} -\item \contentsline{section}{moSteadyFitSolContinue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{} +\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} \end{CompactList} -\end{CompactList} -\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{} +\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} +\item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} -\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{} -\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{} +\item \contentsline{section}{mo\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{} +\item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} +\item \contentsline{section}{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{} +\item \contentsline{section}{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{} \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}}{} -\end{CompactList} -\end{CompactList} -\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{} -\end{CompactList} -\item eoUF$<$ EOType \&, bool $>${\tt [external]}\item eoUF$<$ M \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{} -\end{CompactList} -\item eoUF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ M::EOType $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} \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\-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} -\end{CompactList} -\end{CompactList} -\item eoOp$<$ EOType $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ EOT $>${\tt [external]}\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList} -\end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/main.tex b/trunk/paradiseo-mo/doc/latex/main.tex index 8dba03e9c..3ce1b6114 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 - It contains classes for almost any kind of one solution based heuristics.\section{tutorial}\label{main_tutorial} -\section{install}\label{main_install} -The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design} +\section{Introduction}\label{main_intro} +MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par + It contains classes for almost any kind of one solution based heuristics.\section{Tutorial}\label{main_tutorial} +\section{Installation}\label{main_install} +The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{Overall Design}\label{main_design} diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex index 8d25b91a3..a578ee4de 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 Fri Aug 3 16:38:56 2007}\\ +{\small Fri Sep 14 09:52:19 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 a115df7bf..b5fc5be2c 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "14 Sep 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 eba9583d3..7c598a21b 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moAlgo \- Description of an algorithm of the paradiseo-mo library. .PP \fC#include \fP .PP -Inherits \fBeoMonOp< EOT >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 index 787df5386..5122b4a14 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. -.PP Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .PP .SS "Public Member Functions" diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index 3dfa6dc21..01e3ea08d 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -88,7 +88,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 47 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. -.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -105,8 +105,6 @@ Procedure which saved the best move and fitness. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 65 of file moBestImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index 52e9974b6..2b786f726 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moCoolingSchedule \- This class gives the description of a cooling schedule. .PP \fC#include \fP .PP -Inherits \fBeoUF< double &, bool >\fP. -.PP Inherited by \fBmoExponentialCoolingSchedule\fP, and \fBmoLinearCoolingSchedule\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index cc9ab7cf5..8ec9d3201 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -61,7 +61,7 @@ Basic constructor. Definition at line 31 of file moExponentialCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" +.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" .PP Function which proceeds to the cooling. .PP @@ -78,8 +78,6 @@ if the new temperature (current temperature * ratio) is greater than the thresho .RE .PP -.PP -Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 41 of file moExponentialCoolingSchedule.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index 0b2292799..6c5ba9d92 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -101,7 +101,7 @@ TRUE if the move does not improve the fitness. Definition at line 52 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. -.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -118,8 +118,6 @@ Procedure which saved the best move and fitness. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 76 of file moFirstImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 index 1b0af2ef0..c2b285459 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moFitSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFitSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -69,7 +69,7 @@ Basic constructor. Definition at line 33 of file moFitSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" .PP Function that activates the stopping criterion. .PP @@ -86,8 +86,6 @@ true or false according to the value of the fitness. .RE .PP -.PP -Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 43 of file moFitSolContinue.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 index c5f834a88..e3ff15708 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -65,7 +65,7 @@ Basic constructor. Definition at line 30 of file moGenSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" .PP Function that activates the stop criterion. .PP @@ -82,8 +82,6 @@ true or false according to the current generation number. .RE .PP -.PP -Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 42 of file moGenSolContinue.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3 index 296d6d36e..364b22d54 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIFull constructor. \fP" .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fILight constructor. \fP" .ti -1c @@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIComplete exploration of the neighborhood. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -63,7 +63,7 @@ Class which describes the algorithm for a hill climbing. Definition at line 26 of file moHC.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Full constructor. .PP @@ -85,7 +85,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP. .PP Definition at line 53 of file moHC.h. -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Light constructor. .PP @@ -103,7 +103,7 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM Definition at line 67 of file moHC.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP Function which launches the HC. .PP @@ -120,8 +120,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moHC.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index 88a1b56bb..4abf38c45 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -87,7 +87,7 @@ All the boxes have to be specified. Definition at line 43 of file moHCMoveLoopExpl.h. .SH "Member Function Documentation" .PP -.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" +.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" .PP Procedure which launches the explorer. .PP @@ -101,8 +101,6 @@ The exploration starts from an old solution and provides a new solution. .RE .PP -.PP -Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 59 of file moHCMoveLoopExpl.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index 527fbfe0e..0ce535fc1 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -59,7 +59,7 @@ 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. .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 8ad3ea13c..3d553e390 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -63,7 +63,7 @@ Definition at line 22 of file moItRandNextMove.h. .PP The constructor. .PP -\fBParameters\fP only for initialising the attributes. +Parameters only for initialising the attributes. .PP \fBParameters:\fP .RS 4 @@ -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 8c7755fde..9e7f38070 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moLSCheckPoint \- Class which allows a checkpointing system. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. -.PP .SS "Public Member Functions" .in +1c @@ -20,7 +18,7 @@ Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. .br .RI "\fIFunction which launches the checkpointing. \fP" .ti -1c -.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)" +.RI "void \fBadd\fP (eoBF< const M &, const typename M::EOType &, void > &__f)" .br .RI "\fIProcedure which add a new function to the function vector. \fP" .in -1c @@ -28,7 +26,7 @@ Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. .in +1c .ti -1c -.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunc\fP" +.RI "std::vector< eoBF< const M &, const typename M::EOType &, void > * > \fBfunc\fP" .br .RI "\fIvector of function \fP" .in -1c @@ -61,7 +59,7 @@ Each saved function is used on the current move and the current solution. Definition at line 34 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::func. -.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" +.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" .PP Procedure which add a new function to the function vector. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index 96b74ecab..2c4346a63 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -61,7 +61,7 @@ Simple constructor. Definition at line 31 of file moLinearCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" +.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" .PP Function which proceeds to the cooling. .PP @@ -78,8 +78,6 @@ if the new temperature (current temperature - quantity) is greater than the thre .RE .PP -.PP -Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 41 of file moLinearCoolingSchedule.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3 index a83851cf6..b468c5e26 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMove \- Definition of a move. .PP \fC#include \fP .PP -Inherits \fBeoUF< EOT &, void >\fP. -.PP .SS "Public Types" .in +1c diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 index c23d57890..a0b674274 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveExpl \- Description of a move (\fBmoMove\fP) explorer. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M::EOType &, M::EOType &, void >\fP. -.PP Inherited by \fBmoMoveLoopExpl< M >\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index 5ee3a827e..9b23c5275 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 index 7c83a74de..4a36d3d70 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveInit \- Move (\fBmoMove\fP) initializer. .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, void >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 index 05ea03193..7a376a4d1 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "14 Sep 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 02a978f51..f6a72cb77 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveSelect \- Class that describes a move selector (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, M::EOType::Fitness &, void >\fP. -.PP Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .PP .SS "Public Types" diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 index 30e66bf6d..c7d4bf6c7 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, bool >\fP. -.PP Inherited by \fBmoItRandNextMove< M >\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index 3684ce4cd..eb99650db 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 index bcd7d7c92..933693c3a 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moNoFitImprSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoFitImprSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -81,7 +81,7 @@ Basic constructor. Definition at line 33 of file moNoFitImprSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" .PP Function that activates the stopping criterion. .PP @@ -98,8 +98,6 @@ true or false. .RE .PP -.PP -Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 43 of file moNoFitImprSolContinue.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 index 8f52b5903..161393b00 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -106,7 +106,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 56 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. -.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP The move selection. .PP @@ -125,12 +125,10 @@ One the saved move is randomly chosen. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 77 of file moRandImprSelect.h. .PP -References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 index 8431a5322..1c1e1d3a1 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moRandMove \- Random move generator. .PP \fC#include \fP .PP -Inherits \fBeoUF< M &, void >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3 index 26ad08694..af89143de 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fISA constructor. \fP" .ti -1c @@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIThe cooling schedule. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm. Definition at line 30 of file moSA.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP SA constructor. .PP @@ -101,7 +101,7 @@ All the boxes used by a SA need to be given. Definition at line 52 of file moSA.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP function that launches the SA algorithm. .PP @@ -118,12 +118,10 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 74 of file moSA.h. .PP -References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform(). +References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index 80198c3c8..5953561f4 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -77,7 +77,7 @@ 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. .PP @@ -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 b7fa80eed..a5a63603e 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -93,7 +93,7 @@ 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. .PP @@ -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 aca211515..2c4d6a813 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moSolContinue \- Class that describes a stopping criterion for a solution-based .PP \fC#include \fP .PP -Inherits \fBeoUF< const EOT &, bool >\fP. -.PP Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP. .PP .SS "Public Member Functions" @@ -28,7 +26,7 @@ Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmo .SS "template class moSolContinue< EOT >" Class that describes a stopping criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). +It allows to add an initialisation procedure to an object that is a unary function (eoUF). .PP Definition at line 22 of file moSolContinue.h. .SH "Member Function Documentation" diff --git a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 index 0576372df..0bd148bca 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSteadyFitSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSteadyFitSolContinue" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -91,7 +91,7 @@ Basic constructor. Definition at line 34 of file moSteadyFitSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" .PP Function that activates the stopping criterion. .PP @@ -108,8 +108,6 @@ true or false. .RE .PP -.PP -Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 46 of file moSteadyFitSolContinue.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3 index 0b0cf7c88..6ed6f5847 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP" .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor with less parameters. \fP" .ti -1c @@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIStop criterion. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIFull evaluation function. \fP" .in -1c @@ -67,7 +67,7 @@ Generic algorithm that describes a tabu search. Definition at line 29 of file moTS.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor of a \fBmoTS\fP specifying all the boxes. .PP @@ -93,7 +93,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. .PP Definition at line 58 of file moTS.h. -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor with less parameters. .PP @@ -113,7 +113,7 @@ The explorer is given in the parameters. Definition at line 71 of file moTS.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP Function which launchs the Tabu Search. .PP @@ -130,8 +130,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 85 of file moTS.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index 369dbe48d..2d9a2ef72 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -99,7 +99,7 @@ Definition at line 49 of file moTSMoveLoopExpl.h. References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list. .SH "Member Function Documentation" .PP -.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" +.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" .PP Procedure which lauches the exploration. .PP @@ -113,8 +113,6 @@ The exploration continues while the chosen move is not in the tabu list or the a .RE .PP -.PP -Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 69 of file moTSMoveLoopExpl.h. .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 index d55b13514..ead083d34 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 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "14 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP. -.PP Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .PP .SS "Public Types" diff --git a/trunk/paradiseo-mo/doc/mo.doxyfile b/trunk/paradiseo-mo/doc/mo.doxyfile deleted file mode 100644 index b4ab87d46..000000000 --- a/trunk/paradiseo-mo/doc/mo.doxyfile +++ /dev/null @@ -1,1268 +0,0 @@ -# Doxyfile 1.5.2 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of -# possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = PARADISEO-MO - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.1 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. - -JAVADOC_AUTOBRIEF = YES - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = YES - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = NO - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = YES - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../src/ - -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. -# See http://www.gnu.org/software/libiconv for the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py - -FILE_PATTERNS = *.cpp \ - *.h - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, -# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = YES - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 3 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = mo - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - -GENERATE_TREEVIEW = YES - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = YES - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = YES - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=http://eodev.sourceforge.net/eo/doc/html - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = mo.doxytag - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to -# be found in the default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen will always -# show the root nodes and its direct children regardless of this setting. - -DOT_GRAPH_MAX_NODES = 50 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = YES