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 4b94a2a22..61de9a8c1 100644 Binary files a/trunk/paradiseo-mo/doc/html/search.idx and b/trunk/paradiseo-mo/doc/html/search.idx differ 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) ; } ;