diff --git a/trunk/paradiseo-mo/docs/html/annotated.html b/trunk/paradiseo-mo/docs/html/annotated.html index 4369f8d4b..3d9d4e265 100644 --- a/trunk/paradiseo-mo/docs/html/annotated.html +++ b/trunk/paradiseo-mo/docs/html/annotated.html @@ -54,12 +54,14 @@ moRandImprSelect< M >One of the possible moMove selector (moMoveSelect) moRandMove< M >Random move generator moSA< M >Simulated Annealing (SA) + moSimpleMoveTabuList< M >Class describing a move tabu list with a limited memory + moSimpleSolutionTabuList< M >Class describing a solution tabu list with limited length moSolContinue< EOT >Class that describes a stop criterion for a solution-based heuristic moTabuList< M >Class describing a tabu list that a moTS uses moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/class_empty_selection.html b/trunk/paradiseo-mo/docs/html/class_empty_selection.html index 2bf2798d5..af2b15a8a 100644 --- a/trunk/paradiseo-mo/docs/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/docs/html/class_empty_selection.html @@ -45,7 +45,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 Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classes.html b/trunk/paradiseo-mo/docs/html/classes.html index 41145b74b..972d1fa2e 100644 --- a/trunk/paradiseo-mo/docs/html/classes.html +++ b/trunk/paradiseo-mo/docs/html/classes.html @@ -31,21 +31,21 @@

PARADISEO-MO Class Index

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

  A  
-		moHC   moMoveSelect   
moAlgo   moHCMoveLoopExpl   
  N  
-
moAspirCrit   
  I  
-		moNextMove   
  B  
-		moImprBestFitAspirCrit   moNoAspirCrit   
moBestImprSelect   moItRandNextMove   
  R  
-
  C  
+		moHC   
  N  
+
moAlgo   moHCMoveLoopExpl   moNextMove   
moAspirCrit   
  I  
+		moNoAspirCrit   
  B  
+		moImprBestFitAspirCrit   
  R  
+
moBestImprSelect   moItRandNextMove   moRandImprSelect   
  C  
  L  
-		moRandImprSelect   
moCoolingSchedule   moLinearCoolingSchedule   moRandMove   
  E  
-		moLSCheckPoint   
  S  
-
EmptySelection   
  M  
-		moSA   
moExponentialCoolingSchedule   moMove   moSolContinue   
  F  
-		moMoveExpl   
  T  
-
moFirstImprSelect   moMoveIncrEval   moTabuList   
  G  
-		moMoveInit   moTS   
moGenSolContinue   moMoveLoopExpl   moTSMoveLoopExpl   
  H  
-

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

-

Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +moRandMove   moCoolingSchedule   moLinearCoolingSchedule   
  S  
+
  E  
+moLSCheckPoint   moSA   EmptySelection   
  M  
+moSimpleMoveTabuList   moExponentialCoolingSchedule   moMove   moSimpleSolutionTabuList   
  F  
+moMoveExpl   moSolContinue   moFirstImprSelect   moMoveIncrEval   
  T  
+
  G  
+moMoveInit   moTabuList   moGenSolContinue   moMoveLoopExpl   moTS   
  H  
+moMoveSelect   moTSMoveLoopExpl   

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

+

Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_algo.html b/trunk/paradiseo-mo/docs/html/classmo_algo.html index bfe0382e7..1fd08e748 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_algo.html +++ b/trunk/paradiseo-mo/docs/html/classmo_algo.html @@ -48,7 +48,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 Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html index 439a37e8e..d6ce19778 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html @@ -30,7 +30,7 @@

moAspirCrit< M > Member List

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

-
init()=0moAspirCrit< M > [pure virtual]

Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html index 44f701036..79e0f44b6 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html @@ -84,7 +84,7 @@ Implemented in moAspirCrit.h -
Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html index 40b95e7b9..791770d8e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html @@ -36,7 +36,7 @@ init(const Fitness &__fit)moBestImprSelect< M > [inline, virtual] operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline] update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html index f563a80ae..6b62afb7d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html @@ -178,7 +178,7 @@ References moBest

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html index f75d027f5..1002c3d81 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html @@ -51,7 +51,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 Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html index fb249a8c9..cdc83ab6f 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html @@ -33,7 +33,7 @@ operator()(double &__temp)moExponentialCoolingSchedule [inline] ratiomoExponentialCoolingSchedule [private] thresholdmoExponentialCoolingSchedule [private] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html index 6e5005522..396bd86aa 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html @@ -140,7 +140,7 @@ References moExponentialCoolingSchedule.h -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html index fbd2ad74a..812e03fc2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html @@ -38,7 +38,7 @@ update(const M &__move, const typename M::EOType::Fitness &__fit)moFirstImprSelect< M > [inline] moMoveSelect::update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual] validmoFirstImprSelect< M > [private] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html index eba713ddd..bb300fdf5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html @@ -209,7 +209,7 @@ References moFir

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html index 72f06b230..f185c60e5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html @@ -34,7 +34,7 @@ moGenSolContinue(unsigned __maxNumGen)moGenSolContinue< EOT > [inline] numGenmoGenSolContinue< EOT > [private] operator()(const EOT &__sol)moGenSolContinue< EOT > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html index 9a21f8d7d..4ba4f2a21 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html @@ -169,7 +169,7 @@ References moGenS

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html index 838bab937..0f59ef021 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html @@ -36,7 +36,7 @@ moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline] move_explmoHC< M > [private] operator()(EOT &__sol)moHC< M > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c.html b/trunk/paradiseo-mo/docs/html/classmo_h_c.html index 1137e1ab8..9d0da7ad1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c.html @@ -223,7 +223,7 @@ References moHC< M >::fu

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html index 8f19f2554..9bb528dd2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html @@ -37,7 +37,7 @@ move_selectmoHCMoveLoopExpl< M > [private] next_movemoHCMoveLoopExpl< M > [private] operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html index defb704dc..093bba6ec 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html @@ -187,7 +187,7 @@ References moHC

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html index 8f21344e2..d9c570122 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html @@ -35,7 +35,7 @@ init()moImprBestFitAspirCrit< M > [inline, virtual] moImprBestFitAspirCrit()moImprBestFitAspirCrit< M > [inline] operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html index 7a8053992..1b36d86d7 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html @@ -125,7 +125,7 @@ References moImprBestFitAspirCrit.h -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html index e101defaa..8f5c45f84 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html @@ -35,7 +35,7 @@ num_itermoItRandNextMove< M > [private] operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline] rand_movemoItRandNextMove< M > [private] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html index 49f92e3f1..9c15af121 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html @@ -167,7 +167,7 @@ References moItR

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html index 2cccedf30..87670ad9c 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html @@ -32,7 +32,7 @@ add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline] funcmoLSCheckPoint< M > [private] operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html index 7fd098a42..58c18ac26 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html @@ -140,7 +140,7 @@ References moLSChe

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html index 424e35571..a4fe87de1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html @@ -33,7 +33,7 @@ operator()(double &__temp)moLinearCoolingSchedule [inline] quantitymoLinearCoolingSchedule [private] thresholdmoLinearCoolingSchedule [private] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html index f5d0119be..867554352 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html @@ -140,7 +140,7 @@ References

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_move-members.html index e7f96125f..1904ddd8c 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move-members.html @@ -30,7 +30,7 @@

moMove< EOT > Member List

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

-
EOType typedefmoMove< EOT >

Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move.html b/trunk/paradiseo-mo/docs/html/classmo_move.html index e9402491b..7f2fa1741 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move.html @@ -53,7 +53,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 Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html index 28dade4e7..31944ca09 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html @@ -55,7 +55,7 @@ Only a description...See moMove

Definition at line 21 of file moMoveExpl.h.

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html b/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html index 7b3849c17..ebe225de8 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html @@ -48,7 +48,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 Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_init.html b/trunk/paradiseo-mo/docs/html/classmo_move_init.html index 31fb01fd5..ff8c41798 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_init.html @@ -48,7 +48,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 Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html index b04e0ab68..772bfd140 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html @@ -55,7 +55,7 @@ Only a description... moHCM

Definition at line 21 of file moMoveLoopExpl.h.

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html index cdf43659e..95964a41e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html @@ -32,7 +32,7 @@ Fitness typedefmoMoveSelect< M > init(const Fitness &__fit)=0moMoveSelect< M > [pure virtual] update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select.html b/trunk/paradiseo-mo/docs/html/classmo_move_select.html index 205a83305..a0f27df4b 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_select.html @@ -142,7 +142,7 @@ Implemented in moMoveSelect.h -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_next_move.html index bda978c66..bae4e229a 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_next_move.html @@ -53,7 +53,7 @@ Useful for the explorer (for moTS or <

Definition at line 22 of file moNextMove.h.

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html index 73ae51290..16410d523 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html @@ -31,7 +31,7 @@

moNoAspirCrit< M > Member List

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

-
init()moNoAspirCrit< M > [inline, private, virtual]
operator()(const M &__move, const typename M::EOType::Fitness &__sol)moNoAspirCrit< M > [inline, private]

Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html index b1074bafe..bf887053e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html @@ -131,7 +131,7 @@ Definition at line 4

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html index 99a04c02e..2c45a69fd 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html @@ -36,7 +36,7 @@ update(const M &__move, const Fitness &__fit)moRandImprSelect< M > [inline, virtual] vect_better_fitmoRandImprSelect< M > [private] vect_better_movesmoRandImprSelect< M > [private] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html index 774379e1b..f52a9e4f1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html @@ -214,7 +214,7 @@ References moRand

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html index 32d7b8051..fe79979b5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html @@ -48,7 +48,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 Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html index 24f3edd09..1ce5da82a 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html @@ -39,7 +39,7 @@ moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline] move_randmoSA< M > [private] operator()(EOT &__sol)moSA< M > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.html b/trunk/paradiseo-mo/docs/html/classmo_s_a.html index 7f5f74549..90f261313 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a.html @@ -201,7 +201,7 @@ References moSA< M >::co

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html new file mode 100644 index 000000000..94d730aca --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html @@ -0,0 +1,45 @@ + + +PARADISEO-MO: Member List + + + + +
+
+
+
+

moSimpleMoveTabuList< M > Member List

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

+ + + + + + + + + +
add(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
currentSizemoSimpleMoveTabuList< M > [private]
EOT typedefmoSimpleMoveTabuList< M >
init()moSimpleMoveTabuList< M > [inline, virtual]
maxSizemoSimpleMoveTabuList< M > [private]
moSimpleMoveTabuList(unsigned __size)moSimpleMoveTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline]
tabuListmoSimpleMoveTabuList< M > [private]
update()moSimpleMoveTabuList< M > [inline, virtual]

Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + +doxygen 1.5.1
+ + diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html new file mode 100644 index 000000000..edfc7f292 --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html @@ -0,0 +1,238 @@ + + +PARADISEO-MO: moSimpleMoveTabuList< M > Class Template Reference + + + + +
+
+
+
+

moSimpleMoveTabuList< M > Class Template Reference

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

+#include <moSimpleMoveTabuList.h> +

+

Inheritance diagram for moSimpleMoveTabuList< M >: +

+ +moTabuList< M > + +List of all members. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Public Types

+typedef M::EOType EOT
 Alias for the type.

Public Member Functions

+ moSimpleMoveTabuList (unsigned __size)
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
void add (const M &__move, const EOT &__sol)
 Procedure to add a move in the tabu list.
void update ()
 Procedure that updates the tabu list content.
void init ()
 Procedure which initialises the tabu list.

Private Attributes

+unsigned maxSize
 The maximum size of the tabu list.
+unsigned currentSize
 The current size of the tabu list.
+std::list< M > tabuList
 The move tabu list.
+

Detailed Description

+

template<class M>
+ class moSimpleMoveTabuList< M >

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

+ +

+Definition at line 22 of file moSimpleMoveTabuList.h.

Member Function Documentation

+ +
+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + +
bool moSimpleMoveTabuList< M >::operator() (const M &  __move,
const EOT &  __sol 
) [inline]
+
+
+ +

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

+

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

+Definition at line 46 of file moSimpleMoveTabuList.h. +

+References moSimpleMoveTabuList< M >::tabuList. +

+

+ +

+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + +
void moSimpleMoveTabuList< M >::add (const M &  __move,
const EOT &  __sol 
) [inline, virtual]
+
+
+ +

+Procedure to add a move in the tabu list. +

+The two parameters have not to be modified so they are constant parameters.

+

Parameters:
+ + + +
__move a new tabu move.
__sol the origianl solution associated to this move.
+
+ +

+Implements moTabuList< M >. +

+Definition at line 60 of file moSimpleMoveTabuList.h. +

+References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, and moSimpleMoveTabuList< M >::tabuList. +

+

+ +

+
+
+template<class M>
+ + + + + + + + +
void moSimpleMoveTabuList< M >::update (  )  [inline, virtual]
+
+
+ +

+Procedure that updates the tabu list content. +

+Generally, a counter associated to each saved move is decreased by one. +

+Implements moTabuList< M >. +

+Definition at line 75 of file moSimpleMoveTabuList.h. +

+

+ +

+
+
+template<class M>
+ + + + + + + + +
void moSimpleMoveTabuList< M >::init (  )  [inline, virtual]
+
+
+ +

+Procedure which initialises the tabu list. +

+Can be useful if the data structure needs to be allocated before being used. +

+Implements moTabuList< M >. +

+Definition at line 81 of file moSimpleMoveTabuList.h. +

+

+

The documentation for this class was generated from the following file: +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + +doxygen 1.5.1
+ + diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png new file mode 100644 index 000000000..e98058587 Binary files /dev/null and b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html new file mode 100644 index 000000000..79eb23ed9 --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html @@ -0,0 +1,45 @@ + + +PARADISEO-MO: Member List + + + + +
+
+
+
+

moSimpleSolutionTabuList< M > Member List

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

+ + + + + + + + + +
add(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
currentSizemoSimpleSolutionTabuList< M > [private]
EOT typedefmoSimpleSolutionTabuList< M >
init()moSimpleSolutionTabuList< M > [inline, virtual]
maxSizemoSimpleSolutionTabuList< M > [private]
moSimpleSolutionTabuList(unsigned __size)moSimpleSolutionTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline]
tabuListmoSimpleSolutionTabuList< M > [private]
update()moSimpleSolutionTabuList< M > [inline, virtual]

Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + +doxygen 1.5.1
+ + diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html new file mode 100644 index 000000000..e6a1d1062 --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html @@ -0,0 +1,271 @@ + + +PARADISEO-MO: moSimpleSolutionTabuList< M > Class Template Reference + + + + +
+
+
+
+

moSimpleSolutionTabuList< M > Class Template Reference

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

+#include <moSimpleSolutionTabuList.h> +

+

Inheritance diagram for moSimpleSolutionTabuList< M >: +

+ +moTabuList< M > + +List of all members. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Public Types

+typedef M::EOType EOT
 Alias for the type.

Public Member Functions

 moSimpleSolutionTabuList (unsigned __size)
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
void add (const M &__move, const EOT &__sol)
 Procedure to add a move in the tabu list.
void update ()
 Procedure that updates the tabu list content.
void init ()
 Procedure which initialises the tabu list.

Private Attributes

+unsigned maxSize
 The maximum size of the tabu list.
+unsigned currentSize
 The current size of the tabu list.
+std::list< EOT > tabuList
 The solution tabu list.
+

Detailed Description

+

template<class M>
+ class moSimpleSolutionTabuList< M >

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

+ +

+Definition at line 22 of file moSimpleSolutionTabuList.h.

Constructor & Destructor Documentation

+ +
+
+
+template<class M>
+ + + + + + + + + +
moSimpleSolutionTabuList< M >::moSimpleSolutionTabuList (unsigned  __size  )  [inline]
+
+
+ +

+Constructor. +

+

Parameters:
+ + +
__size The maximum size of the solution tabu list.
+
+ +

+Definition at line 34 of file moSimpleSolutionTabuList.h. +

+References moSimpleSolutionTabuList< M >::currentSize. +

+

+

Member Function Documentation

+ +
+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + +
bool moSimpleSolutionTabuList< M >::operator() (const M &  __move,
const EOT &  __sol 
) [inline]
+
+
+ +

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

+

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

+Definition at line 45 of file moSimpleSolutionTabuList.h. +

+References moSimpleSolutionTabuList< M >::tabuList. +

+

+ +

+
+
+template<class M>
+ + + + + + + + + + + + + + + + + + +
void moSimpleSolutionTabuList< M >::add (const M &  __move,
const EOT &  __sol 
) [inline, virtual]
+
+
+ +

+Procedure to add a move in the tabu list. +

+The two parameters have not to be modified so they are constant parameters.

+

Parameters:
+ + + +
__move a new tabu move.
__sol the origianl solution associated to this move.
+
+ +

+Implements moTabuList< M >. +

+Definition at line 64 of file moSimpleSolutionTabuList.h. +

+References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, and moSimpleSolutionTabuList< M >::tabuList. +

+

+ +

+
+
+template<class M>
+ + + + + + + + +
void moSimpleSolutionTabuList< M >::update (  )  [inline, virtual]
+
+
+ +

+Procedure that updates the tabu list content. +

+Generally, a counter associated to each saved move is decreased by one. +

+Implements moTabuList< M >. +

+Definition at line 84 of file moSimpleSolutionTabuList.h. +

+

+ +

+
+
+template<class M>
+ + + + + + + + +
void moSimpleSolutionTabuList< M >::init (  )  [inline, virtual]
+
+
+ +

+Procedure which initialises the tabu list. +

+Can be useful if the data structure needs to be allocated before being used. +

+Implements moTabuList< M >. +

+Definition at line 90 of file moSimpleSolutionTabuList.h. +

+

+

The documentation for this class was generated from the following file: +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + +doxygen 1.5.1
+ + diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png new file mode 100644 index 000000000..f08f987a9 Binary files /dev/null and b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html index 1ff73d268..abfad4fa9 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html @@ -30,7 +30,7 @@

moSolContinue< EOT > Member List

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

-
init()=0moSolContinue< EOT > [pure virtual]

Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html index b07967ab1..2de742e30 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html @@ -83,7 +83,7 @@ Implemented in moSolContinue.h -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html index 8556c84eb..74f277cba 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html @@ -39,7 +39,7 @@ move_explmoTS< M > [private] mutexmoTS< M > [private, static] operator()(EOT &__sol)moTS< M > [inline] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s.html b/trunk/paradiseo-mo/docs/html/classmo_t_s.html index ba0c47e0d..776ae6137 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s.html @@ -261,7 +261,7 @@ References moTS< M >::co

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html index 2eb6dd221..b4b27b548 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html @@ -39,7 +39,7 @@ next_movemoTSMoveLoopExpl< M > [private] operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline] tabu_listmoTSMoveLoopExpl< M > [private] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html index 8f98b65a5..95cf11620 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html @@ -205,7 +205,7 @@ References moTS

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html index fced2808d..d131657cd 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html @@ -33,7 +33,7 @@ EOT typedefmoTabuList< M > init()=0moTabuList< M > [pure virtual] update()=0moTabuList< M > [pure virtual] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html index 4579803b6..2f25e5c22 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html @@ -33,6 +33,12 @@

#include <moTabuList.h>

+

Inheritance diagram for moTabuList< M >: +

+ +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > + List of all members. @@ -92,14 +98,16 @@ template<class M>

Procedure to add a move in the tabu list.

-The two parameters have not to be modified so they are constant parameters

+The two parameters have not to be modified so they are constant parameters.

Parameters:

Public Types

- - + +
__move a new tabu move
__sol the solution associated to this move
__move a new tabu move.
__sol the origianl solution associated to this move.
+

+Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >.

@@ -123,6 +131,8 @@ template<class M> Procedure that updates the tabu list content.

Generally, a counter associated to each saved move is decreased by one. +

+Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >.

@@ -146,11 +156,13 @@ template<class M> Procedure which initialises the tabu list.

Can be useful if the data structure needs to be allocated before being used. +

+Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >.

The documentation for this class was generated from the following file: -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png new file mode 100644 index 000000000..7e8228b7f Binary files /dev/null and b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/files.html b/trunk/paradiseo-mo/docs/html/files.html index 7d2184e4d..381cca56a 100644 --- a/trunk/paradiseo-mo/docs/html/files.html +++ b/trunk/paradiseo-mo/docs/html/files.html @@ -48,12 +48,14 @@ moRandImprSelect.h [code] moRandMove.h [code] moSA.h [code] + moSimpleMoveTabuList.h [code] + moSimpleSolutionTabuList.h [code] moSolContinue.h [code] moTabuList.h [code] moTS.h [code] moTSMoveLoopExpl.h [code] -
Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/functions.html b/trunk/paradiseo-mo/docs/html/functions.html index 48b676330..9eeb31096 100644 --- a/trunk/paradiseo-mo/docs/html/functions.html +++ b/trunk/paradiseo-mo/docs/html/functions.html @@ -62,6 +62,8 @@ Here is a list of all documented class members with links to the class documenta
  • add() : moLSCheckPoint< M > , moTabuList< M > +, moSimpleSolutionTabuList< M > +, moSimpleMoveTabuList< M >
  • aspir_crit : moTSMoveLoopExpl< M > @@ -80,15 +82,20 @@ Here is a list of all documented class members with links to the class documenta , moTS< M >
  • cool_sched : moSA< M > +
  • currentSize +: moSimpleMoveTabuList< M > +, moSimpleSolutionTabuList< M >

    - e -

    - i -

    @@ -94,6 +102,8 @@ : moBestImprSelect< M > , moTSMoveLoopExpl< M > , moTS< M > +, moSimpleSolutionTabuList< M > +, moSimpleMoveTabuList< M > , moSA< M > , moRandImprSelect< M > , moNoAspirCrit< M > @@ -111,11 +121,13 @@
  • update() : moBestImprSelect< M > , moTabuList< M > +, moSimpleSolutionTabuList< M > +, moSimpleMoveTabuList< M > , moRandImprSelect< M > , moMoveSelect< M > , moFirstImprSelect< M > -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_type.html b/trunk/paradiseo-mo/docs/html/functions_type.html index 28bbe948c..a2573a45d 100644 --- a/trunk/paradiseo-mo/docs/html/functions_type.html +++ b/trunk/paradiseo-mo/docs/html/functions_type.html @@ -41,11 +41,13 @@ -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_vars.html b/trunk/paradiseo-mo/docs/html/functions_vars.html index 7c9b0e14c..991d47e0a 100644 --- a/trunk/paradiseo-mo/docs/html/functions_vars.html +++ b/trunk/paradiseo-mo/docs/html/functions_vars.html @@ -74,6 +74,9 @@ , moTS< M >
  • cool_sched : moSA< M > +
  • currentSize +: moSimpleMoveTabuList< M > +, moSimpleSolutionTabuList< M >

    - f -

    @@ -139,6 +145,9 @@

    - t -

    -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/hierarchy.html b/trunk/paradiseo-mo/docs/html/hierarchy.html index 8fd0d134a..df61f5453 100644 --- a/trunk/paradiseo-mo/docs/html/hierarchy.html +++ b/trunk/paradiseo-mo/docs/html/hierarchy.html @@ -75,8 +75,12 @@
  • moGenSolContinue< EOT >
  • moTabuList< M > + -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  + +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/index_8h-source.html b/trunk/paradiseo-mo/docs/html/index_8h-source.html index 37901a2ab..aa650f048 100644 --- a/trunk/paradiseo-mo/docs/html/index_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/index_8h-source.html @@ -27,7 +27,7 @@ 00024 // c-file-style: "Stroustrup" 00025 // fill-column: 80 00026 // End: -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/main.html b/trunk/paradiseo-mo/docs/html/main.html index b684821cb..31698a63d 100644 --- a/trunk/paradiseo-mo/docs/html/main.html +++ b/trunk/paradiseo-mo/docs/html/main.html @@ -32,7 +32,7 @@ Tutorial Installation The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.

    Overall Design

    -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_8h-source.html index 8b8fdc291..3f6e620e1 100644 --- a/trunk/paradiseo-mo/docs/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_8h-source.html @@ -64,7 +64,7 @@ 00041 #include "moTSMoveLoopExpl.h" 00042 00043 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html index ae2fa179a..6651e47a2 100644 --- a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html index 206c1f958..d8504731a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html @@ -51,7 +51,7 @@ 00035 }; 00036 00037 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html index ce3f15ddf..995fafad2 100644 --- a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html @@ -92,7 +92,7 @@ 00091 }; 00092 00093 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html index 4037b52c8..e6732e15b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html @@ -44,7 +44,7 @@ 00025 }; 00026 00027 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html index 9a5c9f9ee..defe4f237 100644 --- a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html @@ -60,7 +60,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html index 1b135de96..a7b637e28 100644 --- a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html @@ -99,7 +99,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html index b604e60cf..2e46db086 100644 --- a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html @@ -71,7 +71,7 @@ 00067 }; 00068 00069 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html index 7b236ea66..4a85c6f7f 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html @@ -125,7 +125,7 @@ 00131 }; 00132 00133 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html index b7af88a03..07297528c 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html @@ -108,7 +108,7 @@ 00106 }; 00107 00108 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html index 11fd23d46..9f88fca73 100644 --- a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -89,7 +89,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html index d7465960f..f54b45fe3 100644 --- a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html @@ -85,7 +85,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html index 6dff8143f..f4d1eeba4 100644 --- a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html @@ -73,7 +73,7 @@ 00064 }; 00065 00066 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html index 4fbe1692b..7a0b84483 100644 --- a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html @@ -60,7 +60,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html index e99429908..b6e4f058e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html @@ -47,7 +47,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html index 9655840bd..e5e92eb9c 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html @@ -47,7 +47,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html index 9dd5a49f7..bf1b4bf5b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html @@ -47,7 +47,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html index 05bd2ae1e..9ef2b285a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html @@ -45,7 +45,7 @@ 00026 }; 00027 00028 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html index 00d8d4fd2..6292f7869 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html index fabfedcc5..16c6a81c9 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html @@ -65,7 +65,7 @@ 00063 }; 00064 00065 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html index 90bd86cc0..a693e74d1 100644 --- a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html @@ -46,7 +46,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html index 0bbe82a2e..5e51c2384 100644 --- a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html @@ -56,7 +56,7 @@ 00046 }; 00047 00048 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html index 23a02ff8b..ddf21bb47 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html @@ -96,7 +96,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html index b47f6544c..54232b174 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html index 12366e3a3..765e2ab0a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html @@ -147,7 +147,7 @@ 00151 }; 00152 00153 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html new file mode 100644 index 000000000..05923a3b2 --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html @@ -0,0 +1,115 @@ + + +PARADISEO-MO: moSimpleMoveTabuList.h Source File + + + + +
    +
    +

    moSimpleMoveTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moSimpleMoveTabuList.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* LICENCE TEXT 
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moSimpleMoveTabuList_h
+00013 #define __moSimpleMoveTabuList_h
+00014 
+00015 #include <list>
+00016 #include <iterator>
+00017 
+00018 #include "moTabuList.h"
+00019 
+00021 template <class M>
+00022 class moSimpleMoveTabuList: public moTabuList < M >
+00023 {
+00024   
+00025 public:
+00026   
+00028   typedef typename M::EOType EOT;
+00029 
+00031   /*
+00032     \param __size The maximum size of the move tabu list.
+00033    */
+00034   moSimpleMoveTabuList(unsigned __size): maxSize(__size)
+00035   {
+00036     currentSize=0;
+00037   }
+00038 
+00040 
+00045   bool
+00046   operator () (const M & __move, const EOT & __sol) 
+00047   {
+00048     typename std::list<M>::iterator it;
+00049     
+00050     it=tabuList.begin();
+00051     while(it!=tabuList.end()&&(!((*it)==__move)))
+00052       {
+00053         it++;
+00054       }
+00055     
+00056     return it!=tabuList.end();
+00057   }
+00058   
+00059   void
+00060   add (const M & __move, const EOT & __sol)
+00061   {
+00062     tabuList.push_back(__move);
+00063     
+00064     if(currentSize==maxSize)
+00065       {
+00066         tabuList.erase(tabuList.begin());
+00067       }
+00068     else
+00069       {
+00070         currentSize++;
+00071       }
+00072   }
+00073   
+00074   void
+00075   update ()
+00076   {
+00077     //nothing to do
+00078   }
+00079 
+00080   void
+00081   init ()
+00082   {
+00083     //nothing to do
+00084   }
+00085 
+00086 private:
+00087   
+00089   unsigned maxSize;
+00090 
+00092   unsigned currentSize;
+00093   
+00095   std::list<M> tabuList;
+00096 };
+00097 
+00098 #endif
+
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + +doxygen 1.5.1
    + + diff --git a/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html new file mode 100644 index 000000000..0dc4f5207 --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html @@ -0,0 +1,122 @@ + + +PARADISEO-MO: moSimpleSolutionTabuList.h Source File + + + + +
    +
    +

    moSimpleSolutionTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moSimpleSolutionTabuList.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* LICENCE TEXT 
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moSimpleSolutionTabuList_h
+00013 #define __moSimpleSolutionTabuList_h
+00014 
+00015 #include <list>
+00016 #include <iterator>
+00017 
+00018 #include "moTabuList.h"
+00019 
+00021 template <class M>
+00022 class moSimpleSolutionTabuList: public moTabuList < M >
+00023 {
+00024   
+00025 public:
+00026 
+00028   typedef typename M::EOType EOT;
+00029   
+00031 
+00034   moSimpleSolutionTabuList(unsigned __size): maxSize(__size)
+00035   {
+00036     currentSize=0;
+00037   }
+00038   
+00040 
+00045   bool operator () (const M & __move, const EOT & __sol) 
+00046   {
+00047     typename std::list<EOT>::iterator it;
+00048   
+00049     M _move=(M)__move;
+00050     EOT _sol=(EOT) __sol;
+00051 
+00052     _move(_sol);
+00053   
+00054     it=tabuList.begin();
+00055     while(it!=tabuList.end()&&(!((*it)==_sol)))
+00056       {
+00057         it++;
+00058       }
+00059     
+00060     return it!=tabuList.end();
+00061   }
+00062   
+00063   void
+00064   add (const M & __move, const EOT & __sol)
+00065   {
+00066     M _move=(M)__move;
+00067     EOT _sol=(EOT) _sol;
+00068     
+00069     _move(_sol);
+00070     
+00071     tabuList.push_back(_sol);
+00072     
+00073     if(currentSize==maxSize)
+00074       {
+00075         tabuList.erase(tabuList.begin());
+00076       }
+00077     else
+00078       {
+00079         currentSize++;
+00080       }
+00081   }
+00082 
+00083   void
+00084   update ()
+00085   {
+00086     //nothing to do
+00087   }
+00088 
+00089   void
+00090   init ()
+00091   {
+00092     //nothing to do
+00093   }
+00094 
+00095 private:
+00096   
+00098   unsigned maxSize;
+00099 
+00101   unsigned currentSize;
+00102   
+00104   std::list<EOT> tabuList;
+00105 };
+00106 
+00107 #endif
+
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + +doxygen 1.5.1
    + + diff --git a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html index a8c147b19..f2442ad3d 100644 --- a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html @@ -47,7 +47,7 @@ 00031 }; 00032 00033 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html index 91396374c..7310ef501 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html @@ -167,7 +167,7 @@ 00182 template < class EOT > bool moTS < EOT >::first_time = true; 00183 00184 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html index 6a86f4f93..c874cc334 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html @@ -127,7 +127,7 @@ 00130 }; 00131 00132 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html index 8e3945c79..9cb2c2ebe 100644 --- a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html @@ -44,27 +44,23 @@ 00025 { 00026 00027 public: -00029 typedef -00030 typename -00031 M::EOType -00032 EOT; -00033 -00034 -00036 -00042 virtual void -00043 add (const M & __move, const EOT & __sol) = 0; -00044 -00046 -00049 virtual void -00050 update () = 0; -00051 -00053 -00056 virtual void -00057 init () = 0; -00058 }; -00059 -00060 #endif -
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  +00029 typedef typename M::EOType EOT; +00030 +00032 +00038 virtual void +00039 add (const M & __move, const EOT & __sol) = 0; +00040 +00042 +00045 virtual void +00046 update () = 0; +00047 +00049 +00052 virtual void +00053 init () = 0; +00054 }; +00055 +00056 #endif +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/search.idx b/trunk/paradiseo-mo/docs/html/search.idx index a5a4e9752..788a702c0 100644 Binary files a/trunk/paradiseo-mo/docs/html/search.idx and b/trunk/paradiseo-mo/docs/html/search.idx differ diff --git a/trunk/paradiseo-mo/docs/html/search.php b/trunk/paradiseo-mo/docs/html/search.php index a5fe19b43..e0ab16375 100644 --- a/trunk/paradiseo-mo/docs/html/search.php +++ b/trunk/paradiseo-mo/docs/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  +
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/tree.html b/trunk/paradiseo-mo/docs/html/tree.html index 8abd43c05..f8a0d5b87 100644 --- a/trunk/paradiseo-mo/docs/html/tree.html +++ b/trunk/paradiseo-mo/docs/html/tree.html @@ -91,6 +91,8 @@

    |o*moRandImprSelect< M >

    |o*moRandMove< M >

    |o*moSA< M >

    +

    |o*moSimpleMoveTabuList< M >

    +

    |o*moSimpleSolutionTabuList< M >

    |o*moSolContinue< EOT >

    |o*moTabuList< M >

    |o*moTS< M >

    @@ -143,11 +145,15 @@ -

    |\*moTabuList< M >

    +

    |\+moTabuList< M >

    +

    o*Class Members

    -

    \+File List

    -
    +

    \+File List

    +

     o*index.h

     o*mo.h

     o*moAlgo.h

    @@ -174,6 +180,8 @@

     o*moRandImprSelect.h

     o*moRandMove.h

     o*moSA.h

    +

     o*moSimpleMoveTabuList.h

    +

     o*moSimpleSolutionTabuList.h

     o*moSolContinue.h

     o*moTabuList.h

     o*moTS.h

    diff --git a/trunk/paradiseo-mo/docs/latex/annotated.tex b/trunk/paradiseo-mo/docs/latex/annotated.tex index 7bad31b4d..e62c103d2 100644 --- a/trunk/paradiseo-mo/docs/latex/annotated.tex +++ b/trunk/paradiseo-mo/docs/latex/annotated.tex @@ -25,6 +25,8 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be \item\contentsline{section}{{\bf mo\-Rand\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} \item\contentsline{section}{{\bf mo\-Rand\-Move$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} \item\contentsline{section}{{\bf mo\-SA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} +\item\contentsline{section}{{\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} +\item\contentsline{section}{{\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} \item\contentsline{section}{{\bf mo\-Sol\-Continue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} \item\contentsline{section}{{\bf mo\-Tabu\-List$<$ M $>$} (Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} \item\contentsline{section}{{\bf mo\-TS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps new file mode 100644 index 000000000..624cb75de --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 213.904 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.3375 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moSimpleMoveTabuList< M >) cw +(moTabuList< M >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moSimpleMoveTabuList< M >) 0 0 box + (moTabuList< M >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex new file mode 100644 index 000000000..53b07034f --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex @@ -0,0 +1,122 @@ +\section{mo\-Simple\-Move\-Tabu\-List$<$ M $>$ Class Template Reference} +\label{classmo_simple_move_tabu_list}\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}} +Class describing a move tabu list with a limited memory. + + +{\tt \#include $<$mo\-Simple\-Move\-Tabu\-List.h$>$} + +Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_simple_move_tabu_list} +\end{center} +\end{figure} +\subsection*{Public Types} +\begin{CompactItemize} +\item +typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7} + +\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf mo\-Simple\-Move\-Tabu\-List} (unsigned \_\-\_\-size)\label{classmo_simple_move_tabu_list_d29bb1cfc8d1fd2de1cccf821d066b66} + +\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item +bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item +void {\bf update} () +\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item +void {\bf init} () +\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +unsigned {\bf max\-Size}\label{classmo_simple_move_tabu_list_9f4860b378366e774c61a0d2034811e1} + +\begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item +unsigned {\bf current\-Size}\label{classmo_simple_move_tabu_list_bd417b084e01343cba914a8193dab3a1} + +\begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item +std::list$<$ M $>$ {\bf tabu\-List}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} + +\begin{CompactList}\small\item\em The move tabu list. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class M$>$ class mo\-Simple\-Move\-Tabu\-List$<$ M $>$} + +Class describing a move tabu list with a limited memory. + + + +Definition at line 22 of file mo\-Simple\-Move\-Tabu\-List.h. + +\subsection{Member Function Documentation} +\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} + + +Function that indicates if, in a given state, the \_\-move is tabu or not. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]true or false. \end{Desc} + + +Definition at line 46 of file mo\-Simple\-Move\-Tabu\-List.h. + +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!add@{add}} +\index{add@{add}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} + + +Procedure to add a move in the tabu list. + +The two parameters have not to be modified so they are constant parameters. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move}]a new tabu move. \item[{\em \_\-\_\-sol}]the origianl solution associated to this move. \end{description} +\end{Desc} + + +Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. + +Definition at line 60 of file mo\-Simple\-Move\-Tabu\-List.h. + +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}} +\index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} + + +Procedure that updates the tabu list content. + +Generally, a counter associated to each saved move is decreased by one. + +Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. + +Definition at line 75 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}} +\index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} + + +Procedure which initialises the tabu list. + +Can be useful if the data structure needs to be allocated before being used. + +Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. + +Definition at line 81 of file mo\-Simple\-Move\-Tabu\-List.h. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +mo\-Simple\-Move\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps new file mode 100644 index 000000000..e46012fd0 --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 200 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moSimpleSolutionTabuList< M >) cw +(moTabuList< M >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moSimpleSolutionTabuList< M >) 0 0 box + (moTabuList< M >) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex new file mode 100644 index 000000000..1849bfca9 --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex @@ -0,0 +1,140 @@ +\section{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$ Class Template Reference} +\label{classmo_simple_solution_tabu_list}\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +Class describing a solution tabu list with limited length. + + +{\tt \#include $<$mo\-Simple\-Solution\-Tabu\-List.h$>$} + +Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_simple_solution_tabu_list} +\end{center} +\end{figure} +\subsection*{Public Types} +\begin{CompactItemize} +\item +typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} + +\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf mo\-Simple\-Solution\-Tabu\-List} (unsigned \_\-\_\-size) +\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item +bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item +void {\bf update} () +\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item +void {\bf init} () +\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +unsigned {\bf max\-Size}\label{classmo_simple_solution_tabu_list_d059072e23ba086ede801abdd32f7218} + +\begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item +unsigned {\bf current\-Size}\label{classmo_simple_solution_tabu_list_ddc7196b9adcba0081810619a978490c} + +\begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item +std::list$<$ {\bf EOT} $>$ {\bf tabu\-List}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} + +\begin{CompactList}\small\item\em The solution tabu list. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class M$>$ class mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} + +Class describing a solution tabu list with limited length. + + + +Definition at line 22 of file mo\-Simple\-Solution\-Tabu\-List.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::{\bf mo\-Simple\-Solution\-Tabu\-List} (unsigned {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_24576bd9a907b8925c7d7d5ce6fde445} + + +Constructor. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-size}]The maximum size of the solution tabu list. \end{description} +\end{Desc} + + +Definition at line 34 of file mo\-Simple\-Solution\-Tabu\-List.h. + +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size. + +\subsection{Member Function Documentation} +\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} + + +Function that indicates if, in a given state, the \_\-move is tabu or not. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]true or false. \end{Desc} + + +Definition at line 45 of file mo\-Simple\-Solution\-Tabu\-List.h. + +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!add@{add}} +\index{add@{add}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} + + +Procedure to add a move in the tabu list. + +The two parameters have not to be modified so they are constant parameters. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move}]a new tabu move. \item[{\em \_\-\_\-sol}]the origianl solution associated to this move. \end{description} +\end{Desc} + + +Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. + +Definition at line 64 of file mo\-Simple\-Solution\-Tabu\-List.h. + +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}} +\index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} + + +Procedure that updates the tabu list content. + +Generally, a counter associated to each saved move is decreased by one. + +Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. + +Definition at line 84 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}} +\index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} + + +Procedure which initialises the tabu list. + +Can be useful if the data structure needs to be allocated before being used. + +Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. + +Definition at line 90 of file mo\-Simple\-Solution\-Tabu\-List.h. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +mo\-Simple\-Solution\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps new file mode 100644 index 000000000..63ca07c99 --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps @@ -0,0 +1,203 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 100 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 5 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 2 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moTabuList< M >) cw +(moSimpleMoveTabuList< M >) cw +(moSimpleSolutionTabuList< M >) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moTabuList< M >) 0.5 1 box + (moSimpleMoveTabuList< M >) 0 0 box + (moSimpleSolutionTabuList< M >) 1 0 box + +% ----- relations ----- + +solid +1 0.5 0.25 out +solid +0 1 1 conn +solid +0 0 0.75 in +solid +0 1 0.75 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex index 5341527b7..e0ec56b3b 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex @@ -5,6 +5,12 @@ Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. {\tt \#include $<$mo\-Tabu\-List.h$>$} +Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_tabu_list} +\end{center} +\end{figure} \subsection*{Public Types} \begin{CompactItemize} \item @@ -41,21 +47,25 @@ Definition at line 22 of file mo\-Tabu\-List.h. Procedure to add a move in the tabu list. -The two parameters have not to be modified so they are constant parameters +The two parameters have not to be modified so they are constant parameters. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]a new tabu move \item[{\em \_\-\_\-sol}]the solution associated to this move \end{description} +\item[{\em \_\-\_\-move}]a new tabu move. \item[{\em \_\-\_\-sol}]the origianl solution associated to this move. \end{description} \end{Desc} -\index{moTabuList@{mo\-Tabu\-List}!update@{update}} + + +Implemented in {\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and {\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{mo\-Tabu\-List}!update@{update}} \index{update@{update}!moTabuList@{mo\-Tabu\-List}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} Procedure that updates the tabu list content. -Generally, a counter associated to each saved move is decreased by one. \index{moTabuList@{mo\-Tabu\-List}!init@{init}} +Generally, a counter associated to each saved move is decreased by one. + +Implemented in {\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{mo\-Tabu\-List}!init@{init}} \index{init@{init}!moTabuList@{mo\-Tabu\-List}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} @@ -64,6 +74,8 @@ Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. +Implemented in {\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. + The documentation for this class was generated from the following file:\begin{CompactItemize} \item mo\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/doxygen.sty b/trunk/paradiseo-mo/docs/latex/doxygen.sty index 3478fc768..d6b71a45a 100644 --- a/trunk/paradiseo-mo/docs/latex/doxygen.sty +++ b/trunk/paradiseo-mo/docs/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/docs/latex/hierarchy.tex b/trunk/paradiseo-mo/docs/latex/hierarchy.tex index d6a58bf5a..c8f8136cd 100644 --- a/trunk/paradiseo-mo/docs/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/docs/latex/hierarchy.tex @@ -46,4 +46,8 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} \end{CompactList} \item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} +\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} +\end{CompactList} \end{CompactList} diff --git a/trunk/paradiseo-mo/docs/latex/refman.tex b/trunk/paradiseo-mo/docs/latex/refman.tex index 9f3937ba0..13c6527e1 100644 --- a/trunk/paradiseo-mo/docs/latex/refman.tex +++ b/trunk/paradiseo-mo/docs/latex/refman.tex @@ -19,7 +19,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.5.1}\\ \vspace*{0.5cm} -{\small Wed Apr 18 10:15:03 2007}\\ +{\small Thu Apr 19 15:16:09 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -59,6 +59,8 @@ \include{classmo_rand_impr_select} \include{classmo_rand_move} \include{classmo_s_a} +\include{classmo_simple_move_tabu_list} +\include{classmo_simple_solution_tabu_list} \include{classmo_sol_continue} \include{classmo_tabu_list} \include{classmo_t_s} diff --git a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 index 0f921b82c..425dad60c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 +++ b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 @@ -1,4 +1,4 @@ -.TH "EmptySelection" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 index 075b788cc..bd02fa2e6 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 @@ -1,4 +1,4 @@ -.TH "moAlgo" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 index 2651c5685..81caf0090 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moAspirCrit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 index 01cb1515f..42292f557 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moBestImprSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 index ef0b01fdd..c9f040442 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moCoolingSchedule" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 index 2f96c712b..e11f01b41 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moExponentialCoolingSchedule" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 index 8d04a0689..962cd5d28 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moFirstImprSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 index 0ce321bdf..a3cc4f1e0 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moGenSolContinue" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moHC.3 b/trunk/paradiseo-mo/docs/man/man3/moHC.3 index 426ce9247..400cbdef3 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHC.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHC.3 @@ -1,4 +1,4 @@ -.TH "moHC" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 index e3c737164..93a825d79 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moHCMoveLoopExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 index 5f5172b03..1719c1ab1 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moImprBestFitAspirCrit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 index 917b0be43..99e4b23cd 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 @@ -1,4 +1,4 @@ -.TH "moItRandNextMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 index 67671ca24..29859a6da 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 @@ -1,4 +1,4 @@ -.TH "moLSCheckPoint" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 index bdaf31121..b15a3269c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moLinearCoolingSchedule" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMove.3 b/trunk/paradiseo-mo/docs/man/man3/moMove.3 index b7390ae29..babea4fea 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMove.3 @@ -1,4 +1,4 @@ -.TH "moMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 index c4a3840a8..27037b4c3 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 index 0eb298d92..b3dc54091 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 @@ -1,4 +1,4 @@ -.TH "moMoveIncrEval" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 index 2cb87036e..003697d59 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 @@ -1,4 +1,4 @@ -.TH "moMoveInit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 index 5e09ada7b..e0e2e2f59 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveLoopExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 index faa52d0a1..871b8410c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 @@ -1,4 +1,4 @@ -.TH "moMoveSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 index da06276f7..aa303f013 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 @@ -1,4 +1,4 @@ -.TH "moNextMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 index a20da9d3c..aded95899 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moNoAspirCrit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 index 05f0460fc..f2f4d58ea 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moRandImprSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 index a54198844..9c0e9cf19 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 @@ -1,4 +1,4 @@ -.TH "moRandMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moSA.3 b/trunk/paradiseo-mo/docs/man/man3/moSA.3 index 5be16a09e..6994caeb0 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSA.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSA.3 @@ -1,4 +1,4 @@ -.TH "moSA" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 new file mode 100644 index 000000000..807b514e1 --- /dev/null +++ b/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 @@ -0,0 +1,134 @@ +.TH "moSimpleMoveTabuList" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.ad l +.nh +.SH NAME +moSimpleMoveTabuList \- Class describing a move tabu list with a limited memory. + +.PP +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +Inherits \fBmoTabuList< M >< M >\fP. +.PP +.SS "Public Types" + +.in +1c +.ti -1c +.RI "typedef M::EOType \fBEOT\fP" +.br +.RI "\fIAlias for the type. \fP" +.in -1c +.SS "Public Member Functions" + +.in +1c +.ti -1c +.RI "\fBmoSimpleMoveTabuList\fP (unsigned __size)" +.br +.RI "\fIConstructor. \fP" +.ti -1c +.RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)" +.br +.RI "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP" +.ti -1c +.RI "void \fBadd\fP (const M &__move, const \fBEOT\fP &__sol)" +.br +.RI "\fIProcedure to add a move in the tabu list. \fP" +.ti -1c +.RI "void \fBupdate\fP ()" +.br +.RI "\fIProcedure that updates the tabu list content. \fP" +.ti -1c +.RI "void \fBinit\fP ()" +.br +.RI "\fIProcedure which initialises the tabu list. \fP" +.in -1c +.SS "Private Attributes" + +.in +1c +.ti -1c +.RI "unsigned \fBmaxSize\fP" +.br +.RI "\fIThe maximum size of the tabu list. \fP" +.ti -1c +.RI "unsigned \fBcurrentSize\fP" +.br +.RI "\fIThe current size of the tabu list. \fP" +.ti -1c +.RI "std::list< M > \fBtabuList\fP" +.br +.RI "\fIThe move tabu list. \fP" +.in -1c +.SH "Detailed Description" +.PP + +.SS "template class moSimpleMoveTabuList< M >" +Class describing a move tabu list with a limited memory. +.PP +Definition at line 22 of file moSimpleMoveTabuList.h. +.SH "Member Function Documentation" +.PP +.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" +.PP +Function that indicates if, in a given state, the _move is tabu or not. +.PP +\fBParameters:\fP +.RS 4 +\fI__move\fP A given \fBmoMove\fP. +.br +\fI__sol\fP A solution. +.RE +.PP +\fBReturns:\fP +.RS 4 +true or false. +.RE +.PP + +.PP +Definition at line 46 of file moSimpleMoveTabuList.h. +.PP +References moSimpleMoveTabuList< M >::tabuList. +.SS "template void \fBmoSimpleMoveTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.PP +Procedure to add a move in the tabu list. +.PP +The two parameters have not to be modified so they are constant parameters. +.PP +\fBParameters:\fP +.RS 4 +\fI__move\fP a new tabu move. +.br +\fI__sol\fP the origianl solution associated to this move. +.RE +.PP + +.PP +Implements \fBmoTabuList< M >\fP. +.PP +Definition at line 60 of file moSimpleMoveTabuList.h. +.PP +References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, and moSimpleMoveTabuList< M >::tabuList. +.SS "template void \fBmoSimpleMoveTabuList\fP< M >::update ()\fC [inline, virtual]\fP" +.PP +Procedure that updates the tabu list content. +.PP +Generally, a counter associated to each saved move is decreased by one. +.PP +Implements \fBmoTabuList< M >\fP. +.PP +Definition at line 75 of file moSimpleMoveTabuList.h. +.SS "template void \fBmoSimpleMoveTabuList\fP< M >::init ()\fC [inline, virtual]\fP" +.PP +Procedure which initialises the tabu list. +.PP +Can be useful if the data structure needs to be allocated before being used. +.PP +Implements \fBmoTabuList< M >\fP. +.PP +Definition at line 81 of file moSimpleMoveTabuList.h. + +.SH "Author" +.PP +Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 new file mode 100644 index 000000000..4e9b78d3b --- /dev/null +++ b/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 @@ -0,0 +1,150 @@ +.TH "moSimpleSolutionTabuList" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.ad l +.nh +.SH NAME +moSimpleSolutionTabuList \- Class describing a solution tabu list with limited length. + +.PP +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +Inherits \fBmoTabuList< M >< M >\fP. +.PP +.SS "Public Types" + +.in +1c +.ti -1c +.RI "typedef M::EOType \fBEOT\fP" +.br +.RI "\fIAlias for the type. \fP" +.in -1c +.SS "Public Member Functions" + +.in +1c +.ti -1c +.RI "\fBmoSimpleSolutionTabuList\fP (unsigned __size)" +.br +.RI "\fIConstructor. \fP" +.ti -1c +.RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)" +.br +.RI "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP" +.ti -1c +.RI "void \fBadd\fP (const M &__move, const \fBEOT\fP &__sol)" +.br +.RI "\fIProcedure to add a move in the tabu list. \fP" +.ti -1c +.RI "void \fBupdate\fP ()" +.br +.RI "\fIProcedure that updates the tabu list content. \fP" +.ti -1c +.RI "void \fBinit\fP ()" +.br +.RI "\fIProcedure which initialises the tabu list. \fP" +.in -1c +.SS "Private Attributes" + +.in +1c +.ti -1c +.RI "unsigned \fBmaxSize\fP" +.br +.RI "\fIThe maximum size of the tabu list. \fP" +.ti -1c +.RI "unsigned \fBcurrentSize\fP" +.br +.RI "\fIThe current size of the tabu list. \fP" +.ti -1c +.RI "std::list< \fBEOT\fP > \fBtabuList\fP" +.br +.RI "\fIThe solution tabu list. \fP" +.in -1c +.SH "Detailed Description" +.PP + +.SS "template class moSimpleSolutionTabuList< M >" +Class describing a solution tabu list with limited length. +.PP +Definition at line 22 of file moSimpleSolutionTabuList.h. +.SH "Constructor & Destructor Documentation" +.PP +.SS "template \fBmoSimpleSolutionTabuList\fP< M >::\fBmoSimpleSolutionTabuList\fP (unsigned __size)\fC [inline]\fP" +.PP +Constructor. +.PP +\fBParameters:\fP +.RS 4 +\fI__size\fP The maximum size of the solution tabu list. +.RE +.PP + +.PP +Definition at line 34 of file moSimpleSolutionTabuList.h. +.PP +References moSimpleSolutionTabuList< M >::currentSize. +.SH "Member Function Documentation" +.PP +.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" +.PP +Function that indicates if, in a given state, the _move is tabu or not. +.PP +\fBParameters:\fP +.RS 4 +\fI__move\fP A given \fBmoMove\fP. +.br +\fI__sol\fP A solution. +.RE +.PP +\fBReturns:\fP +.RS 4 +true or false. +.RE +.PP + +.PP +Definition at line 45 of file moSimpleSolutionTabuList.h. +.PP +References moSimpleSolutionTabuList< M >::tabuList. +.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.PP +Procedure to add a move in the tabu list. +.PP +The two parameters have not to be modified so they are constant parameters. +.PP +\fBParameters:\fP +.RS 4 +\fI__move\fP a new tabu move. +.br +\fI__sol\fP the origianl solution associated to this move. +.RE +.PP + +.PP +Implements \fBmoTabuList< M >\fP. +.PP +Definition at line 64 of file moSimpleSolutionTabuList.h. +.PP +References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, and moSimpleSolutionTabuList< M >::tabuList. +.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::update ()\fC [inline, virtual]\fP" +.PP +Procedure that updates the tabu list content. +.PP +Generally, a counter associated to each saved move is decreased by one. +.PP +Implements \fBmoTabuList< M >\fP. +.PP +Definition at line 84 of file moSimpleSolutionTabuList.h. +.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::init ()\fC [inline, virtual]\fP" +.PP +Procedure which initialises the tabu list. +.PP +Can be useful if the data structure needs to be allocated before being used. +.PP +Implements \fBmoTabuList< M >\fP. +.PP +Definition at line 90 of file moSimpleSolutionTabuList.h. + +.SH "Author" +.PP +Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 index 0300649cc..be05e37f8 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSolContinue" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moTS.3 b/trunk/paradiseo-mo/docs/man/man3/moTS.3 index 6a9435623..f27b8548b 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTS.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTS.3 @@ -1,4 +1,4 @@ -.TH "moTS" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 index f80192a75..913fc5746 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moTSMoveLoopExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 index 637fd304f..554e495e1 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 @@ -1,4 +1,4 @@ -.TH "moTabuList" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP +Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. +.PP .SS "Public Types" .in +1c @@ -49,26 +51,32 @@ Definition at line 22 of file moTabuList.h. .PP Procedure to add a move in the tabu list. .PP -The two parameters have not to be modified so they are constant parameters +The two parameters have not to be modified so they are constant parameters. .PP \fBParameters:\fP .RS 4 -\fI__move\fP a new tabu move +\fI__move\fP a new tabu move. .br -\fI__sol\fP the solution associated to this move +\fI__sol\fP the origianl solution associated to this move. .RE .PP +.PP +Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .SS "template virtual void \fBmoTabuList\fP< M >::update ()\fC [pure virtual]\fP" .PP Procedure that updates the tabu list content. .PP Generally, a counter associated to each saved move is decreased by one. +.PP +Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .SS "template virtual void \fBmoTabuList\fP< M >::init ()\fC [pure virtual]\fP" .PP Procedure which initialises the tabu list. .PP Can be useful if the data structure needs to be allocated before being used. +.PP +Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/docs/mo.doxytag b/trunk/paradiseo-mo/docs/mo.doxytag index f6e35d43f..24e55592e 100644 --- a/trunk/paradiseo-mo/docs/mo.doxytag +++ b/trunk/paradiseo-mo/docs/mo.doxytag @@ -717,6 +717,144 @@ + + moSimpleMoveTabuList + classmo_simple_move_tabu_list.html + M + moTabuList + + M::EOType + EOT + classmo_simple_move_tabu_list.html + 91286ff3ba6b1e9e1db9e4fdade2edb7 + + + + + moSimpleMoveTabuList + classmo_simple_move_tabu_list.html + d29bb1cfc8d1fd2de1cccf821d066b66 + (unsigned __size) + + + bool + operator() + classmo_simple_move_tabu_list.html + bb7fe9da28617f56734af71c42c8265a + (const M &__move, const EOT &__sol) + + + void + add + classmo_simple_move_tabu_list.html + 43c979a9ec876c5e5b591b1c422395ef + (const M &__move, const EOT &__sol) + + + void + update + classmo_simple_move_tabu_list.html + 96cffc8118456ed762b07b9fc0e0679f + () + + + void + init + classmo_simple_move_tabu_list.html + b91ae9971be30769757d1ad92c6009dc + () + + + unsigned + maxSize + classmo_simple_move_tabu_list.html + 9f4860b378366e774c61a0d2034811e1 + + + + unsigned + currentSize + classmo_simple_move_tabu_list.html + bd417b084e01343cba914a8193dab3a1 + + + + std::list< M > + tabuList + classmo_simple_move_tabu_list.html + d91bc838361524720616b44eda9b2c3a + + + + + moSimpleSolutionTabuList + classmo_simple_solution_tabu_list.html + M + moTabuList + + M::EOType + EOT + classmo_simple_solution_tabu_list.html + 881060871a6b49e5e8554c5df85176d9 + + + + + moSimpleSolutionTabuList + classmo_simple_solution_tabu_list.html + 24576bd9a907b8925c7d7d5ce6fde445 + (unsigned __size) + + + bool + operator() + classmo_simple_solution_tabu_list.html + e1f1cf258b55554d8be88fb5780a0047 + (const M &__move, const EOT &__sol) + + + void + add + classmo_simple_solution_tabu_list.html + fd6b3a1764121169650c969bba895615 + (const M &__move, const EOT &__sol) + + + void + update + classmo_simple_solution_tabu_list.html + 91b8b01dba7ffea8b63765d931e56f56 + () + + + void + init + classmo_simple_solution_tabu_list.html + d5645c39fec71a6110a2cbccbb08b816 + () + + + unsigned + maxSize + classmo_simple_solution_tabu_list.html + d059072e23ba086ede801abdd32f7218 + + + + unsigned + currentSize + classmo_simple_solution_tabu_list.html + ddc7196b9adcba0081810619a978490c + + + + std::list< EOT > + tabuList + classmo_simple_solution_tabu_list.html + 75df9cd683528d3722d02bac407b710b + + + moSolContinue classmo_sol_continue.html diff --git a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h new file mode 100755 index 000000000..f0e501782 --- /dev/null +++ b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h @@ -0,0 +1,98 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moSimpleMoveTabuList.h" + +// (c) OPAC Team, LIFL, 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moSimpleMoveTabuList_h +#define __moSimpleMoveTabuList_h + +#include +#include + +#include "moTabuList.h" + +//! Class describing a move tabu list with a limited memory. +template +class moSimpleMoveTabuList: public moTabuList < M > +{ + +public: + + //! Alias for the type + typedef typename M::EOType EOT; + + //! Constructor + /* + \param __size The maximum size of the move tabu list. + */ + moSimpleMoveTabuList(unsigned __size): maxSize(__size) + { + currentSize=0; + } + + //! Function that indicates if, in a given state, the _move is tabu or not. + /*! + \param __move A given moMove. + \param __sol A solution. + \return true or false. + */ + bool + operator () (const M & __move, const EOT & __sol) + { + typename std::list::iterator it; + + it=tabuList.begin(); + while(it!=tabuList.end()&&(!((*it)==__move))) + { + it++; + } + + return it!=tabuList.end(); + } + + void + add (const M & __move, const EOT & __sol) + { + tabuList.push_back(__move); + + if(currentSize==maxSize) + { + tabuList.erase(tabuList.begin()); + } + else + { + currentSize++; + } + } + + void + update () + { + //nothing to do + } + + void + init () + { + //nothing to do + } + +private: + + //! The maximum size of the tabu list. + unsigned maxSize; + + //! The current size of the tabu list. + unsigned currentSize; + + //! The move tabu list. + std::list tabuList; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h new file mode 100755 index 000000000..6bf44b969 --- /dev/null +++ b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h @@ -0,0 +1,107 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moSimpleSolutionTabuList.h" + +// (c) OPAC Team, LIFL, 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moSimpleSolutionTabuList_h +#define __moSimpleSolutionTabuList_h + +#include +#include + +#include "moTabuList.h" + +//! Class describing a solution tabu list with limited length. +template +class moSimpleSolutionTabuList: public moTabuList < M > +{ + +public: + + //! Alias for the type + typedef typename M::EOType EOT; + + //! Constructor + /*! + \param __size The maximum size of the solution tabu list. + */ + moSimpleSolutionTabuList(unsigned __size): maxSize(__size) + { + currentSize=0; + } + + //! Function that indicates if, in a given state, the _move is tabu or not. + /*! + \param __move A given moMove. + \param __sol A solution. + \return true or false. + */ + bool operator () (const M & __move, const EOT & __sol) + { + typename std::list::iterator it; + + M _move=(M)__move; + EOT _sol=(EOT) __sol; + + _move(_sol); + + it=tabuList.begin(); + while(it!=tabuList.end()&&(!((*it)==_sol))) + { + it++; + } + + return it!=tabuList.end(); + } + + void + add (const M & __move, const EOT & __sol) + { + M _move=(M)__move; + EOT _sol=(EOT) _sol; + + _move(_sol); + + tabuList.push_back(_sol); + + if(currentSize==maxSize) + { + tabuList.erase(tabuList.begin()); + } + else + { + currentSize++; + } + } + + void + update () + { + //nothing to do + } + + void + init () + { + //nothing to do + } + +private: + + //! The maximum size of the tabu list. + unsigned maxSize; + + //! The current size of the tabu list. + unsigned currentSize; + + //! The solution tabu list. + std::list tabuList; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/moTabuList.h b/trunk/paradiseo-mo/src/moTabuList.h index d9d7445ae..de550cce9 100755 --- a/trunk/paradiseo-mo/src/moTabuList.h +++ b/trunk/paradiseo-mo/src/moTabuList.h @@ -14,7 +14,7 @@ #include -//! Class describing a tabu list that a moTS uses +//! Class describing a tabu list that a moTS uses. /*! It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS. @@ -26,30 +26,26 @@ template < class M > class moTabuList:public eoBF < const M &, const typename public: //! Alias for the type - typedef - typename - M::EOType - EOT; - + typedef typename M::EOType EOT; //! Procedure to add a move in the tabu list /*! - The two parameters have not to be modified so they are constant parameters + The two parameters have not to be modified so they are constant parameters. - \param __move a new tabu move - \param __sol the solution associated to this move + \param __move a new tabu move. + \param __sol the origianl solution associated to this move. */ virtual void add (const M & __move, const EOT & __sol) = 0; - //! Procedure that updates the tabu list content + //! Procedure that updates the tabu list content. /*! Generally, a counter associated to each saved move is decreased by one. - */ + */ virtual void update () = 0; - //! Procedure which initialises the tabu list + //! Procedure which initialises the tabu list. /*! Can be useful if the data structure needs to be allocated before being used. */ diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing index a897e1915..c23dd60aa 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing and b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search index 8a7d16e2e..56a8acfc0 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search and b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp index 9c1cf2fc9..043d35875 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include @@ -58,10 +60,12 @@ int main (int __argc, char * __argv []) { TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. TwoOptTabuList tabu_list ; // Tabu List + //moSimpleMoveTabuList tabu_list(10); + //moSimpleSolutionTabuList tabu_list(10); moNoAspirCrit aspir_crit ; // Aspiration Criterion - moGenSolContinue cont (50000) ; // Continuator + moGenSolContinue cont (10000) ; // Continuator 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/Lesson3/simulated_annealing b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing index 6173c80c2..f561655f9 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing and b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing differ diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a index 6ebcd867e..016ff850f 100644 Binary files a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a and b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a differ