From 1d940716932e457bb99e0f04c97c97cd41c21079 Mon Sep 17 00:00:00 2001 From: jboisson Date: Fri, 3 Aug 2007 14:28:06 +0000 Subject: [PATCH] In the TSP, the fitness has to be minimized ... with all the needed modification (for example, moSA.h) git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@587 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/doc/html/annotated.html | 2 +- .../doc/html/class_empty_selection.html | 2 +- trunk/paradiseo-mo/doc/html/classes.html | 2 +- .../doc/html/classmo_algo-members.html | 2 +- trunk/paradiseo-mo/doc/html/classmo_algo.html | 2 +- .../doc/html/classmo_aspir_crit-members.html | 2 +- .../doc/html/classmo_aspir_crit.html | 2 +- .../classmo_best_impr_select-members.html | 2 +- .../doc/html/classmo_best_impr_select.html | 8 +- .../classmo_cooling_schedule-members.html | 2 +- .../doc/html/classmo_cooling_schedule.html | 2 +- ..._exponential_cooling_schedule-members.html | 2 +- .../classmo_exponential_cooling_schedule.html | 6 +- .../classmo_first_impr_select-members.html | 2 +- .../doc/html/classmo_first_impr_select.html | 2 +- .../classmo_fit_sol_continue-members.html | 5 +- .../doc/html/classmo_fit_sol_continue.html | 57 ++------ .../classmo_gen_sol_continue-members.html | 2 +- .../doc/html/classmo_gen_sol_continue.html | 38 ++++- .../doc/html/classmo_h_c-members.html | 2 +- trunk/paradiseo-mo/doc/html/classmo_h_c.html | 2 +- .../classmo_h_c_move_loop_expl-members.html | 2 +- .../doc/html/classmo_h_c_move_loop_expl.html | 2 +- ...ssmo_impr_best_fit_aspir_crit-members.html | 2 +- .../classmo_impr_best_fit_aspir_crit.html | 2 +- .../classmo_it_rand_next_move-members.html | 2 +- .../doc/html/classmo_it_rand_next_move.html | 2 +- .../html/classmo_l_s_check_point-members.html | 2 +- .../doc/html/classmo_l_s_check_point.html | 2 +- ...assmo_linear_cooling_schedule-members.html | 2 +- .../html/classmo_linear_cooling_schedule.html | 2 +- .../doc/html/classmo_move-members.html | 2 +- trunk/paradiseo-mo/doc/html/classmo_move.html | 2 +- .../doc/html/classmo_move_expl-members.html | 2 +- .../doc/html/classmo_move_expl.html | 2 +- .../html/classmo_move_incr_eval-members.html | 2 +- .../doc/html/classmo_move_incr_eval.html | 2 +- .../doc/html/classmo_move_init-members.html | 2 +- .../doc/html/classmo_move_init.html | 2 +- .../html/classmo_move_loop_expl-members.html | 2 +- .../doc/html/classmo_move_loop_expl.html | 2 +- .../doc/html/classmo_move_select-members.html | 2 +- .../doc/html/classmo_move_select.html | 2 +- .../doc/html/classmo_next_move-members.html | 2 +- .../doc/html/classmo_next_move.html | 2 +- .../html/classmo_no_aspir_crit-members.html | 2 +- .../doc/html/classmo_no_aspir_crit.html | 2 +- ...ssmo_no_fit_impr_sol_continue-members.html | 5 +- .../classmo_no_fit_impr_sol_continue.html | 57 ++++---- .../classmo_rand_impr_select-members.html | 2 +- .../doc/html/classmo_rand_impr_select.html | 2 +- .../doc/html/classmo_rand_move-members.html | 2 +- .../doc/html/classmo_rand_move.html | 2 +- .../doc/html/classmo_s_a-members.html | 2 +- trunk/paradiseo-mo/doc/html/classmo_s_a.html | 6 +- ...classmo_simple_move_tabu_list-members.html | 2 +- .../html/classmo_simple_move_tabu_list.html | 2 +- ...smo_simple_solution_tabu_list-members.html | 2 +- .../classmo_simple_solution_tabu_list.html | 2 +- .../html/classmo_sol_continue-members.html | 2 +- .../doc/html/classmo_sol_continue.html | 2 +- ...assmo_steady_fit_sol_continue-members.html | 5 +- .../html/classmo_steady_fit_sol_continue.html | 50 +++---- .../doc/html/classmo_t_s-members.html | 2 +- trunk/paradiseo-mo/doc/html/classmo_t_s.html | 4 +- .../classmo_t_s_move_loop_expl-members.html | 2 +- .../doc/html/classmo_t_s_move_loop_expl.html | 2 +- .../doc/html/classmo_tabu_list-members.html | 2 +- .../doc/html/classmo_tabu_list.html | 2 +- trunk/paradiseo-mo/doc/html/files.html | 2 +- trunk/paradiseo-mo/doc/html/functions.html | 20 ++- .../paradiseo-mo/doc/html/functions_func.html | 8 +- .../paradiseo-mo/doc/html/functions_type.html | 2 +- .../paradiseo-mo/doc/html/functions_vars.html | 14 +- trunk/paradiseo-mo/doc/html/hierarchy.html | 2 +- .../doc/html/index_8h-source.html | 2 +- trunk/paradiseo-mo/doc/html/main.html | 2 +- trunk/paradiseo-mo/doc/html/mo_8h-source.html | 2 +- .../doc/html/mo_algo_8h-source.html | 2 +- .../doc/html/mo_aspir_crit_8h-source.html | 2 +- .../html/mo_best_impr_select_8h-source.html | 66 ++++----- .../html/mo_cooling_schedule_8h-source.html | 2 +- ...xponential_cooling_schedule_8h-source.html | 4 +- .../html/mo_first_impr_select_8h-source.html | 2 +- .../html/mo_fit_sol_continue_8h-source.html | 55 ++++--- .../html/mo_gen_sol_continue_8h-source.html | 25 ++-- .../doc/html/mo_h_c_8h-source.html | 2 +- .../html/mo_h_c_move_loop_expl_8h-source.html | 40 +++--- ...mo_impr_best_fit_aspir_crit_8h-source.html | 2 +- .../html/mo_it_rand_next_move_8h-source.html | 2 +- .../html/mo_l_s_check_point_8h-source.html | 2 +- .../mo_linear_cooling_schedule_8h-source.html | 2 +- .../doc/html/mo_move_8h-source.html | 2 +- .../doc/html/mo_move_expl_8h-source.html | 2 +- .../doc/html/mo_move_incr_eval_8h-source.html | 2 +- .../doc/html/mo_move_init_8h-source.html | 2 +- .../doc/html/mo_move_loop_expl_8h-source.html | 2 +- .../doc/html/mo_move_select_8h-source.html | 2 +- .../doc/html/mo_next_move_8h-source.html | 2 +- .../doc/html/mo_no_aspir_crit_8h-source.html | 2 +- ...mo_no_fit_impr_sol_continue_8h-source.html | 99 +++++++------ .../html/mo_rand_impr_select_8h-source.html | 2 +- .../doc/html/mo_rand_move_8h-source.html | 2 +- .../doc/html/mo_s_a_8h-source.html | 134 ++++++++--------- .../mo_simple_move_tabu_list_8h-source.html | 2 +- ...o_simple_solution_tabu_list_8h-source.html | 2 +- .../doc/html/mo_sol_continue_8h-source.html | 2 +- .../mo_steady_fit_sol_continue_8h-source.html | 135 +++++++++--------- .../doc/html/mo_t_s_8h-source.html | 69 +++++---- .../html/mo_t_s_move_loop_expl_8h-source.html | 2 +- .../doc/html/mo_tabu_list_8h-source.html | 2 +- trunk/paradiseo-mo/doc/html/search.idx | Bin 357929 -> 355716 bytes trunk/paradiseo-mo/doc/html/search.php | 2 +- .../doc/latex/classmo_best_impr_select.tex | 2 +- .../classmo_exponential_cooling_schedule.tex | 4 +- .../doc/latex/classmo_fit_sol_continue.tex | 30 +--- .../doc/latex/classmo_gen_sol_continue.tex | 18 ++- .../classmo_no_fit_impr_sol_continue.tex | 34 ++--- trunk/paradiseo-mo/doc/latex/classmo_s_a.tex | 4 +- .../latex/classmo_steady_fit_sol_continue.tex | 34 ++--- trunk/paradiseo-mo/doc/latex/doxygen.sty | 4 +- trunk/paradiseo-mo/doc/latex/refman.tex | 2 +- .../doc/man/man3/EmptySelection.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moAlgo.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 | 2 +- .../doc/man/man3/moBestImprSelect.3 | 4 +- .../doc/man/man3/moCoolingSchedule.3 | 2 +- .../man/man3/moExponentialCoolingSchedule.3 | 6 +- .../doc/man/man3/moFirstImprSelect.3 | 2 +- .../doc/man/man3/moFitSolContinue.3 | 29 +--- .../doc/man/man3/moGenSolContinue.3 | 13 +- trunk/paradiseo-mo/doc/man/man3/moHC.3 | 2 +- .../doc/man/man3/moHCMoveLoopExpl.3 | 2 +- .../doc/man/man3/moImprBestFitAspirCrit.3 | 2 +- .../doc/man/man3/moItRandNextMove.3 | 2 +- .../doc/man/man3/moLSCheckPoint.3 | 2 +- .../doc/man/man3/moLinearCoolingSchedule.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moMove.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 | 2 +- .../doc/man/man3/moMoveIncrEval.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 | 2 +- .../doc/man/man3/moMoveLoopExpl.3 | 2 +- .../paradiseo-mo/doc/man/man3/moMoveSelect.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moNextMove.3 | 2 +- .../paradiseo-mo/doc/man/man3/moNoAspirCrit.3 | 2 +- .../doc/man/man3/moNoFitImprSolContinue.3 | 32 ++--- .../doc/man/man3/moRandImprSelect.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moRandMove.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moSA.3 | 6 +- .../doc/man/man3/moSimpleMoveTabuList.3 | 2 +- .../doc/man/man3/moSimpleSolutionTabuList.3 | 2 +- .../paradiseo-mo/doc/man/man3/moSolContinue.3 | 2 +- .../doc/man/man3/moSteadyFitSolContinue.3 | 32 ++--- trunk/paradiseo-mo/doc/man/man3/moTS.3 | 2 +- .../doc/man/man3/moTSMoveLoopExpl.3 | 2 +- trunk/paradiseo-mo/doc/man/man3/moTabuList.3 | 2 +- trunk/paradiseo-mo/src/moBestImprSelect.h | 6 +- .../src/moExponentialCoolingSchedule.h | 2 +- trunk/paradiseo-mo/src/moFitSolContinue.h | 16 +-- trunk/paradiseo-mo/src/moGenSolContinue.h | 7 +- trunk/paradiseo-mo/src/moHCMoveLoopExpl.h | 38 ++--- .../paradiseo-mo/src/moNoFitImprSolContinue.h | 24 ++-- trunk/paradiseo-mo/src/moSA.h | 42 +++--- .../paradiseo-mo/src/moSteadyFitSolContinue.h | 24 ++-- trunk/paradiseo-mo/src/moTS.h | 7 +- .../tutorial/Lesson2/tabu_search.cpp | 8 +- .../tutorial/examples/tsp/route.h | 7 +- .../tutorial/examples/tsp/route_eval.cpp | 4 +- .../examples/tsp/two_opt_incr_eval.cpp | 10 +- .../tutorial/examples/tsp/two_opt_incr_eval.h | 2 +- 170 files changed, 752 insertions(+), 841 deletions(-) diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index fff8e9f86..e45a6f9bd 100644 --- a/trunk/paradiseo-mo/doc/html/annotated.html +++ b/trunk/paradiseo-mo/doc/html/annotated.html @@ -66,7 +66,7 @@ moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/class_empty_selection.html b/trunk/paradiseo-mo/doc/html/class_empty_selection.html index 74cf29a29..7065bb19d 100644 --- a/trunk/paradiseo-mo/doc/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/doc/html/class_empty_selection.html @@ -47,7 +47,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classes.html b/trunk/paradiseo-mo/doc/html/classes.html index b6dc194f6..b19aac8d6 100644 --- a/trunk/paradiseo-mo/doc/html/classes.html +++ b/trunk/paradiseo-mo/doc/html/classes.html @@ -47,7 +47,7 @@ moMoveLoopExpl   moTabuList   moGenSolContinue   moMoveSelect   moTS   
  H  
  N  
moTSMoveLoopExpl   

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

-


Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo-members.html b/trunk/paradiseo-mo/doc/html/classmo_algo-members.html index 811e5f9aa..6bfb709f0 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo-members.html @@ -42,7 +42,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< EOT &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo.html b/trunk/paradiseo-mo/doc/html/classmo_algo.html index 5d961b208..098c8d8fc 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo.html @@ -58,7 +58,7 @@ Description of an 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 a6397778e..2ad96018a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html @@ -36,7 +36,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html index ac0eac118..fa04a6ced 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html @@ -88,7 +88,7 @@ Implemented in moAspirCrit.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html index 38e2a7783..adfc719a7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html @@ -41,7 +41,7 @@ update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 5852c5ba4..58db4efa8 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html @@ -129,7 +129,7 @@ Implements 47 of file moBestImprSelect.h.

-References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. +References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.

@@ -177,14 +177,14 @@ Procedure which saved the best move and fitness.

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

-Definition at line 68 of file moBestImprSelect.h. +Definition at line 65 of file moBestImprSelect.h.

-References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. +References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html index 8a998bc1f..6c8e197da 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html @@ -35,7 +35,7 @@ operator()(double &)=0eoUF< double &, bool > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< double &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html index f91ce528f..13739b125 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html @@ -55,7 +55,7 @@ It is only a description... An object that herits from this class is needed to b

Definition at line 22 of file moCoolingSchedule.h.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html index a5dc96485..f61092344 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html @@ -38,7 +38,7 @@ thresholdmoExponentialCoolingSchedule [private] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< double &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 94617e6a2..99242f094 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html @@ -47,7 +47,7 @@

Public Member Functions

 moExponentialCoolingSchedule (double __threshold, double __ratio) - Simple constructor.
+ Basic constructor.
bool operator() (double &__temp)  Function which proceeds to the cooling.
@@ -95,7 +95,7 @@ Definition at line

-Simple constructor. +Basic constructor.

Parameters:
@@ -146,7 +146,7 @@ References moExponentialCoolingSchedule.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html index 9508fce57..3f220f626 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html @@ -43,7 +43,7 @@
-
validmoFirstImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 f239b8a3c..b842004a2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html @@ -215,7 +215,7 @@ References moFir


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html index f04395483..a40fc6daa 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html @@ -35,12 +35,11 @@ fitnessmoFitSolContinue< EOT > [private] functor_category()eoUF< const EOT &, bool > [static] init()moFitSolContinue< EOT > [inline, virtual] - minimizationmoFitSolContinue< EOT > [private] - moFitSolContinue(Fitness __fitness, bool __minimization=true)moFitSolContinue< EOT > [inline] + 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 280cb3e14..b7292dd3d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html @@ -50,9 +50,9 @@ typedef EOT::Fitness  Alias for the fitness.

Public Member Functions

moFitSolContinue (Fitness __fitness, bool __minimization=true) + moFitSolContinue (Fitness __fitness) - Basic constructor.
+ Basic constructor.
bool operator() (const EOT &__sol)  Function that activates the stopping criterion.
@@ -65,9 +65,6 @@ void Fitness fitness  Fitness target.
-bool minimization - - Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value.

Detailed Description

template<class EOT>
@@ -80,7 +77,7 @@ The stop criterion corresponds to a fitness threshold gained.

Definition at line 21 of file moFitSolContinue.h.


Constructor & Destructor Documentation

- +
@@ -90,18 +87,9 @@ template<class EOT>
moFitSolContinue< EOT >::moFitSolContinue ( Fitness  - __fitness, - - - - - bool  - __minimization = true  - - - - ) - [inline] + __fitness +  )  + [inline]
@@ -113,12 +101,11 @@ Basic constructor.
Parameters:
-
__fitness The fitness to reach.
__minimization Indicate if the the aim is to maximize or minimize the fitness.

-Definition at line 34 of file moFitSolContinue.h. +Definition at line 33 of file moFitSolContinue.h.


Member Function Documentation

@@ -154,38 +141,14 @@ Indicates if the fitness threshold has not yet been reached.

Implements eoUF< const EOT &, bool >.

-Definition at line 44 of file moFitSolContinue.h. +Definition at line 43 of file moFitSolContinue.h.

-References moFitSolContinue< EOT >::fitness, and moFitSolContinue< EOT >::minimization. - -

-


Member Data Documentation

- -
-
-
-template<class EOT>
- - - - -
bool moFitSolContinue< EOT >::minimization [private]
-
-
- -

-Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. -

-It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). -

-Definition at line 72 of file moFitSolContinue.h. -

-Referenced by moFitSolContinue< EOT >::operator()(). +References moFitSolContinue< EOT >::fitness.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html index 78bd65b3a..83c40881f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html @@ -39,7 +39,7 @@ operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< const EOT &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 fe6c9e309..ebe71c9e6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html @@ -51,10 +51,9 @@ bool operator() (const EOT &__sol)  Function that activates the stop criterion.
- -void init () +void init () - Procedure which allows to initialise all the stuff needed.
+ Procedure which allows to initialise all the stuff needed.

Private Attributes

unsigned int maxNumGen @@ -142,12 +141,41 @@ Implements 42 of file moGenSolContinue.h.

-References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. +References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. + +

+ +

+
+
+template<class EOT>
+ + + + + + + + +
void moGenSolContinue< EOT >::init (  )  [inline, virtual]
+
+
+ +

+Procedure which allows to initialise all the stuff needed. +

+It can be also used to reinitialize the counter all the needed things. +

+Implements moSolContinue< EOT >. +

+Definition at line 51 of file moGenSolContinue.h. +

+References moGenSolContinue< EOT >::numGen.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html index abcc62a08..619b1fe7d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html @@ -48,7 +48,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< M::EOType &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.html b/trunk/paradiseo-mo/doc/html/classmo_h_c.html index 5a3437b64..ab854cc0c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c.html @@ -231,7 +231,7 @@ References moHC< M >::fu


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html index a38e0ac17..9123ff3b8 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html @@ -42,7 +42,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 bde523ce5..afd3e2811 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 @@ -193,7 +193,7 @@ References moHC


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html index c2888ce97..bab418eef 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html @@ -40,7 +40,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 ff36484e2..a9fdc9eff 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 @@ -131,7 +131,7 @@ References moImprBestFitAspirCrit.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 06b561c01..c1dc347ed 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 @@ -40,7 +40,7 @@ rand_movemoItRandNextMove< M > [private] ~eoBF()eoBF< M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 49ae5ac08..3a79c6a56 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 @@ -173,7 +173,7 @@ References moItR


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 8aedc1b07..16dc03085 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 @@ -38,7 +38,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 e14d38500..49f92f664 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 @@ -148,7 +148,7 @@ References moLSChe


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 e400ab354..1175b4931 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 @@ -38,7 +38,7 @@ thresholdmoLinearCoolingSchedule [private] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< double &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 ff7146540..26cdaa104 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html @@ -146,7 +146,7 @@ References


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_move-members.html index e98d4f797..c66cd769d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move-members.html @@ -36,7 +36,7 @@ operator()(EOT &)=0eoUF< EOT &, void > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< EOT &, void > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move.html b/trunk/paradiseo-mo/doc/html/classmo_move.html index 1d6dd6933..768867cd2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move.html @@ -61,7 +61,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html index c0ddc9294..08eee6d40 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html @@ -35,7 +35,7 @@ operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html index 39322c469..56ebb98a7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html @@ -59,7 +59,7 @@ Only a description...See Definition at line 21 of file moMoveExpl.h.
The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html index 45ac35db4..4b64bb2db 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html @@ -35,7 +35,7 @@ operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, M::EOType::Fitness > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType &, M::EOType::Fitness > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 7c6ed81ec..d4c7d0c26 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html @@ -56,7 +56,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html index 3aa02f9cc..88a34763b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html @@ -35,7 +35,7 @@ operator()(M &, const M::EOType &)=0eoBF< M &, const M::EOType &, void > [pure virtual] ~eoBF()eoBF< M &, const M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init.html b/trunk/paradiseo-mo/doc/html/classmo_move_init.html index 1fe5f24f0..72982cb4a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init.html @@ -56,7 +56,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html index 4a48830c0..4f0d73880 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html @@ -35,7 +35,7 @@ operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 a55940e14..fba9932fe 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html @@ -59,7 +59,7 @@ Only a description... Definition at line 21 of file moMoveLoopExpl.h.
The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 76099cb2a..79ca9229a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html @@ -38,7 +38,7 @@ update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.html b/trunk/paradiseo-mo/doc/html/classmo_move_select.html index 22965e3a3..d85ac4ceb 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select.html @@ -146,7 +146,7 @@ Implemented in moMoveSelect.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html index 9faa4bcb7..3debf12a7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html @@ -35,7 +35,7 @@ operator()(M &, const M::EOType &)=0eoBF< M &, const M::EOType &, bool > [pure virtual] ~eoBF()eoBF< M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_next_move.html index 96e46550d..4ef43b877 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move.html @@ -57,7 +57,7 @@ Useful for the explorer (for 22 of file moNextMove.h.
The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html index 11860d2d6..4963fcad7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html @@ -37,7 +37,7 @@ 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 9efc764b6..68b0d1167 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html @@ -135,7 +135,7 @@ Definition at line 4


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html index fa0ffec0c..608a811a9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html @@ -38,12 +38,11 @@ functor_category()eoUF< const EOT &, bool > [static] init()moNoFitImprSolContinue< EOT > [inline, virtual] maxNumberOfIterationsWithoutImprovementmoNoFitImprSolContinue< EOT > [private] - minimizationmoNoFitImprSolContinue< EOT > [private] - moNoFitImprSolContinue(unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true)moNoFitImprSolContinue< EOT > [inline] + 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 a4a4c0a7f..8934bf886 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 @@ -50,16 +50,15 @@ typedef EOT::Fitness  Alias for the fitness.

Public Member Functions

moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true) + moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement) - Basic constructor.
+ Basic constructor.
bool operator() (const EOT &__sol)  Function that activates the stopping criterion.
- -void init () +void init () - Procedure which allows to initialise all the stuff needed.
+ Procedure which allows to initialise all the stuff needed.

Private Attributes

unsigned int maxNumberOfIterationsWithoutImprovement @@ -73,9 +72,6 @@ bool Fitness fitness  Current Fitness.
-bool minimization - - Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value.
unsigned int counter @@ -92,7 +88,7 @@ The stop criterion corresponds to a maximum number of iterations without improev

Definition at line 21 of file moNoFitImprSolContinue.h.


Constructor & Destructor Documentation

- +
@@ -102,18 +98,9 @@ template<class EOT>
moNoFitImprSolContinue< EOT >::moNoFitImprSolContinue ( unsigned int  - __maxNumberOfIterationWithoutImprovement, - - - - - bool  - __minimization = true  - - - - ) - [inline] + __maxNumberOfIterationWithoutImprovement +  )  + [inline]
@@ -125,12 +112,11 @@ Basic constructor.
Parameters:
-
__maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop.
__minimization Indicate if the the aim is to maximize or minimize the fitness.

-Definition at line 34 of file moNoFitImprSolContinue.h. +Definition at line 33 of file moNoFitImprSolContinue.h.


Member Function Documentation

@@ -165,38 +151,43 @@ Indicates if the fitness has not been improved since a given number of iteration

Implements eoUF< const EOT &, bool >.

-Definition at line 45 of file moNoFitImprSolContinue.h. +Definition at line 43 of file moNoFitImprSolContinue.h.

-References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement, and moNoFitImprSolContinue< EOT >::minimization. +References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement.

-


Member Data Documentation

- +
template<class EOT>
- + + + + +
bool moNoFitImprSolContinue< EOT >::minimization [private] void moNoFitImprSolContinue< EOT >::init (  )  [inline, virtual]

-Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. +Procedure which allows to initialise all the stuff needed.

-It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +It can be also used to reinitialize the counter all the needed things.

-Definition at line 96 of file moNoFitImprSolContinue.h. +Implements moSolContinue< EOT >.

-Referenced by moNoFitImprSolContinue< EOT >::operator()(). +Definition at line 77 of file moNoFitImprSolContinue.h. +

+References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< EOT >::firstFitnessSaved.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html index 667fb9173..a3733bbe0 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html @@ -41,7 +41,7 @@ vect_better_movesmoRandImprSelect< M > [private] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 469722d83..bb59ab16a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html @@ -220,7 +220,7 @@ References moRandImprSelect.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html index bbf81e190..ad3650a04 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html @@ -35,7 +35,7 @@ operator()(M &)=0eoUF< M &, void > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< M &, void > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html index f4d941d5a..d2e3c4afb 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html @@ -56,7 +56,7 @@ Only a description... An object that herits from this class needs to be designed

Definition at line 21 of file moRandMove.h.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 fb053b216..27a0ae6e9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html @@ -51,7 +51,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< M::EOType &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.html b/trunk/paradiseo-mo/doc/html/classmo_s_a.html index a66b1dbc7..9a13fad6d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a.html @@ -166,7 +166,7 @@ All the boxes used by a SA need to be given.

-Definition at line 58 of file moSA.h. +Definition at line 52 of file moSA.h.


Member Function Documentation

@@ -202,14 +202,14 @@ As a moTS or

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

-Definition at line 80 of file moSA.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().


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html index c91b644c3..cf018c979 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html @@ -44,7 +44,7 @@ update()moSimpleMoveTabuList< M > [inline, virtual] ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 3cfa893ba..013d40128 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 @@ -276,7 +276,7 @@ Referenced by moSimpleMoveTabuList.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html index 40243afd0..42a8e1874 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html @@ -44,7 +44,7 @@ update()moSimpleSolutionTabuList< M > [inline, virtual] ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 e2055cb3b..bacb5666d 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 @@ -309,7 +309,7 @@ Referenced by moSimpleSolutionTabuList.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 f967adc0f..8366b0b4e 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html @@ -36,7 +36,7 @@ operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< const EOT &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html index d48271ce8..70a5d414e 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html @@ -90,7 +90,7 @@ Implemented in moSolContinue.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 213c2200a..4110cc466 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 @@ -40,12 +40,11 @@ maxNumberOfIterationsmoSteadyFitSolContinue< EOT > [private] maxNumberOfIterationsReachedmoSteadyFitSolContinue< EOT > [private] maxNumberOfIterationsWithoutImprovementmoSteadyFitSolContinue< EOT > [private] - minimizationmoSteadyFitSolContinue< EOT > [private] - moSteadyFitSolContinue(unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true)moSteadyFitSolContinue< EOT > [inline] + 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 Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 5797b7026..fef86b104 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 @@ -50,16 +50,15 @@ typedef EOT::Fitness  Alias for the fitness.

Public Member Functions

moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true) + moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement) - Basic constructor.
+ Basic constructor.
bool operator() (const EOT &__sol)  Function that activates the stopping criterion.
- -void init () +void init () - Procedure which allows to initialise the stuff needed.
+ Procedure which allows to initialise the stuff needed.

Private Attributes

unsigned int maxNumberOfIterations @@ -81,9 +80,6 @@ bool Fitness fitness  Current Fitness.
-bool minimization - - Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value.
unsigned int counter @@ -100,7 +96,7 @@ The stop criterion corresponds to a maximum number of iterations without improve

Definition at line 21 of file moSteadyFitSolContinue.h.


Constructor & Destructor Documentation

- +
@@ -116,13 +112,7 @@ template<class EOT>
unsigned int  - __maxNumberOfIterationWithoutImprovement, - - - - - bool  - __minimization = true  + __maxNumberOfIterationWithoutImprovement  @@ -140,12 +130,11 @@ Basic constructor. -
__maxNumberOfIterations The number of iterations to reach before looking for the fitness.
__maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop.
__minimization Indicate if the the aim is to maximize or minimize the fitness.

-Definition at line 35 of file moSteadyFitSolContinue.h. +Definition at line 34 of file moSteadyFitSolContinue.h.


Member Function Documentation

@@ -181,38 +170,43 @@ Indicates if the fitness has not been improved since a number of iterations (aft

Implements eoUF< const EOT &, bool >.

-Definition at line 47 of file moSteadyFitSolContinue.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, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement, and moSteadyFitSolContinue< EOT >::minimization. +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement.

-


Member Data Documentation

- +
template<class EOT>
- + + + + +
bool moSteadyFitSolContinue< EOT >::minimization [private] void moSteadyFitSolContinue< EOT >::init (  )  [inline, virtual]

-Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. +Procedure which allows to initialise the stuff needed.

-It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +It can be also used to reinitialize the counter all the needed things.

-Definition at line 114 of file moSteadyFitSolContinue.h. +Implements moSolContinue< EOT >.

-Referenced by moSteadyFitSolContinue< EOT >::operator()(). +Definition at line 90 of file moSteadyFitSolContinue.h. +

+References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached.


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 4b6ff210e..15d6fad59 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html @@ -49,7 +49,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< M::EOType &, bool > [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.html b/trunk/paradiseo-mo/doc/html/classmo_t_s.html index 6b9c70999..a4a9dc19c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s.html @@ -251,12 +251,12 @@ Implements 85 of file moTS.h.

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


The documentation for this class was generated from the following file: -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 6a4e5ada4..c8eaef063 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 @@ -44,7 +44,7 @@ tabu_listmoTSMoveLoopExpl< M > [private] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 2dd8af1ab..80ed49242 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 @@ -211,7 +211,7 @@ References moTS


The documentation for this class was generated from the following file:
-
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
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 be7f961f7..8f2ffde88 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html @@ -39,7 +39,7 @@ update()=0moTabuList< M > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html index 11119a1ca..334bd05c3 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html @@ -166,7 +166,7 @@ Implemented in moTabuList.h -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/files.html b/trunk/paradiseo-mo/doc/html/files.html index 0ab214cd0..2243a0200 100644 --- a/trunk/paradiseo-mo/doc/html/files.html +++ b/trunk/paradiseo-mo/doc/html/files.html @@ -59,7 +59,7 @@ moTS.h [code] moTSMoveLoopExpl.h [code] -
Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/functions.html b/trunk/paradiseo-mo/doc/html/functions.html index d37863f54..9d7edaa47 100644 --- a/trunk/paradiseo-mo/doc/html/functions.html +++ b/trunk/paradiseo-mo/doc/html/functions.html @@ -148,7 +148,7 @@ Here is a list of all documented class members with links to the class documenta
  • func : moLSCheckPoint< M >
  • moFitSolContinue() -: moFitSolContinue< EOT > +: moFitSolContinue< EOT >

    - g -

    - n -

    - t -

    • moTS() @@ -316,7 +312,7 @@ Here is a list of all documented class members with links to the class documenta
    • vect_better_moves : moRandImprSelect< M >
    -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions_func.html b/trunk/paradiseo-mo/doc/html/functions_func.html index 4ada27ea4..9c076e3cf 100644 --- a/trunk/paradiseo-mo/doc/html/functions_func.html +++ b/trunk/paradiseo-mo/doc/html/functions_func.html @@ -72,7 +72,7 @@

    - f -

    - g -

    • moGenSolContinue() @@ -112,7 +112,7 @@

    - n -

    - o -

    - t -

    -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions_type.html b/trunk/paradiseo-mo/doc/html/functions_type.html index fbede62db..02d869b6c 100644 --- a/trunk/paradiseo-mo/doc/html/functions_type.html +++ b/trunk/paradiseo-mo/doc/html/functions_type.html @@ -68,7 +68,7 @@ , moFitSolContinue< EOT > , moFirstImprSelect< M > -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions_vars.html b/trunk/paradiseo-mo/doc/html/functions_vars.html index 28600ce1a..0247d282d 100644 --- a/trunk/paradiseo-mo/doc/html/functions_vars.html +++ b/trunk/paradiseo-mo/doc/html/functions_vars.html @@ -120,17 +120,13 @@
  • maxNumberOfIterationsReached : moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsWithoutImprovement -: moNoFitImprSolContinue< EOT > -, moSteadyFitSolContinue< EOT > +: moSteadyFitSolContinue< EOT > +, moNoFitImprSolContinue< EOT >
  • maxNumGen : moGenSolContinue< EOT >
  • maxSize -: moSimpleMoveTabuList< M > -, moSimpleSolutionTabuList< M > -
  • minimization -: moNoFitImprSolContinue< EOT > -, moSteadyFitSolContinue< EOT > -, moFitSolContinue< EOT > +: moSimpleSolutionTabuList< M > +, moSimpleMoveTabuList< M >

    - n -

    -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/hierarchy.html b/trunk/paradiseo-mo/doc/html/hierarchy.html index 89523cc62..c582875fe 100644 --- a/trunk/paradiseo-mo/doc/html/hierarchy.html +++ b/trunk/paradiseo-mo/doc/html/hierarchy.html @@ -142,7 +142,7 @@ [external]
  • eoMonOp< M::EOType > [external] -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/index_8h-source.html b/trunk/paradiseo-mo/doc/html/index_8h-source.html index 613cb625d..70dc0fdf4 100644 --- a/trunk/paradiseo-mo/doc/html/index_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/index_8h-source.html @@ -28,7 +28,7 @@ 00024 // c-file-style: "Stroustrup" 00025 // fill-column: 80 00026 // End: -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/main.html b/trunk/paradiseo-mo/doc/html/main.html index 8b988c997..4c44f39e9 100644 --- a/trunk/paradiseo-mo/doc/html/main.html +++ b/trunk/paradiseo-mo/doc/html/main.html @@ -33,7 +33,7 @@ tutorial install The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.

    design

    -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_8h-source.html index 45195fa8e..147b129cc 100644 --- a/trunk/paradiseo-mo/doc/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_8h-source.html @@ -71,7 +71,7 @@ 00047 #include "moTSMoveLoopExpl.h" 00048 00049 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 0b8335ab1..cd42f26b4 100644 --- a/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html @@ -45,7 +45,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 f0911d491..44a851842 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 @@ -52,7 +52,7 @@ 00035 }; 00036 00037 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 64336b2aa..ed1b326c3 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 @@ -56,44 +56,40 @@ 00039 00047 bool update (const M & __move, const Fitness & __fit) 00048 { -00049 -00050 if (first_time || __fit > best_fit) -00051 { -00052 -00053 best_fit = __fit; -00054 best_move = __move; -00055 -00056 first_time = false; -00057 } +00049 if ((first_time) || (__fit > best_fit)) +00050 { +00051 best_fit = __fit; +00052 best_move = __move; +00053 +00054 first_time = false; +00055 } +00056 return true; +00057 } 00058 -00059 return true; -00060 } -00061 -00063 -00068 void operator () (M & __move, Fitness & __fit) throw (EmptySelection) -00069 { -00070 -00071 if (!first_time) -00072 { -00073 __move = best_move; -00074 __fit = best_fit; -00075 } -00076 else -00077 throw EmptySelection (); -00078 } -00079 -00080 private: +00060 +00065 void operator () (M & __move, Fitness & __fit) throw (EmptySelection) +00066 { +00067 +00068 if (!first_time) +00069 { +00070 __move = best_move; +00071 __fit = best_fit; +00072 } +00073 else +00074 throw EmptySelection (); +00075 } +00076 +00077 private: +00078 +00080 bool first_time; 00081 -00083 bool first_time; +00083 M best_move; 00084 -00086 M best_move; -00087 -00089 Fitness best_fit; -00090 -00091 }; -00092 -00093 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +00086 Fitness best_fit; +00087 }; +00088 +00089 #endif +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 ab40f360e..3a7d1fc81 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 @@ -45,7 +45,7 @@ 00025 }; 00026 00027 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 8a99627f8..2fa330e6c 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 @@ -44,7 +44,7 @@ 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 @@ -61,7 +61,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 6bb2c5376..12e19ea56 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 @@ -100,7 +100,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 79aaa6977..6fed9cc2b 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 @@ -47,37 +47,30 @@ 00027 typedef typename EOT::Fitness Fitness; 00028 00030 -00034 moFitSolContinue (Fitness __fitness, bool __minimization=true): fitness (__fitness), minimization(__minimization) -00035 {} -00036 -00038 -00044 bool operator () (const EOT & __sol) -00045 { -00046 if(__sol.invalid()) -00047 { -00048 return true; -00049 } -00050 -00051 if(minimization) -00052 { -00053 return __sol.fitness()>fitness; -00054 } -00055 return __sol.fitness()<=fitness; -00056 } -00057 -00059 void init () -00060 {} -00061 -00062 private: -00063 -00065 Fitness fitness; -00066 -00068 -00072 bool minimization; -00073 }; -00074 -00075 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +00033 moFitSolContinue (Fitness __fitness): fitness (__fitness) +00034 {} +00035 +00037 +00043 bool operator () (const EOT & __sol) +00044 { +00045 if(__sol.invalid()) +00046 { +00047 return true; +00048 } +00049 +00050 return __sol.fitness() < fitness; +00051 } +00052 +00054 void init () +00055 {} +00056 +00057 private: +00058 +00060 Fitness fitness; +00061 }; +00062 +00063 #endif +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 9f09cfb6a..f9c9b0253 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 @@ -54,18 +54,21 @@ 00044 return (++numGen < maxNumGen); 00045 } 00046 -00048 void init () -00049 {} -00050 -00051 private: -00052 -00054 unsigned int maxNumGen; +00048 +00051 void init () +00052 { +00053 numGen=0; +00054 } 00055 -00057 unsigned int numGen; -00058 }; -00059 -00060 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +00056 private: +00057 +00059 unsigned int maxNumGen; +00060 +00062 unsigned int numGen; +00063 }; +00064 +00065 #endif +
    Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 9564adcfc..59642afb1 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 @@ -126,7 +126,7 @@ 00131 }; 00132 00133 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 e1cfe018a..551847cb4 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 @@ -71,31 +71,31 @@ 00064 // 00065 move_init (move, __old_sol); /* Restarting the exploration of 00066 of the neighborhood ! */ -00067 +00067 00068 move_select.init (__old_sol.fitness ()); -00069 +00069 00070 while (move_select.update (move, incr_eval (move, __old_sol)) 00071 && next_move (move, __old_sol)); -00072 +00072 00073 try -00074 { -00075 -00076 M best_move; -00077 -00078 Fitness best_move_fit; -00079 -00080 move_select (best_move, best_move_fit); -00081 __new_sol.fitness (best_move_fit); -00082 best_move (__new_sol); -00083 -00084 } +00074 { +00075 +00076 M best_move; +00077 +00078 Fitness best_move_fit; +00079 +00080 move_select (best_move, best_move_fit); +00081 __new_sol.fitness (best_move_fit); +00082 best_move (__new_sol); +00083 +00084 } 00085 catch (EmptySelection & __ex) -00086 { -00087 -00088 // ? -00089 } +00086 { +00087 +00088 // ? +00089 } 00090 } -00091 +00091 00092 private: 00093 00095 moMoveInit < M > &move_init; @@ -109,7 +109,7 @@ 00106 }; 00107 00108 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 bb2ef2b29..d42a1062d 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 @@ -90,7 +90,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 9caba8500..8b8097408 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 @@ -86,7 +86,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 e78c9c8bc..b1755f0b3 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 @@ -74,7 +74,7 @@ 00064 }; 00065 00066 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 ebcaeb46a..4c1411bdc 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 @@ -61,7 +61,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 e1cddff9c..f2f035944 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html @@ -48,7 +48,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 8efe4883c..651df71c1 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 @@ -48,7 +48,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 f215677a5..3ca7c6048 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 @@ -48,7 +48,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 1c50d9e1d..fed16cec1 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 @@ -46,7 +46,7 @@ 00026 }; 00027 00028 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 5ec7d22b7..a9b2b66e2 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 @@ -45,7 +45,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 d031c906e..bb2bc6260 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 @@ -66,7 +66,7 @@ 00063 }; 00064 00065 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 c6c6a4164..f9d5b8e1f 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 @@ -47,7 +47,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 019ccfc94..acae7313f 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 @@ -57,7 +57,7 @@ 00046 }; 00047 00048 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 772972cc0..55afcc0ad 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 @@ -47,62 +47,61 @@ 00027 typedef typename EOT::Fitness Fitness; 00028 00030 -00034 moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true) -00035 : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),minimization(__minimization), -00036 firstFitnessSaved(true), counter(0) -00037 {} +00033 moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement) +00034 : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) +00035 {} +00036 00038 -00040 -00045 bool operator () (const EOT & __sol) -00046 { -00047 if(__sol.invalid()) -00048 { -00049 return true; -00050 } -00051 -00052 if(firstFitnessSaved) -00053 { -00054 fitness=__sol.fitness(); -00055 counter=0; -00056 firstFitnessSaved=false; -00057 return true; -00058 } -00059 -00060 counter++; -00061 -00062 if( ((minimization) && (__sol.fitness() < fitness)) || -00063 ((!minimization) && (__sol.fitness() > fitness)) ) -00064 { -00065 fitness=__sol.fitness(); -00066 counter=0; -00067 } -00068 -00069 if(counter==maxNumberOfIterationsWithoutImprovement) -00070 { -00071 std::cout << "moNoFitImrpSolContinue: Done [" << counter << "] iterations without improvement." << std::endl; -00072 } -00073 return counter!=maxNumberOfIterationsWithoutImprovement; -00074 } -00075 +00043 bool operator () (const EOT & __sol) +00044 { +00045 if(__sol.invalid()) +00046 { +00047 return true; +00048 } +00049 +00050 if(firstFitnessSaved) +00051 { +00052 fitness=__sol.fitness(); +00053 counter=0; +00054 firstFitnessSaved=false; +00055 return true; +00056 } +00057 +00058 counter++; +00059 +00060 if( __sol.fitness() > fitness) +00061 { +00062 fitness=__sol.fitness(); +00063 counter=0; +00064 } +00065 +00066 if(counter==maxNumberOfIterationsWithoutImprovement) +00067 { +00068 std::cout << "moNoFitImrpSolContinue: Done [" << counter << "] iterations without improvement." << std::endl; +00069 } +00070 return counter!=maxNumberOfIterationsWithoutImprovement; +00071 } +00072 +00074 00077 void init () -00078 {} -00079 -00080 private: -00081 -00083 unsigned int maxNumberOfIterationsWithoutImprovement; +00078 { +00079 firstFitnessSaved=true; +00080 counter=0; +00081 } +00082 +00083 private: 00084 -00086 bool firstFitnessSaved; +00086 unsigned int maxNumberOfIterationsWithoutImprovement; 00087 -00089 Fitness fitness; +00089 bool firstFitnessSaved; 00090 -00092 -00096 bool minimization; +00092 Fitness fitness; +00093 +00095 unsigned int counter; +00096 }; 00097 -00099 unsigned int counter; -00100 }; -00101 -00102 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +00098 #endif +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 0d474e351..6bf051dd3 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 @@ -97,7 +97,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 942448500..ab0f31844 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 @@ -45,7 +45,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 89dfe5cf0..a92435f14 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 @@ -51,75 +51,75 @@ 00030 template < class M > class moSA:public moAlgo < typename M::EOType > 00031 { 00032 -00034 typedef -00035 typename -00036 M::EOType -00037 EOT; +00034 typedef typename M::EOType EOT; +00035 +00037 typedef typename EOT::Fitness Fitness; 00038 -00040 typedef -00041 typename -00042 EOT::Fitness -00043 Fitness; -00044 -00045 public: -00046 -00048 -00058 moSA (moRandMove < M > &__move_rand, -00059 moMoveIncrEval < M > &__incr_eval, -00060 moSolContinue < EOT > &__cont, -00061 double __init_temp, -00062 moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval): -00063 move_rand (__move_rand), -00064 incr_eval (__incr_eval), -00065 cont (__cont), -00066 init_temp (__init_temp), -00067 cool_sched (__cool_sched), -00068 full_eval (__full_eval) -00069 { -00070 -00071 } -00072 -00074 -00080 bool operator ()(EOT & __sol) -00081 { -00082 -00083 if (__sol.invalid ()) -00084 { -00085 full_eval (__sol); -00086 } +00039 public: +00040 +00042 +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) +00063 { +00064 +00065 } +00066 +00068 +00074 bool operator ()(EOT & __sol) +00075 { +00076 +00077 if (__sol.invalid ()) +00078 { +00079 full_eval (__sol); +00080 } +00081 +00082 double temp = init_temp; +00083 +00084 M move; +00085 +00086 EOT best_sol = __sol; 00087 -00088 double temp = init_temp; -00089 -00090 M move; -00091 -00092 EOT best_sol = __sol; -00093 -00094 do -00095 { -00096 -00097 cont.init (); -00098 do -00099 { -00100 -00101 move_rand (move); -00102 -00103 Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness (); -00104 -00105 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) -00106 { -00107 -00108 __sol.fitness (incr_eval (move, __sol)); -00109 move (__sol); -00110 -00111 /* Updating the best solution found -00112 until now ? */ +00088 Fitness current_fitness, delta; +00089 double exp1, exp2; +00090 +00091 do +00092 { +00093 cont.init (); +00094 do +00095 { +00096 move_rand (move); +00097 +00098 current_fitness= incr_eval (move, __sol); +00099 +00100 delta = current_fitness - __sol.fitness(); +00101 +00102 if(((long double)delta) < 0.0) +00103 { +00104 delta=-delta; +00105 } +00106 +00107 if ((current_fitness > __sol.fitness()) || ((rng.uniform ()) < (exp (-delta/ temp)))) +00108 { +00109 __sol.fitness (current_fitness); +00110 move (__sol); +00111 +00112 /* Updating the best solution found until now ? */ 00113 if (__sol.fitness () > best_sol.fitness ()) -00114 best_sol = __sol; -00115 } -00116 -00117 } -00118 while (cont (__sol)); -00119 +00114 { +00115 best_sol = __sol; +00116 } +00117 } +00118 } +00119 while (cont (__sol)); 00120 } 00121 while (cool_sched (temp)); 00122 @@ -144,7 +144,7 @@ 00147 }; 00148 00149 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 fd8ac3e7e..f41d34225 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 @@ -134,7 +134,7 @@ 00124 }; 00125 00126 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 928c3a194..d7735fc81 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 @@ -141,7 +141,7 @@ 00133 }; 00134 00135 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 bedbbef23..05d2e3b4e 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 @@ -48,7 +48,7 @@ 00031 }; 00032 00033 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 2292a6758..e1992bd69 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 @@ -47,76 +47,77 @@ 00027 typedef typename EOT::Fitness Fitness; 00028 00030 -00035 moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true) -00036 : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), -00037 minimization(__minimization), maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) -00038 {} -00039 -00041 -00047 bool operator () (const EOT & __sol) -00048 { -00049 if(!maxNumberOfIterationsReached) -00050 { -00051 maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations); -00052 if(maxNumberOfIterationsReached) -00053 { -00054 std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl; -00055 } -00056 return true; -00057 } -00058 -00059 if(__sol.invalid()) -00060 { -00061 return true; -00062 } -00063 -00064 if(firstFitnessSaved) -00065 { -00066 fitness=__sol.fitness(); -00067 counter=0; -00068 firstFitnessSaved=false; -00069 return true; -00070 } -00071 -00072 counter++; -00073 -00074 if( ((minimization) && (__sol.fitness() < fitness)) || -00075 ((!minimization) && (__sol.fitness() > fitness)) ) -00076 { -00077 fitness=__sol.fitness(); -00078 counter=0; -00079 } -00080 -00081 if(counter==maxNumberOfIterationsWithoutImprovement) -00082 { -00083 std::cout << "moSteadyFitSolContinue: Done [" << counter << "] iterations without improvement." << std::endl; -00084 } -00085 return counter!=maxNumberOfIterationsWithoutImprovement; -00086 } +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) +00047 { +00048 if(!maxNumberOfIterationsReached) +00049 { +00050 maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations); +00051 if(maxNumberOfIterationsReached) +00052 { +00053 std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl; +00054 } +00055 return true; +00056 } +00057 +00058 if(__sol.invalid()) +00059 { +00060 return true; +00061 } +00062 +00063 if(firstFitnessSaved) +00064 { +00065 fitness=__sol.fitness(); +00066 counter=0; +00067 firstFitnessSaved=false; +00068 return true; +00069 } +00070 +00071 counter++; +00072 +00073 if( __sol.fitness() > fitness ) +00074 { +00075 fitness=__sol.fitness(); +00076 counter=0; +00077 } +00078 +00079 if(counter==maxNumberOfIterationsWithoutImprovement) +00080 { +00081 std::cout << "moSteadyFitSolContinue: Done [" << counter << "] iterations without improvement." << std::endl; +00082 } +00083 return counter!=maxNumberOfIterationsWithoutImprovement; +00084 } +00085 00087 -00089 void init () -00090 {} -00091 -00092 private: -00093 -00095 unsigned int maxNumberOfIterations; +00090 void init () +00091 { +00092 maxNumberOfIterationsReached=false; +00093 counter=0; +00094 firstFitnessSaved=true; +00095 } 00096 -00098 unsigned int maxNumberOfIterationsWithoutImprovement; -00099 -00101 bool maxNumberOfIterationsReached; -00102 -00104 bool firstFitnessSaved; -00105 -00107 Fitness fitness; -00108 +00097 private: +00098 +00100 unsigned int maxNumberOfIterations; +00101 +00103 unsigned int maxNumberOfIterationsWithoutImprovement; +00104 +00106 bool maxNumberOfIterationsReached; +00107 +00109 bool firstFitnessSaved; 00110 -00114 bool minimization; -00115 -00117 unsigned int counter; -00118 }; -00119 -00120 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +00112 Fitness fitness; +00113 +00115 unsigned int counter; +00116 }; +00117 +00118 #endif +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 7936c11cb..f8a55a3dc 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 @@ -84,13 +84,13 @@ 00091 00092 M move; 00093 -00094 EOT best_sol = __sol, new_sol; -00095 -00096 cont.init (); -00097 -00098 do -00099 { -00100 +00094 EOT best_sol, new_sol; +00095 best_sol = __sol; +00096 +00097 cont.init (); +00098 +00099 do +00100 { 00101 new_sol = __sol; 00102 00103 try @@ -105,34 +105,33 @@ 00112 break; 00113 } 00114 -00115 /* Updating the best solution -00116 found until now ? */ -00117 if (new_sol.fitness () > __sol.fitness ()) -00118 { -00119 best_sol = new_sol; -00120 } -00121 -00122 __sol = new_sol; -00123 -00124 } -00125 while (cont (__sol)); -00126 -00127 __sol = best_sol; -00128 -00129 return true; -00130 } -00131 -00132 private: -00133 -00135 moMoveExpl < M > &move_expl; -00136 -00138 moSolContinue < EOT > &cont; -00139 -00141 eoEvalFunc < EOT > &full_eval; -00142 }; -00143 -00144 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +00115 /* Updating the best solution found until now ? */ +00116 if (new_sol.fitness () > __sol.fitness ()) +00117 { +00118 best_sol = new_sol; +00119 } +00120 +00121 __sol = new_sol; +00122 +00123 } +00124 while (cont (__sol)); +00125 +00126 __sol = best_sol; +00127 +00128 return true; +00129 } +00130 +00131 private: +00132 +00134 moMoveExpl < M > &move_expl; +00135 +00137 moSolContinue < EOT > &cont; +00138 +00140 eoEvalFunc < EOT > &full_eval; +00141 }; +00142 +00143 #endif +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 dd0d9dc27..d62808d95 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 @@ -128,7 +128,7 @@ 00130 }; 00131 00132 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 315435097..756b4c735 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 @@ -61,7 +61,7 @@ 00054 }; 00055 00056 #endif -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/search.idx b/trunk/paradiseo-mo/doc/html/search.idx index 4b94a2a22b33f3af68b687c3e01fa4f7d306f477..61de9a8c183ee8a8a4bb91c3d38b4376d0e17d93 100644 GIT binary patch literal 355716 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 z%0A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 L-b#EV3xNtAL`jea`8#b6{r9FqdU_ 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 M)9=b6Ld*020G>Y5wEzGB diff --git a/trunk/paradiseo-mo/doc/html/search.php b/trunk/paradiseo-mo/doc/html/search.php index 02e7d9690..e2206d765 100644 --- a/trunk/paradiseo-mo/doc/html/search.php +++ b/trunk/paradiseo-mo/doc/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
    Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by  +
    Generated on Fri Aug 3 16:25:56 2007 for PARADISEO-MO by  doxygen 1.5.2
    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 25bc9f2a0..d97f88b80 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex @@ -96,7 +96,7 @@ Procedure which saved the best move and fitness. Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 68 of file moBestImprSelect.h. +Definition at line 65 of file moBestImprSelect.h. References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex index b572655f6..4e4147f0f 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex @@ -15,7 +15,7 @@ Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] \begin{CompactItemize} \item {\bf moExponentialCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) -\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item +\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool {\bf operator()} (double \&\_\-\_\-temp) \begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -44,7 +44,7 @@ Definition at line 22 of file moExponentialCoolingSchedule.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}moExponentialCoolingSchedule::moExponentialCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} -Simple constructor. +Basic constructor. \begin{Desc} \item[Parameters:] 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 2c474addb..0732493f7 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex @@ -20,7 +20,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8b \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moFitSolContinue} ({\bf Fitness} \_\-\_\-fitness, bool \_\-\_\-minimization=true) +{\bf moFitSolContinue} ({\bf Fitness} \_\-\_\-fitness) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item @@ -32,9 +32,7 @@ void {\bf init} ()\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f \item {\bf Fitness} {\bf fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} -\begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\item -bool {\bf minimization} -\begin{CompactList}\small\item\em Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} @@ -51,7 +49,7 @@ Definition at line 21 of file moFitSolContinue.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}, bool {\em \_\-\_\-minimization} = {\tt true})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_667090eca00b8532524f8e0a6e988fed} +\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} Basic constructor. @@ -59,11 +57,11 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-fitness}]The fitness to reach. \item[{\em \_\-\_\-minimization}]Indicate if the the aim is to maximize or minimize the fitness. \end{description} +\item[{\em \_\-\_\-fitness}]The fitness to reach. \end{description} \end{Desc} -Definition at line 34 of file moFitSolContinue.h. +Definition at line 33 of file moFitSolContinue.h. \subsection{Member Function Documentation} \index{moFitSolContinue@{moFitSolContinue}!operator()@{operator()}} @@ -86,23 +84,9 @@ Indicates if the fitness threshold has not yet been reached. Implements {\bf eoUF$<$ const EOT \&, bool $>$}. -Definition at line 44 of file moFitSolContinue.h. +Definition at line 43 of file moFitSolContinue.h. -References moFitSolContinue$<$ EOT $>$::fitness, and moFitSolContinue$<$ EOT $>$::minimization. - -\subsection{Member Data Documentation} -\index{moFitSolContinue@{moFitSolContinue}!minimization@{minimization}} -\index{minimization@{minimization}!moFitSolContinue@{moFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::{\bf minimization}\hspace{0.3cm}{\tt [private]}}\label{classmo_fit_sol_continue_a4c90279f00774d9868a2e38ead45696} - - -Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. - -It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). - -Definition at line 72 of file moFitSolContinue.h. - -Referenced by moFitSolContinue$<$ EOT $>$::operator()(). +References moFitSolContinue$<$ EOT $>$::fitness. The documentation for this class was generated from the following file:\begin{CompactItemize} \item 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 97c2f7744..986c3d8da 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -18,8 +18,7 @@ Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item -void {\bf init} ()\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} - +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} @@ -83,7 +82,20 @@ Implements {\bf eoUF$<$ const EOT \&, bool $>$}. Definition at line 42 of file moGenSolContinue.h. -References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen. +References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}} +\index{init@{init}!moGenSolContinue@{moGenSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moGenSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} + + +Procedure which allows to initialise 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}. + +Definition at line 51 of file moGenSolContinue.h. + +References moGenSolContinue$<$ EOT $>$::numGen. The documentation for this class was generated from the following file:\begin{CompactItemize} \item 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 88e762695..da994cbf9 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 @@ -20,12 +20,11 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184 \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moNoFitImprSolContinue} (unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement, bool \_\-\_\-minimization=true) +{\bf moNoFitImprSolContinue} (unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} ()\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} - +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} @@ -39,8 +38,6 @@ bool {\bf firstFitnessSaved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a07 {\bf Fitness} {\bf fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -bool {\bf minimization} -\begin{CompactList}\small\item\em Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. \item\end{CompactList}\item 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} @@ -60,7 +57,7 @@ Definition at line 21 of file moNoFitImprSolContinue.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}, bool {\em \_\-\_\-minimization} = {\tt true})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_6246733469ea1b5001bf4c567e3dfdcb} +\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} Basic constructor. @@ -68,11 +65,11 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \item[{\em \_\-\_\-minimization}]Indicate if the the aim is to maximize or minimize the fitness. \end{description} +\item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 34 of file moNoFitImprSolContinue.h. +Definition at line 33 of file moNoFitImprSolContinue.h. \subsection{Member Function Documentation} \index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!operator()@{operator()}} @@ -93,23 +90,22 @@ Indicates if the fitness has not been improved since a given number of iteration Implements {\bf eoUF$<$ const EOT \&, bool $>$}. -Definition at line 45 of file moNoFitImprSolContinue.h. +Definition at line 43 of file moNoFitImprSolContinue.h. -References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement, and moNoFitImprSolContinue$<$ EOT $>$::minimization. - -\subsection{Member Data Documentation} -\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!minimization@{minimization}} -\index{minimization@{minimization}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::{\bf minimization}\hspace{0.3cm}{\tt [private]}}\label{classmo_no_fit_impr_sol_continue_2d216544c9188ec593d808c8e95208f5} +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} -Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. +Procedure which allows to initialise all the stuff needed. -It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +It can be also used to reinitialize the counter all the needed things. -Definition at line 96 of file moNoFitImprSolContinue.h. +Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Referenced by moNoFitImprSolContinue$<$ EOT $>$::operator()(). +Definition at line 77 of file moNoFitImprSolContinue.h. + +References moNoFitImprSolContinue$<$ EOT $>$::counter, and moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex index a58e3a510..428739912 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex @@ -78,7 +78,7 @@ All the boxes used by a SA need to be given. \end{Desc} -Definition at line 58 of file moSA.h. +Definition at line 52 of file moSA.h. \subsection{Member Function Documentation} \index{moSA@{moSA}!operator()@{operator()}} @@ -101,7 +101,7 @@ As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the S Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. -Definition at line 80 of file moSA.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(). 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 bf00eb103..473136fe8 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 @@ -20,12 +20,11 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721 \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSteadyFitSolContinue} (unsigned int \_\-\_\-maxNumberOfIterations, unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement, bool \_\-\_\-minimization=true) +{\bf moSteadyFitSolContinue} (unsigned int \_\-\_\-maxNumberOfIterations, unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} ()\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} - +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} @@ -45,8 +44,6 @@ bool {\bf firstFitnessSaved}\label{classmo_steady_fit_sol_continue_025bf2789e470 {\bf Fitness} {\bf fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -bool {\bf minimization} -\begin{CompactList}\small\item\em Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. \item\end{CompactList}\item unsigned int {\bf counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} \begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} @@ -66,7 +63,7 @@ Definition at line 21 of file moSteadyFitSolContinue.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}, bool {\em \_\-\_\-minimization} = {\tt true})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_0c7e09ca080bfb1dd493015d23a50ad7} +\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} Basic constructor. @@ -74,11 +71,11 @@ 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. \item[{\em \_\-\_\-minimization}]Indicate if the the aim is to maximize or minimize the fitness. \end{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} \end{Desc} -Definition at line 35 of file moSteadyFitSolContinue.h. +Definition at line 34 of file moSteadyFitSolContinue.h. \subsection{Member Function Documentation} \index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!operator()@{operator()}} @@ -101,23 +98,22 @@ Indicates if the fitness has not been improved since a number of iterations (aft Implements {\bf eoUF$<$ const EOT \&, bool $>$}. -Definition at line 47 of file moSteadyFitSolContinue.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, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement, and moSteadyFitSolContinue$<$ EOT $>$::minimization. - -\subsection{Member Data Documentation} -\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!minimization@{minimization}} -\index{minimization@{minimization}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::{\bf minimization}\hspace{0.3cm}{\tt [private]}}\label{classmo_steady_fit_sol_continue_4176d8cc6fda6cb854997a845faaf8a4} +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} -Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. +Procedure which allows to initialise the stuff needed. -It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +It can be also used to reinitialize the counter all the needed things. -Definition at line 114 of file moSteadyFitSolContinue.h. +Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Referenced by moSteadyFitSolContinue$<$ EOT $>$::operator()(). +Definition at line 90 of file moSteadyFitSolContinue.h. + +References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty index c962e75b2..7d1d1d48b 100644 --- a/trunk/paradiseo-mo/doc/latex/doxygen.sty +++ b/trunk/paradiseo-mo/doc/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Aug 2 09:02:25 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Aug 3 16:25:55 2007 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex index f10d81b51..ab281f711 100644 --- a/trunk/paradiseo-mo/doc/latex/refman.tex +++ b/trunk/paradiseo-mo/doc/latex/refman.tex @@ -20,7 +20,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.5.2}\\ \vspace*{0.5cm} -{\small Thu Aug 2 09:02:25 2007}\\ +{\small Fri Aug 3 16:25:55 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 a1f585481..a115df7bf 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "3 Aug 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 6891ec07d..eba9583d3 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 index b438e1739..787df5386 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index 75a7d2b35..3dfa6dc21 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -108,7 +108,7 @@ Procedure which saved the best move and fitness. .PP Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP -Definition at line 68 of file moBestImprSelect.h. +Definition at line 65 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index 163d99a19..52e9974b6 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index da4deac15..cc9ab7cf5 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -18,7 +18,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "\fBmoExponentialCoolingSchedule\fP (double __threshold, double __ratio)" .br -.RI "\fISimple constructor. \fP" +.RI "\fIBasic constructor. \fP" .ti -1c .RI "bool \fBoperator()\fP (double &__temp)" .br @@ -47,7 +47,7 @@ Definition at line 22 of file moExponentialCoolingSchedule.h. .PP .SS "moExponentialCoolingSchedule::moExponentialCoolingSchedule (double __threshold, double __ratio)\fC [inline]\fP" .PP -Simple constructor. +Basic constructor. .PP \fBParameters:\fP .RS 4 diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index 925c761eb..0b2292799 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 index e576548a5..96151e862 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFitSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -24,7 +24,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .in +1c .ti -1c -.RI "\fBmoFitSolContinue\fP (\fBFitness\fP __fitness, bool __minimization=true)" +.RI "\fBmoFitSolContinue\fP (\fBFitness\fP __fitness)" .br .RI "\fIBasic constructor. \fP" .ti -1c @@ -43,10 +43,6 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .RI "\fBFitness\fP \fBfitness\fP" .br .RI "\fIFitness target. \fP" -.ti -1c -.RI "bool \fBminimization\fP" -.br -.RI "\fIFlag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. \fP" .in -1c .SH "Detailed Description" .PP @@ -59,20 +55,18 @@ The stop criterion corresponds to a fitness threshold gained. Definition at line 21 of file moFitSolContinue.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoFitSolContinue\fP< EOT >::\fBmoFitSolContinue\fP (\fBFitness\fP __fitness, bool __minimization = \fCtrue\fP)\fC [inline]\fP" +.SS "template \fBmoFitSolContinue\fP< EOT >::\fBmoFitSolContinue\fP (\fBFitness\fP __fitness)\fC [inline]\fP" .PP Basic constructor. .PP \fBParameters:\fP .RS 4 \fI__fitness\fP The fitness to reach. -.br -\fI__minimization\fP Indicate if the the aim is to maximize or minimize the fitness. .RE .PP .PP -Definition at line 34 of file moFitSolContinue.h. +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" @@ -95,20 +89,9 @@ true or false according to the value of the fitness. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 44 of file moFitSolContinue.h. +Definition at line 43 of file moFitSolContinue.h. .PP -References moFitSolContinue< EOT >::fitness, and moFitSolContinue< EOT >::minimization. -.SH "Member Data Documentation" -.PP -.SS "template bool \fBmoFitSolContinue\fP< EOT >::\fBminimization\fP\fC [private]\fP" -.PP -Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. -.PP -It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). -.PP -Definition at line 72 of file moFitSolContinue.h. -.PP -Referenced by moFitSolContinue< EOT >::operator()(). +References moFitSolContinue< EOT >::fitness. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 index a5f447e36..c5f834a88 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -88,6 +88,17 @@ Implements \fBeoUF< const EOT &, bool >\fP. Definition at line 42 of file moGenSolContinue.h. .PP References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. +.SS "template void \fBmoGenSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" +.PP +Procedure which allows to initialise all the stuff needed. +.PP +It can be also used to reinitialize the counter all the needed things. +.PP +Implements \fBmoSolContinue< EOT >\fP. +.PP +Definition at line 51 of file moGenSolContinue.h. +.PP +References moGenSolContinue< EOT >::numGen. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3 index b6474b447..296d6d36e 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index fcc5d28d3..88a1b56bb 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index 0658e4940..527fbfe0e 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 index fbbaeef17..8ad3ea13c 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 index 7d902e322..8c7755fde 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index 65692576a..96b74ecab 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3 index fdacb6800..a83851cf6 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 index f170f957f..c23d57890 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index 334c28589..5ee3a827e 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 index f9d9b0b0b..7c83a74de 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 index 55b0459c3..05ea03193 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "3 Aug 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 baaef4af5..02a978f51 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 index 0a6c9ed0f..30e66bf6d 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index f3c17ba8e..3684ce4cd 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "3 Aug 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 32d161fc3..e3021c7fa 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoFitImprSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -24,7 +24,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .in +1c .ti -1c -.RI "\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true)" +.RI "\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovement)" .br .RI "\fIBasic constructor. \fP" .ti -1c @@ -52,10 +52,6 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .br .RI "\fICurrent Fitness. \fP" .ti -1c -.RI "bool \fBminimization\fP" -.br -.RI "\fIFlag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. \fP" -.ti -1c .RI "unsigned int \fBcounter\fP" .br .RI "\fIThe iteration couter. \fP" @@ -71,20 +67,18 @@ The stop criterion corresponds to a maximum number of iterations without improev Definition at line 21 of file moNoFitImprSolContinue.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoNoFitImprSolContinue\fP< EOT >::\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization = \fCtrue\fP)\fC [inline]\fP" +.SS "template \fBmoNoFitImprSolContinue\fP< EOT >::\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovement)\fC [inline]\fP" .PP Basic constructor. .PP \fBParameters:\fP .RS 4 \fI__maxNumberOfIterationWithoutImprovement\fP The number of iterations without fitness improvement to reach for stop. -.br -\fI__minimization\fP Indicate if the the aim is to maximize or minimize the fitness. .RE .PP .PP -Definition at line 34 of file moNoFitImprSolContinue.h. +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" @@ -107,20 +101,20 @@ true or false. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 45 of file moNoFitImprSolContinue.h. +Definition at line 43 of file moNoFitImprSolContinue.h. .PP -References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement, and moNoFitImprSolContinue< EOT >::minimization. -.SH "Member Data Documentation" -.PP -.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::\fBminimization\fP\fC [private]\fP" +References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement. +.SS "template void \fBmoNoFitImprSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" .PP -Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. +Procedure which allows to initialise all the stuff needed. .PP -It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +It can be also used to reinitialize the counter all the needed things. .PP -Definition at line 96 of file moNoFitImprSolContinue.h. +Implements \fBmoSolContinue< EOT >\fP. .PP -Referenced by moNoFitImprSolContinue< EOT >::operator()(). +Definition at line 77 of file moNoFitImprSolContinue.h. +.PP +References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< EOT >::firstFitnessSaved. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 index dd74d0c30..8f52b5903 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 index c29df51ce..8431a5322 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3 index 4b8d956c8..26ad08694 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -98,7 +98,7 @@ All the boxes used by a SA need to be given. .PP .PP -Definition at line 58 of file moSA.h. +Definition at line 52 of file moSA.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" @@ -121,7 +121,7 @@ TRUE. .PP Implements \fBeoUF< M::EOType &, bool >\fP. .PP -Definition at line 80 of file moSA.h. +Definition at line 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(). diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index 97557e4a1..80198c3c8 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 index a14690ba7..b7fa80eed 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 index 1f18548a0..aca211515 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 index 6b805317e..0576372df 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSteadyFitSolContinue" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -24,7 +24,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .in +1c .ti -1c -.RI "\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true)" +.RI "\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)" .br .RI "\fIBasic constructor. \fP" .ti -1c @@ -60,10 +60,6 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .br .RI "\fICurrent Fitness. \fP" .ti -1c -.RI "bool \fBminimization\fP" -.br -.RI "\fIFlag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. \fP" -.ti -1c .RI "unsigned int \fBcounter\fP" .br .RI "\fIThe iteration couter. \fP" @@ -79,7 +75,7 @@ The stop criterion corresponds to a maximum number of iterations without improve Definition at line 21 of file moSteadyFitSolContinue.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSteadyFitSolContinue\fP< EOT >::\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization = \fCtrue\fP)\fC [inline]\fP" +.SS "template \fBmoSteadyFitSolContinue\fP< EOT >::\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)\fC [inline]\fP" .PP Basic constructor. .PP @@ -88,13 +84,11 @@ Basic constructor. \fI__maxNumberOfIterations\fP The number of iterations to reach before looking for the fitness. .br \fI__maxNumberOfIterationWithoutImprovement\fP The number of iterations without fitness improvement to reach for stop. -.br -\fI__minimization\fP Indicate if the the aim is to maximize or minimize the fitness. .RE .PP .PP -Definition at line 35 of file moSteadyFitSolContinue.h. +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" @@ -117,20 +111,20 @@ true or false. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 47 of file moSteadyFitSolContinue.h. +Definition at line 46 of file moSteadyFitSolContinue.h. .PP -References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement, and moSteadyFitSolContinue< EOT >::minimization. -.SH "Member Data Documentation" -.PP -.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::\fBminimization\fP\fC [private]\fP" +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement. +.SS "template void \fBmoSteadyFitSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" .PP -Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. +Procedure which allows to initialise the stuff needed. .PP -It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +It can be also used to reinitialize the counter all the needed things. .PP -Definition at line 114 of file moSteadyFitSolContinue.h. +Implements \fBmoSolContinue< EOT >\fP. .PP -Referenced by moSteadyFitSolContinue< EOT >::operator()(). +Definition at line 90 of file moSteadyFitSolContinue.h. +.PP +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3 index c9e9011b7..0b0cf7c88 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index 8e91e080d..369dbe48d 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 index 318acdf61..d55b13514 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 "2 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "3 Aug 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/src/moBestImprSelect.h b/trunk/paradiseo-mo/src/moBestImprSelect.h index e67ab4f9b..62a1004b2 100755 --- a/trunk/paradiseo-mo/src/moBestImprSelect.h +++ b/trunk/paradiseo-mo/src/moBestImprSelect.h @@ -46,16 +46,13 @@ public: */ bool update (const M & __move, const Fitness & __fit) { - - if (first_time || __fit > best_fit) + if ((first_time) || (__fit > best_fit)) { - best_fit = __fit; best_move = __move; first_time = false; } - return true; } @@ -87,7 +84,6 @@ private: //! The best fitness. Fitness best_fit; - }; #endif diff --git a/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h b/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h index e67614951..7f453d9ff 100644 --- a/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h +++ b/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h @@ -23,7 +23,7 @@ class moExponentialCoolingSchedule: public moCoolingSchedule { public: - //! Simple constructor + //! Basic constructor /*! \param __threshold the threshold. \param __ratio the ratio used to descrease the temperature. diff --git a/trunk/paradiseo-mo/src/moFitSolContinue.h b/trunk/paradiseo-mo/src/moFitSolContinue.h index f52b184ef..7ed41ad07 100644 --- a/trunk/paradiseo-mo/src/moFitSolContinue.h +++ b/trunk/paradiseo-mo/src/moFitSolContinue.h @@ -29,9 +29,8 @@ public: //! Basic constructor. /*! \param __fitness The fitness to reach. - \param __minimization Indicate if the the aim is to maximize or minimize the fitness. */ - moFitSolContinue (Fitness __fitness, bool __minimization=true): fitness (__fitness), minimization(__minimization) + moFitSolContinue (Fitness __fitness): fitness (__fitness) {} //! Function that activates the stopping criterion. @@ -48,11 +47,7 @@ public: return true; } - if(minimization) - { - return __sol.fitness()>fitness; - } - return __sol.fitness()<=fitness; + return __sol.fitness() < fitness; } //! Procedure which allows to initialise all the stuff needed. @@ -63,13 +58,6 @@ private: //! Fitness target. Fitness fitness; - - //! Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. - /*! - It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that - is worse that the best known fitness (in this case, the counter is not reinitialized). - */ - bool minimization; }; #endif diff --git a/trunk/paradiseo-mo/src/moGenSolContinue.h b/trunk/paradiseo-mo/src/moGenSolContinue.h index 7a5bca6b1..2bec68287 100755 --- a/trunk/paradiseo-mo/src/moGenSolContinue.h +++ b/trunk/paradiseo-mo/src/moGenSolContinue.h @@ -45,8 +45,13 @@ public: } //! Procedure which allows to initialise all the stuff needed. + /*! + It can be also used to reinitialize the counter all the needed things. + */ void init () - {} + { + numGen=0; + } private: diff --git a/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h b/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h index f9ff78bea..2f3a5413f 100755 --- a/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h +++ b/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h @@ -64,31 +64,31 @@ moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, // move_init (move, __old_sol); /* Restarting the exploration of of the neighborhood ! */ - + move_select.init (__old_sol.fitness ()); - + while (move_select.update (move, incr_eval (move, __old_sol)) && next_move (move, __old_sol)); - + try - { - - M best_move; - - Fitness best_move_fit; - - move_select (best_move, best_move_fit); - __new_sol.fitness (best_move_fit); - best_move (__new_sol); - - } + { + + M best_move; + + Fitness best_move_fit; + + move_select (best_move, best_move_fit); + __new_sol.fitness (best_move_fit); + best_move (__new_sol); + + } catch (EmptySelection & __ex) - { - - // ? - } + { + + // ? + } } - + private: //! Move initialiser. diff --git a/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h b/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h index 243394687..101dc1fc3 100644 --- a/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h +++ b/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h @@ -29,11 +29,9 @@ public: //! Basic constructor. /*! \param __maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop. - \param __minimization Indicate if the the aim is to maximize or minimize the fitness. */ - moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true) - : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),minimization(__minimization), - firstFitnessSaved(true), counter(0) + moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement) + : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) {} //! Function that activates the stopping criterion. @@ -59,8 +57,7 @@ public: counter++; - if( ((minimization) && (__sol.fitness() < fitness)) || - ((!minimization) && (__sol.fitness() > fitness)) ) + if( __sol.fitness() > fitness) { fitness=__sol.fitness(); counter=0; @@ -74,8 +71,14 @@ public: } //! Procedure which allows to initialise all the stuff needed. + /*! + It can be also used to reinitialize the counter all the needed things. + */ void init () - {} + { + firstFitnessSaved=true; + counter=0; + } private: @@ -88,13 +91,6 @@ private: //! Current Fitness. Fitness fitness; - //! Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. - /*! - It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that - is worse that the best known fitness (in this case, the counter is not reinitialized). - */ - bool minimization; - //! The iteration couter. unsigned int counter; }; diff --git a/trunk/paradiseo-mo/src/moSA.h b/trunk/paradiseo-mo/src/moSA.h index 97eaabf8e..ec0a5ba7f 100755 --- a/trunk/paradiseo-mo/src/moSA.h +++ b/trunk/paradiseo-mo/src/moSA.h @@ -31,16 +31,10 @@ template < class M > class moSA:public moAlgo < typename M::EOType > { //! Alias for the type - typedef - typename - M::EOType - EOT; + typedef typename M::EOType EOT; //! Alias for the fitness - typedef - typename - EOT::Fitness - Fitness; + typedef typename EOT::Fitness Fitness; public: @@ -91,32 +85,38 @@ public: EOT best_sol = __sol; + Fitness current_fitness, delta; + double exp1, exp2; + do { - cont.init (); do { - move_rand (move); - Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness (); + current_fitness= incr_eval (move, __sol); - if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) + delta = current_fitness - __sol.fitness(); + + if(((long double)delta) < 0.0) { - - __sol.fitness (incr_eval (move, __sol)); - move (__sol); - - /* Updating the best solution found - until now ? */ - if (__sol.fitness () > best_sol.fitness ()) - best_sol = __sol; + delta=-delta; } + if ((current_fitness > __sol.fitness()) || ((rng.uniform ()) < (exp (-delta/ temp)))) + { + __sol.fitness (current_fitness); + move (__sol); + + /* Updating the best solution found until now ? */ + if (__sol.fitness () > best_sol.fitness ()) + { + best_sol = __sol; + } + } } while (cont (__sol)); - } while (cool_sched (temp)); diff --git a/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h b/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h index 2f5cf581b..4e64e1064 100644 --- a/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h +++ b/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h @@ -30,11 +30,10 @@ public: /*! \param __maxNumberOfIterations The number of iterations to reach before looking for the fitness. \param __maxNumberOfIterationWithoutImprovement The number of iterations without fitness improvement to reach for stop. - \param __minimization Indicate if the the aim is to maximize or minimize the fitness. */ - moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement, bool __minimization=true) + moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement) : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), - minimization(__minimization), maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) + maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) {} //! Function that activates the stopping criterion. @@ -71,8 +70,7 @@ public: counter++; - if( ((minimization) && (__sol.fitness() < fitness)) || - ((!minimization) && (__sol.fitness() > fitness)) ) + if( __sol.fitness() > fitness ) { fitness=__sol.fitness(); counter=0; @@ -86,8 +84,15 @@ public: } //! Procedure which allows to initialise the stuff needed. + /*! + It can be also used to reinitialize the counter all the needed things. + */ void init () - {} + { + maxNumberOfIterationsReached=false; + counter=0; + firstFitnessSaved=true; + } private: @@ -106,13 +111,6 @@ private: //! Current Fitness. Fitness fitness; - //! Flag that indicate if there is a minimization (true) or a maximization (false) of the fitness value. - /*! - It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that - is worse that the best known fitness (in this case, the counter is not reinitialized). - */ - bool minimization; - //! The iteration couter. unsigned int counter; }; diff --git a/trunk/paradiseo-mo/src/moTS.h b/trunk/paradiseo-mo/src/moTS.h index 8aa134d5d..4140a5bc0 100755 --- a/trunk/paradiseo-mo/src/moTS.h +++ b/trunk/paradiseo-mo/src/moTS.h @@ -91,13 +91,13 @@ moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < M move; - EOT best_sol = __sol, new_sol; + EOT best_sol, new_sol; + best_sol = __sol; cont.init (); do { - new_sol = __sol; try @@ -112,8 +112,7 @@ moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < break; } - /* Updating the best solution - found until now ? */ + /* Updating the best solution found until now ? */ if (new_sol.fitness () > __sol.fitness ()) { best_sol = new_sol; diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp index a71da34e4..ef84ec266 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp @@ -58,10 +58,10 @@ main (int __argc, char * __argv []) moNoAspirCrit aspir_crit ; // Aspiration Criterion - moGenSolContinue cont (10000) ; // Continuator - //moFitSolContinue cont (-700,false); - //moSteadyFitSolContinue cont (1000, 2000,false); - //moNoFitImprSolContinue cont (1000,false); + moGenSolContinue cont (1000) ; // Continuator + //moFitSolContinue cont (700); + //moNoFitImprSolContinue cont (1000); + //moSteadyFitSolContinue cont (1000, 2000); moTS tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ; tabu_search (route) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route.h index 2489b63bc..ee2224ac9 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route.h @@ -2,7 +2,7 @@ // "route.h" -// (c) OPAC Team, LIFL, 2003-2006 +// (c) OPAC Team, LIFL, 2003-2007 /* LICENCE TEXT @@ -13,7 +13,10 @@ #define route_h #include +#include -typedef eoVector Route ; // [Fitness (- length), Gene (city)] +typedef eoScalarFitness< float, std::greater< float > > tspFitness ; + +typedef eoVector Route ; // [Fitness (length), Gene (city)] #endif diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp index 0d0d6e413..4d5da8b9b 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp @@ -15,11 +15,11 @@ void RouteEval :: operator () (Route & __route) { - float len = 0 ; + tspFitness len = 0 ; for (unsigned int i = 0 ; i < Graph :: size () ; i ++) { - len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; + len = len + Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; } __route.fitness (len) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp index 1b371104b..aa738e425 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp @@ -12,7 +12,7 @@ #include "two_opt_incr_eval.h" #include "graph.h" -float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) +tspFitness TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) { // From unsigned int v1 = __route [__move.first], v1_next = __route [__move.first + 1] ; @@ -21,8 +21,8 @@ float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __rout unsigned int v2 = __route [__move.second], v2_next = __route [__move.second + 1] ; return __route.fitness () - - Graph :: distance (v1, v2) - - Graph :: distance (v1_next, v2_next) - + Graph :: distance (v1, v1_next) - + Graph :: distance (v2, v2_next) ; + + Graph :: distance (v1, v2) + + Graph :: distance (v1_next, v2_next) + - Graph :: distance (v1, v1_next) + - Graph :: distance (v2, v2_next) ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h index 233cb264d..0c217704e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h @@ -20,7 +20,7 @@ class TwoOptIncrEval : public moMoveIncrEval public : - float operator () (const TwoOpt & __move, const Route & __route) ; + tspFitness operator () (const TwoOpt & __move, const Route & __route) ; } ;