-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classes.html b/tags/dummy-tag/paradiseo-mo/doc/html/classes.html
index 14e71c1d1..897f49eca 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classes.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classes.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Alphabetical List
+
+ParadisEO-MO-MovingObjects: Alphabetical List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html
index 48849e8b6..fc78c104b 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html
index 5dd00d546..c3898f8c9 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moAspirCrit< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moAspirCrit< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png
index e6cefe1bf..ab38bee30 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html
index e5854e901..bd494ce9c 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html
index 677f0b067..4a350d67e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moBestImprSelect< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moBestImprSelect< M > Class Template Reference
-
+
@@ -58,11 +48,13 @@ Inheritance diagram for moComparator< EOT >:
Template for classes which need to compare two EOT and indicate if the first is "better" than the second.
The objects that extend this template describe how an EOT is "better" than an other.
-
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png
index 5c939a24d..e0d3262b7 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html
index 98f819688..d72f5c7ba 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moCoolingSchedule Class Reference
+
+ParadisEO-MO-MovingObjects: moCoolingSchedule Class Reference
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png
index f60c26373..9524bf074 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html
index df71f9bbc..bafa8ad21 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html
index a750e6906..07cc4debb 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moExponentialCoolingSchedule Class Reference
+
+ParadisEO-MO-MovingObjects: moExponentialCoolingSchedule Class Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png
index 02c711475..889062daa 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html
index 788c44ce0..164c53aa4 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html
index 9a3b79ad4..d63544eb9 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moFirstImprSelect< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moFirstImprSelect< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png
index a2a1234c8..d7c432afc 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html
index 9f572187e..3bee76dde 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png
index 38eca919c..f9345d24c 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html
index daac51b4b..2d66908a0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png
index 76c36e46c..84c76d5a4 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html
index bbee03155..f39e34a6a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png
index b40e34991..571c39c65 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html
index 08ca515b3..abab40dc4 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
moHC(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, eoEvalFunc< EOT > &_full_evaluation)
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html
index c8d5d9da2..c803ad5ef 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
moHCMoveLoopExpl(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection)
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png
index 8c76fd46e..52db31402 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html
index d460e67e5..57dcee02e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html
index 646c31b74..9d5910e61 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moILS< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moILS< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html
index f040fb109..74daff30d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Function that indicates if the current fitness is better that the already saved fitness.
+Function that indicates if the current fitness is better that the already saved fitness.
The first time, the function only saved the current move and fitness.
Parameters:
@@ -123,18 +115,18 @@ The first time, the function only saved the current move and fitness.
_fitness
A fitness linked to the move.
-
Returns:
true The first time and if _fitntess > best_fitness, else false.
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png
index 76e0473f0..c0203e510 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html
index 363c9db1a..6b0b42b53 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html
index 98565e158..1cd8599ec 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moItRandNextMove< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moItRandNextMove< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png
index 3ec8c9761..e2933b674 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html
index 22f92330f..a96ccfe91 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html
index 8b09781d7..f058b77a6 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moLSCheckPoint< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moLSCheckPoint< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html
index ae0d9bde3..0a0b03f31 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html
index de338d814..e541d2929 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moLinearCoolingSchedule Class Reference
+
+ParadisEO-MO-MovingObjects: moLinearCoolingSchedule Class Reference
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png
index 064f41e2d..969ab05a5 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html
index 7cbf44a3d..d25403ad2 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html
index 471780ab5..82264740b 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moMoveExpl< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moMoveExpl< M > Class Template Reference
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png
index 66c1602bb..1b27438a7 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html
index c266fcca3..c6544833a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moMoveIncrEval< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moMoveIncrEval< M > Class Template Reference
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html
index 1272abb48..cc18bdfba 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moMoveInit< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moMoveInit< M > Class Template Reference
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html
index 386a8ca30..0d074afc8 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moMoveLoopExpl< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moMoveLoopExpl< M > Class Template Reference
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png
index 82d725cec..3fc99c0f6 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html
index 75ad57274..cf5f92e8f 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html
index 0c75f4e31..08d93fded 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moMoveSelect< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moMoveSelect< M > Class Template Reference
-
+
-Class that describes a move selector (moMove).
+Class that describes a move selector (moMove).
-It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
-
+It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png
index 10bda515a..0781eef97 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html
index 9c1f6d8ed..b63afe85d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moNextMove< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moNextMove< M > Class Template Reference
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png
index 2021f9a10..17c4c95d1 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html
index 5cc3a8fbc..cd2c667cd 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png
index c0687eec9..79fd6d32d 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html
index 7de5f2b2d..9da1e591d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png
index a727d6003..dfd768a2f 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html
index 7a4a266c8..946f34d1d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html
index f4fbb137a..1ea59d7b7 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moRandImprSelect< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moRandImprSelect< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png
index b935a8e2f..38a074a58 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html
index e52b789b6..612330dc5 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moRandMove< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moRandMove< M > Class Template Reference
-
+
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html
index 789422a40..9f5836211 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html
index e44f965fa..4f2cf3f4a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moSA< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moSA< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html
index 3ffd0f550..7af9768e5 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html
index 60e088e51..5c3445d0e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moSimpleMoveTabuList< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moSimpleMoveTabuList< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png
index f4a038c83..796402f17 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html
index 2237ff1f8..4733fc2ce 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html
index 5c9315b1e..a9e647a8d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moSimpleSolutionTabuList< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moSimpleSolutionTabuList< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png
index 38d26e329..3838fd012 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html
index e97e4b2f3..cc3afd34f 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png
index 71ed9397d..c6ccfa6a6 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html
index 99b75271a..a7ed8cd84 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png
index 702e690a2..1fa229f5a 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html
index 991ea87e9..f4aecdd84 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
-Function which launchs the Tabu Search.
+Function which launchs the Tabu Search.
-Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.
+Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html
index 943bb0d31..73ea47578 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
moTSMoveLoopExpl(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion)
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html
index b0b454f8b..bb594023a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moTSMoveLoopExpl< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moTSMoveLoopExpl< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png
index 717f30a17..34c222321 100644
Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png differ
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html
index ced1c7fd5..263932ab3 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Member List
+
+ParadisEO-MO-MovingObjects: Member List
-
+
Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html
index 9454576c4..a3dd5bb26 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: moTabuList< M > Class Template Reference
+
+ParadisEO-MO-MovingObjects: moTabuList< M > Class Template Reference
-
+
-Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/functions.html b/tags/dummy-tag/paradiseo-mo/doc/html/functions.html
index 7a393a0b2..3b2249824 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/functions.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/functions.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Class Members
+
+ParadisEO-MO-MovingObjects: Class Members
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+: moFirstImprSelect< M >
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/functions_func.html b/tags/dummy-tag/paradiseo-mo/doc/html/functions_func.html
index 047e0efa2..93f0bb551 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/functions_func.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/functions_func.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Class Members - Functions
+
+ParadisEO-MO-MovingObjects: Class Members - Functions
-
+
-Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+: moFirstImprSelect< M >
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html b/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html
index e82dda96c..0870df1e2 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html
@@ -1,14 +1,14 @@
-
-ParadisEO-MOMovingObjects: Hierarchical Index
+
+ParadisEO-MO-MovingObjects: Hierarchical Index
-
+
Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/main.html b/tags/dummy-tag/paradiseo-mo/doc/html/main.html
index 7ea4cc0a2..76e9a3f61 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/main.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/main.html
@@ -1,13 +1,13 @@
-
-ParadisEO-MOMovingObjects: Welcome to PARADISEO-Moving Objects
+
+ParadisEO-MO-MovingObjects: Welcome to PARADISEO-Moving Objects
-
+
-MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
+MO is an extension of the ANSI-C++ compliant evolutionary computation library EO.
It contains classes for almost any kind of one solution based heuristics.
-The installation procedure of the package is detailed in the README file in the top-directory of the source-tree. Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by
+The installation procedure of the package is detailed in the README file in the top-directory of the source-tree. Generated on Fri Feb 29 16:29:28 2008 for ParadisEO-MO-MovingObjects by
- 1.5.4
+ 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html
index 30b9ba63e..aa04043c6 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html
+++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html
@@ -1,15 +1,15 @@
-
-ParadisEO-MOMovingObjects: mo.h Source File
+
+ParadisEO-MO-MovingObjects: mo.h Source File
-
+
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/annotated.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/annotated.tex
index c8c0c5f5b..5dcfe97b5 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/annotated.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/annotated.tex
@@ -1,39 +1,39 @@
-\section{ParadisEO-MOMovingObjects Class List}
+\section{Paradis\-EO-MO-Moving\-Objects Class List}
Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList}
-\item\contentsline{section}{{\bf moAlgo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{}
-\item\contentsline{section}{{\bf moAspirCrit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{}
-\item\contentsline{section}{{\bf moBestImprSelect$<$ M $>$} (One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{}
-\item\contentsline{section}{{\bf moComparator$<$ EOT $>$} (Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second )}{\pageref{classmo_comparator}}{}
-\item\contentsline{section}{{\bf moCoolingSchedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{}
-\item\contentsline{section}{{\bf moExponentialCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{}
-\item\contentsline{section}{{\bf moFirstImprSelect$<$ M $>$} (One possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{}
-\item\contentsline{section}{{\bf moFitComparator$<$ EOT $>$} (Comparison according to the fitness )}{\pageref{classmo_fit_comparator}}{}
-\item\contentsline{section}{{\bf moFitSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{}
-\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{}
-\item\contentsline{section}{{\bf moHC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{}
-\item\contentsline{section}{{\bf moHCMoveLoopExpl$<$ M $>$} (Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{}
-\item\contentsline{section}{{\bf moILS$<$ M $>$} (Iterated Local Search (ILS) )}{\pageref{classmo_i_l_s}}{}
-\item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
-\item\contentsline{section}{{\bf moItRandNextMove$<$ M $>$} (One of the possible \doxyref{moNextMove}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{}
-\item\contentsline{section}{{\bf moLinearCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{}
-\item\contentsline{section}{{\bf moLSCheckPoint$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{}
-\item\contentsline{section}{{\bf moMove$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{}
-\item\contentsline{section}{{\bf moMoveExpl$<$ M $>$} (Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{}
-\item\contentsline{section}{{\bf moMoveIncrEval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{}
-\item\contentsline{section}{{\bf moMoveInit$<$ M $>$} (Move (\doxyref{moMove}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{}
-\item\contentsline{section}{{\bf moMoveLoopExpl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{}
-\item\contentsline{section}{{\bf moMoveSelect$<$ M $>$} (Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{}
-\item\contentsline{section}{{\bf moNextMove$<$ M $>$} (Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{}
-\item\contentsline{section}{{\bf moNoAspirCrit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{}
-\item\contentsline{section}{{\bf moNoFitImprSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{}
-\item\contentsline{section}{{\bf moRandImprSelect$<$ M $>$} (One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{}
-\item\contentsline{section}{{\bf moRandMove$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{}
-\item\contentsline{section}{{\bf moSA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{}
-\item\contentsline{section}{{\bf moSimpleMoveTabuList$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{}
-\item\contentsline{section}{{\bf moSimpleSolutionTabuList$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{}
-\item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{}
-\item\contentsline{section}{{\bf moSteadyFitSolContinue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_sol_continue}}{}
-\item\contentsline{section}{{\bf moTabuList$<$ M $>$} (Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{}
-\item\contentsline{section}{{\bf moTS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{}
-\item\contentsline{section}{{\bf moTSMoveLoopExpl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{}
+\item\contentsline{section}{\bf{mo\-Algo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{}
+\item\contentsline{section}{\bf{mo\-Aspir\-Crit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{}
+\item\contentsline{section}{\bf{mo\-Best\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{}
+\item\contentsline{section}{\bf{mo\-Comparator$<$ EOT $>$} (Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second )}{\pageref{classmo_comparator}}{}
+\item\contentsline{section}{\bf{mo\-Cooling\-Schedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{}
+\item\contentsline{section}{\bf{mo\-Exponential\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{}
+\item\contentsline{section}{\bf{mo\-First\-Impr\-Select$<$ M $>$} (One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{}
+\item\contentsline{section}{\bf{mo\-Fit\-Comparator$<$ EOT $>$} (Comparison according to the fitness )}{\pageref{classmo_fit_comparator}}{}
+\item\contentsline{section}{\bf{mo\-Fit\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{}
+\item\contentsline{section}{\bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{}
+\item\contentsline{section}{\bf{mo\-HC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{}
+\item\contentsline{section}{\bf{mo\-HCMove\-Loop\-Expl$<$ M $>$} (Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{}
+\item\contentsline{section}{\bf{mo\-ILS$<$ M $>$} (Iterated Local Search (ILS) )}{\pageref{classmo_i_l_s}}{}
+\item\contentsline{section}{\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} (One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
+\item\contentsline{section}{\bf{mo\-It\-Rand\-Next\-Move$<$ M $>$} (One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{}
+\item\contentsline{section}{\bf{mo\-Linear\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{}
+\item\contentsline{section}{\bf{mo\-LSCheck\-Point$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{}
+\item\contentsline{section}{\bf{mo\-Move$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{}
+\item\contentsline{section}{\bf{mo\-Move\-Expl$<$ M $>$} (Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{}
+\item\contentsline{section}{\bf{mo\-Move\-Incr\-Eval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{}
+\item\contentsline{section}{\bf{mo\-Move\-Init$<$ M $>$} (Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{}
+\item\contentsline{section}{\bf{mo\-Move\-Loop\-Expl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{}
+\item\contentsline{section}{\bf{mo\-Move\-Select$<$ M $>$} (Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{}
+\item\contentsline{section}{\bf{mo\-Next\-Move$<$ M $>$} (Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{}
+\item\contentsline{section}{\bf{mo\-No\-Aspir\-Crit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{}
+\item\contentsline{section}{\bf{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{}
+\item\contentsline{section}{\bf{mo\-Rand\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{}
+\item\contentsline{section}{\bf{mo\-Rand\-Move$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{}
+\item\contentsline{section}{\bf{mo\-SA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{}
+\item\contentsline{section}{\bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{}
+\item\contentsline{section}{\bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{}
+\item\contentsline{section}{\bf{mo\-Sol\-Continue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{}
+\item\contentsline{section}{\bf{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_sol_continue}}{}
+\item\contentsline{section}{\bf{mo\-Tabu\-List$<$ M $>$} (Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{}
+\item\contentsline{section}{\bf{mo\-TS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{}
+\item\contentsline{section}{\bf{mo\-TSMove\-Loop\-Expl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{}
\end{CompactList}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex
index 1a6736e14..5184ae772 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex
@@ -1,27 +1,23 @@
-\section{moAlgo$<$ EOT $>$ Class Template Reference}
+\section{mo\-Algo$<$ EOT $>$ Class Template Reference}
\label{classmo_algo}\index{moAlgo@{moAlgo}}
Description of an algorithm of the paradiseo-mo library.
-{\tt \#include $<$moAlgo.h$>$}
+{\tt \#include $<$mo\-Algo.h$>$}
-Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H]
-\begin{center}
-\leavevmode
-\includegraphics[height=4cm]{classmo_algo}
-\end{center}
-\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moAlgo$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Algo$<$ EOT $>$}
Description of an algorithm of the paradiseo-mo library.
-\doxyref{moHC}{p.}{classmo_h_c}, \doxyref{moTS}{p.}{classmo_t_s} and \doxyref{moSA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library.
+\doxyref{mo\-HC}{p.}{classmo_h_c}, \doxyref{mo\-TS}{p.}{classmo_t_s} and \doxyref{mo\-SA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library.
-Definition at line 46 of file moAlgo.h.
+
+
+Definition at line 46 of file mo\-Algo.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moAlgo.h\end{CompactItemize}
+mo\-Algo.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
index 7a0252d70..fbf0b26ef 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 218.579
+%%BoundingBox: 0 0 500 109.29
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 4.575 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moAspirCrit< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
(moImprBestFitAspirCrit< M >) cw
(moNoAspirCrit< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moAspirCrit< M >) 0.5 1 box
- (eoBF< A1, A2, R >) 0.5 2 box
- (eoFunctorBase) 0.5 3 box
(moImprBestFitAspirCrit< M >) 0 0 box
(moNoAspirCrit< M >) 1 0 box
% ----- relations -----
-solid
-0 0.5 1 out
-solid
-1 0.5 2 in
-solid
-0 0.5 2 out
-solid
-1 0.5 3 in
solid
1 0.5 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
index 1e4a73e8e..4f97ce89e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex
@@ -1,44 +1,46 @@
-\section{moAspirCrit$<$ M $>$ Class Template Reference}
+\section{mo\-Aspir\-Crit$<$ M $>$ Class Template Reference}
\label{classmo_aspir_crit}\index{moAspirCrit@{moAspirCrit}}
Description of the conditions in which a tabu move could be accepted.
-{\tt \#include $<$moAspirCrit.h$>$}
+{\tt \#include $<$mo\-Aspir\-Crit.h$>$}
-Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_aspir_crit}
+\includegraphics[height=2cm]{classmo_aspir_crit}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void {\bf init} ()=0
+virtual void \bf{init} ()=0
\begin{CompactList}\small\item\em Procedure which initialises all that needs an aspiration criterion. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moAspirCrit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Aspir\-Crit$<$ M $>$}
Description of the conditions in which a tabu move could be accepted.
-It is only a description... An object that herits from this class is needed to be used in a \doxyref{moTS}{p.}{classmo_t_s}. See moNoAspriCrit for example.
+It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. See mo\-No\-Aspri\-Crit for example.
-Definition at line 47 of file moAspirCrit.h.
+
+
+Definition at line 47 of file mo\-Aspir\-Crit.h.
\subsection{Member Function Documentation}
-\index{moAspirCrit@{moAspirCrit}!init@{init}}
-\index{init@{init}!moAspirCrit@{moAspirCrit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}
+\index{moAspirCrit@{mo\-Aspir\-Crit}!init@{init}}
+\index{init@{init}!moAspirCrit@{mo\-Aspir\-Crit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}
Procedure which initialises all that needs an aspiration criterion.
It can be possible that this procedure does nothing...
-Implemented in {\bf moImprBestFitAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and {\bf moNoAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}.
+Implemented in \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and \bf{mo\-No\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moAspirCrit.h\end{CompactItemize}
+mo\-Aspir\-Crit.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps
index e1504ce28..f9c367972 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 303.03
+%%BoundingBox: 0 0 500 259.74
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.925 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moBestImprSelect< M >) cw
(moMoveSelect< M >) cw
-(eoBF< M &, M::EOType::Fitness &, void >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moBestImprSelect< M >) 0 0 box
(moMoveSelect< M >) 0 1 box
- (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
index 8241c528a..f1c755153 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex
@@ -1,58 +1,60 @@
-\section{moBestImprSelect$<$ M $>$ Class Template Reference}
+\section{mo\-Best\-Impr\-Select$<$ M $>$ Class Template Reference}
\label{classmo_best_impr_select}\index{moBestImprSelect@{moBestImprSelect}}
-One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
+One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
-{\tt \#include $<$moBestImprSelect.h$>$}
+{\tt \#include $<$mo\-Best\-Impr\-Select.h$>$}
-Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_best_impr_select}
+\includegraphics[height=2cm]{classmo_best_impr_select}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-void {\bf init} (const {\bf Fitness} \&\_\-fitness)
+void \bf{init} (const \bf{Fitness} \&\_\-fitness)
\begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item
-bool {\bf update} (const M \&\_\-move, const {\bf Fitness} \&\_\-fitness)
-\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
-void {\bf operator()} (M \&\_\-move, {\bf Fitness} \&\_\-fitness)
+bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness)
+\begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
+void \bf{operator()} (M \&\_\-move, \bf{Fitness} \&\_\-fitness)
\begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-bool {\bf first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13}
+bool \bf{first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13}
\begin{CompactList}\small\item\em Allowing to know if at least one move has been generated. \item\end{CompactList}\item
-M {\bf best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a}
+M \bf{best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a}
\begin{CompactList}\small\item\em The best move. \item\end{CompactList}\item
-{\bf Fitness} {\bf best\_\-fitness}\label{classmo_best_impr_select_e51345fe28ca7cbaca65bdad1aa8ecb7}
+\bf{Fitness} \bf{best\_\-fitness}\label{classmo_best_impr_select_e51345fe28ca7cbaca65bdad1aa8ecb7}
\begin{CompactList}\small\item\em The best fitness. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moBestImprSelect$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Best\-Impr\-Select$<$ M $>$}
-One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
+One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
All neighbors are considered, and the movement which enables the best improvement is selected.
-Definition at line 47 of file moBestImprSelect.h.
+
+
+Definition at line 47 of file mo\-Best\-Impr\-Select.h.
\subsection{Member Function Documentation}
-\index{moBestImprSelect@{moBestImprSelect}!init@{init}}
-\index{init@{init}!moBestImprSelect@{moBestImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_83f961549986b8ad94692e433aa79114}
+\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!init@{init}}
+\index{init@{init}!moBestImprSelect@{mo\-Best\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_83f961549986b8ad94692e433aa79114}
Procedure which initialise the exploration.
@@ -64,18 +66,18 @@ Procedure which initialise the exploration.
\end{Desc}
-Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_58038bd859632c1bd022d23d9792bdca}.
+Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_58038bd859632c1bd022d23d9792bdca}.
-Definition at line 58 of file moBestImprSelect.h.
+Definition at line 58 of file mo\-Best\-Impr\-Select.h.
-References moBestImprSelect$<$ M $>$::first\_\-time.\index{moBestImprSelect@{moBestImprSelect}!update@{update}}
-\index{update@{update}!moBestImprSelect@{moBestImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moBestImprSelect}$<$ M $>$::update (const M \& {\em \_\-move}, const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_5c0729fd316b0ef78406bce5ca91de2a}
+References mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!update@{update}}
+\index{update@{update}!moBestImprSelect@{mo\-Best\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_5c0729fd316b0ef78406bce5ca91de2a}
-{\bf Function} that indicates if the current move has not improved the fitness.
+Function that indicates if the current move has not improved the fitness.
-If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) and the fitness linked to this move are saved.
+If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) and the fitness linked to this move are saved.
\begin{Desc}
\item[Parameters:]
@@ -86,13 +88,13 @@ If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{class
\item[Returns:]TRUE if the move does not improve the fitness. \end{Desc}
-Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}.
+Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}.
-Definition at line 76 of file moBestImprSelect.h.
+Definition at line 77 of file mo\-Best\-Impr\-Select.h.
-References moBestImprSelect$<$ M $>$::best\_\-fitness, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.\index{moBestImprSelect@{moBestImprSelect}!operator()@{operator()}}
-\index{operator()@{operator()}!moBestImprSelect@{moBestImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::operator() (M \& {\em \_\-move}, {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_33b3de7bd322f737eb97cce9a5404527}
+References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}}
+\index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_best_impr_select_33b3de7bd322f737eb97cce9a5404527}
Procedure which saved the best move and fitness.
@@ -104,12 +106,10 @@ Procedure which saved the best move and fitness.
\end{Desc}
-Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+Definition at line 95 of file mo\-Best\-Impr\-Select.h.
-Definition at line 94 of file moBestImprSelect.h.
-
-References moBestImprSelect$<$ M $>$::best\_\-fitness, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.
+References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moBestImprSelect.h\end{CompactItemize}
+mo\-Best\-Impr\-Select.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps
index d7869534e..ed564a84f 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 484.848
+%%BoundingBox: 0 0 500 242.424
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.03125 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moComparator< EOT >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
(moFitComparator< EOT >) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -189,20 +187,10 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moComparator< EOT >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
(moFitComparator< EOT >) 0 0 box
% ----- relations -----
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
solid
1 0 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex
index 1e3efba12..d9bbd7643 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex
@@ -1,27 +1,29 @@
-\section{moComparator$<$ EOT $>$ Class Template Reference}
+\section{mo\-Comparator$<$ EOT $>$ Class Template Reference}
\label{classmo_comparator}\index{moComparator@{moComparator}}
Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second.
-{\tt \#include $<$moComparator.h$>$}
+{\tt \#include $<$mo\-Comparator.h$>$}
-Inheritance diagram for moComparator$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Comparator$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_comparator}
+\includegraphics[height=2cm]{classmo_comparator}
\end{center}
\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moComparator$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Comparator$<$ EOT $>$}
Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second.
The objects that extend this template describe how an EOT is \char`\"{}better\char`\"{} than an other.
-Definition at line 45 of file moComparator.h.
+
+
+Definition at line 45 of file mo\-Comparator.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moComparator.h\end{CompactItemize}
+mo\-Comparator.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps
index 099ff0bb2..a1d0c2d59 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 203.046
+%%BoundingBox: 0 0 500 101.523
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 4.925 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moCoolingSchedule) cw
-(eoUF< double &, bool >) cw
-(eoFunctorBase) cw
(moExponentialCoolingSchedule) cw
(moLinearCoolingSchedule) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moCoolingSchedule) 0.5 1 box
- (eoUF< double &, bool >) 0.5 2 box
- (eoFunctorBase) 0.5 3 box
(moExponentialCoolingSchedule) 0 0 box
(moLinearCoolingSchedule) 1 0 box
% ----- relations -----
-solid
-0 0.5 1 out
-solid
-1 0.5 2 in
-solid
-0 0.5 2 out
-solid
-1 0.5 3 in
solid
1 0.5 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
index 3eb005745..a84339123 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex
@@ -1,14 +1,14 @@
-\section{moCoolingSchedule Class Reference}
+\section{mo\-Cooling\-Schedule Class Reference}
\label{classmo_cooling_schedule}\index{moCoolingSchedule@{moCoolingSchedule}}
This class gives the description of a cooling schedule.
-{\tt \#include $<$moCoolingSchedule.h$>$}
+{\tt \#include $<$mo\-Cooling\-Schedule.h$>$}
-Inheritance diagram for moCoolingSchedule::\begin{figure}[H]
+Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_cooling_schedule}
+\includegraphics[height=2cm]{classmo_cooling_schedule}
\end{center}
\end{figure}
@@ -16,10 +16,12 @@ Inheritance diagram for moCoolingSchedule::\begin{figure}[H]
\subsection{Detailed Description}
This class gives the description of a cooling schedule.
-It is only a description... An object that herits from this class is needed to be used in a \doxyref{moSA}{p.}{classmo_s_a}. See \doxyref{moExponentialCoolingSchedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{moLinearCoolingSchedule}{p.}{classmo_linear_cooling_schedule} for example.
+It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-SA}{p.}{classmo_s_a}. See \doxyref{mo\-Exponential\-Cooling\-Schedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{mo\-Linear\-Cooling\-Schedule}{p.}{classmo_linear_cooling_schedule} for example.
-Definition at line 46 of file moCoolingSchedule.h.
+
+
+Definition at line 46 of file mo\-Cooling\-Schedule.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moCoolingSchedule.h\end{CompactItemize}
+mo\-Cooling\-Schedule.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps
index 92ecef949..9a4b2773b 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 406.091
+%%BoundingBox: 0 0 500 203.046
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.23125 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moExponentialCoolingSchedule) cw
(moCoolingSchedule) cw
-(eoUF< double &, bool >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moExponentialCoolingSchedule) 0 0 box
(moCoolingSchedule) 0 1 box
- (eoUF< double &, bool >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
index 93b0768db..51515b066 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex
@@ -1,45 +1,47 @@
-\section{moExponentialCoolingSchedule Class Reference}
+\section{mo\-Exponential\-Cooling\-Schedule Class Reference}
\label{classmo_exponential_cooling_schedule}\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
-One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
-{\tt \#include $<$moExponentialCoolingSchedule.h$>$}
+{\tt \#include $<$mo\-Exponential\-Cooling\-Schedule.h$>$}
-Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H]
+Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_exponential_cooling_schedule}
+\includegraphics[height=2cm]{classmo_exponential_cooling_schedule}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moExponentialCoolingSchedule} (double \_\-threshold, double \_\-ratio)
+\bf{mo\-Exponential\-Cooling\-Schedule} (double \_\-threshold, double \_\-ratio)
\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item
-bool {\bf operator()} (double \&\_\-temperature)
-\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (double \&\_\-temperature)
+\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-double {\bf threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84}
+double \bf{threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84}
\begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item
-double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa}
+double \bf{ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa}
\begin{CompactList}\small\item\em The decreasing factor of the temperature. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.
-Definition at line 46 of file moExponentialCoolingSchedule.h.
+
+
+Definition at line 46 of file mo\-Exponential\-Cooling\-Schedule.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
-\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moExponentialCoolingSchedule::moExponentialCoolingSchedule (double {\em \_\-threshold}, double {\em \_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_e60ce9eb5e632f4758ea96ae92a52774}
+\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
+\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Exponential\-Cooling\-Schedule::mo\-Exponential\-Cooling\-Schedule (double {\em \_\-threshold}, double {\em \_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_e60ce9eb5e632f4758ea96ae92a52774}
Simple constructor.
@@ -51,15 +53,15 @@ Simple constructor.
\end{Desc}
-Definition at line 55 of file moExponentialCoolingSchedule.h.
+Definition at line 55 of file mo\-Exponential\-Cooling\-Schedule.h.
\subsection{Member Function Documentation}
-\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!operator()@{operator()}}
-\index{operator()@{operator()}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-temperature})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_95b075e9786a5cc984ef1bb59a2107e4}
+\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}}
+\index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-temperature})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_95b075e9786a5cc984ef1bb59a2107e4}
-{\bf Function} which proceeds to the cooling.
+Function which proceeds to the cooling.
It decreases the temperature and indicates if it is greater than the threshold.
@@ -72,12 +74,10 @@ It decreases the temperature and indicates if it is greater than the threshold.
\item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc}
-Implements {\bf eoUF$<$ double \&, bool $>$}.
-
-Definition at line 65 of file moExponentialCoolingSchedule.h.
+Definition at line 65 of file mo\-Exponential\-Cooling\-Schedule.h.
References ratio, and threshold.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moExponentialCoolingSchedule.h\end{CompactItemize}
+mo\-Exponential\-Cooling\-Schedule.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps
index 7057473a9..04ffcb96d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 303.03
+%%BoundingBox: 0 0 500 258.065
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.9375 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moFirstImprSelect< M >) cw
(moMoveSelect< M >) cw
-(eoBF< M &, M::EOType::Fitness &, void >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moFirstImprSelect< M >) 0 0 box
(moMoveSelect< M >) 0 1 box
- (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
index e729ba49e..c8d72eff1 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex
@@ -1,61 +1,63 @@
-\section{moFirstImprSelect$<$ M $>$ Class Template Reference}
+\section{mo\-First\-Impr\-Select$<$ M $>$ Class Template Reference}
\label{classmo_first_impr_select}\index{moFirstImprSelect@{moFirstImprSelect}}
-One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
+One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
-{\tt \#include $<$moFirstImprSelect.h$>$}
+{\tt \#include $<$mo\-First\-Impr\-Select.h$>$}
-Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_first_impr_select}
+\includegraphics[height=2cm]{classmo_first_impr_select}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void {\bf init} (const {\bf Fitness} \&\_\-fitness)
+virtual void \bf{init} (const \bf{Fitness} \&\_\-fitness)
\begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item
-bool {\bf update} (const M \&\_\-move, const {\bf Fitness} \&\_\-fitness)
-\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
-void {\bf operator()} (M \&\_\-move, {\bf Fitness} \&\_\-fitness)
+bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness)
+\begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item
+void \bf{operator()} (M \&\_\-move, \bf{Fitness} \&\_\-fitness)
\begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-bool {\bf valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c}
+bool \bf{valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c}
\begin{CompactList}\small\item\em Allow to know if at least one move has improved the solution. \item\end{CompactList}\item
-M {\bf best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c}
+M \bf{best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c}
\begin{CompactList}\small\item\em Best stored movement. \item\end{CompactList}\item
-{\bf Fitness} {\bf initial\_\-fitness}\label{classmo_first_impr_select_669f8f2f74e71bf2b7fdabfc9cca2c0e}
+\bf{Fitness} \bf{initial\_\-fitness}\label{classmo_first_impr_select_669f8f2f74e71bf2b7fdabfc9cca2c0e}
\begin{CompactList}\small\item\em Initial fitness. \item\end{CompactList}\item
-{\bf Fitness} {\bf best\_\-fitness}\label{classmo_first_impr_select_287937f5c059b078ccec94e86e0a8238}
+\bf{Fitness} \bf{best\_\-fitness}\label{classmo_first_impr_select_287937f5c059b078ccec94e86e0a8238}
\begin{CompactList}\small\item\em Best stored fitness. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moFirstImprSelect$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-First\-Impr\-Select$<$ M $>$}
-One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}.
+One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}.
The neighborhood is explored until a move enables an improvment of the current solution.
-Definition at line 48 of file moFirstImprSelect.h.
+
+
+Definition at line 48 of file mo\-First\-Impr\-Select.h.
\subsection{Member Function Documentation}
-\index{moFirstImprSelect@{moFirstImprSelect}!init@{init}}
-\index{init@{init}!moFirstImprSelect@{moFirstImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moFirstImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_a923437ecc3db50e7052b002a9a1bbf8}
+\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!init@{init}}
+\index{init@{init}!moFirstImprSelect@{mo\-First\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-First\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_a923437ecc3db50e7052b002a9a1bbf8}
Procedure which initialise the exploration.
@@ -67,18 +69,18 @@ It save the current fitness as the initial value for the fitness. \begin{Desc}
\end{Desc}
-Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_58038bd859632c1bd022d23d9792bdca}.
+Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_58038bd859632c1bd022d23d9792bdca}.
-Definition at line 60 of file moFirstImprSelect.h.
+Definition at line 60 of file mo\-First\-Impr\-Select.h.
-References moFirstImprSelect$<$ M $>$::initial\_\-fitness, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!update@{update}}
-\index{update@{update}!moFirstImprSelect@{moFirstImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moFirstImprSelect}$<$ M $>$::update (const M \& {\em \_\-move}, const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_f68b7ee7b35bf7347c16006f0587d313}
+References mo\-First\-Impr\-Select$<$ M $>$::initial\_\-fitness, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!update@{update}}
+\index{update@{update}!moFirstImprSelect@{mo\-First\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_f68b7ee7b35bf7347c16006f0587d313}
-{\bf Function} that indicates if the current move has not improved the fitness.
+Function that indicates if the current move has not improved the fitness.
-If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) should be applied to the current solution.
+If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) should be applied to the current solution.
\begin{Desc}
\item[Parameters:]
@@ -89,13 +91,13 @@ If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{class
\item[Returns:]true if the move does not improve the fitness. \end{Desc}
-Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}.
+Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}.
-Definition at line 75 of file moFirstImprSelect.h.
+Definition at line 75 of file mo\-First\-Impr\-Select.h.
-References moFirstImprSelect$<$ M $>$::best\_\-fitness, moFirstImprSelect$<$ M $>$::best\_\-move, moFirstImprSelect$<$ M $>$::initial\_\-fitness, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!operator()@{operator()}}
-\index{operator()@{operator()}!moFirstImprSelect@{moFirstImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moFirstImprSelect}$<$ M $>$::operator() (M \& {\em \_\-move}, {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_976569efd882886cb13184daeba79766}
+References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::initial\_\-fitness, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}}
+\index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_976569efd882886cb13184daeba79766}
Procedure which saved the best move and fitness.
@@ -107,12 +109,10 @@ Procedure which saved the best move and fitness.
\end{Desc}
-Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+Definition at line 96 of file mo\-First\-Impr\-Select.h.
-Definition at line 96 of file moFirstImprSelect.h.
-
-References moFirstImprSelect$<$ M $>$::best\_\-fitness, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid.
+References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moFirstImprSelect.h\end{CompactItemize}
+mo\-First\-Impr\-Select.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps
index 902d882c9..802516e3a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 484.848
+%%BoundingBox: 0 0 500 242.424
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.03125 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moFitComparator< EOT >) cw
(moComparator< EOT >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moFitComparator< EOT >) 0 0 box
(moComparator< EOT >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex
index 68b8c3725..079b484e4 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex
@@ -1,39 +1,41 @@
-\section{moFitComparator$<$ EOT $>$ Class Template Reference}
+\section{mo\-Fit\-Comparator$<$ EOT $>$ Class Template Reference}
\label{classmo_fit_comparator}\index{moFitComparator@{moFitComparator}}
Comparison according to the fitness.
-{\tt \#include $<$moFitComparator.h$>$}
+{\tt \#include $<$mo\-Fit\-Comparator.h$>$}
-Inheritance diagram for moFitComparator$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Fit\-Comparator$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_fit_comparator}
+\includegraphics[height=2cm]{classmo_fit_comparator}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-bool {\bf operator()} (const EOT \&\_\-solution1, const EOT \&\_\-solution2)
-\begin{CompactList}\small\item\em {\bf Function} which makes the comparison and gives the result. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (const EOT \&\_\-solution1, const EOT \&\_\-solution2)
+\begin{CompactList}\small\item\em Function which makes the comparison and gives the result. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moFitComparator$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Fit\-Comparator$<$ EOT $>$}
Comparison according to the fitness.
An EOT is better than an other if its fitness is better.
-Definition at line 46 of file moFitComparator.h.
+
+
+Definition at line 46 of file mo\-Fit\-Comparator.h.
\subsection{Member Function Documentation}
-\index{moFitComparator@{moFitComparator}!operator()@{operator()}}
-\index{operator()@{operator()}!moFitComparator@{moFitComparator}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitComparator}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution1}, const EOT \& {\em \_\-solution2})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_comparator_c920d5a49deb16710daf1e5fcde6b16c}
+\index{moFitComparator@{mo\-Fit\-Comparator}!operator()@{operator()}}
+\index{operator()@{operator()}!moFitComparator@{mo\-Fit\-Comparator}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Comparator}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution1}, const EOT \& {\em \_\-solution2})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_comparator_c920d5a49deb16710daf1e5fcde6b16c}
-{\bf Function} which makes the comparison and gives the result.
+Function which makes the comparison and gives the result.
\begin{Desc}
\item[Parameters:]
@@ -44,8 +46,8 @@ Definition at line 46 of file moFitComparator.h.
\item[Returns:]true if the fitness of the first solution is better than the second solution, false else. \end{Desc}
-Definition at line 56 of file moFitComparator.h.
+Definition at line 56 of file mo\-Fit\-Comparator.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moFitComparator.h\end{CompactItemize}
+mo\-Fit\-Comparator.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps
index 020df214d..fba9a3dd0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 441.989
+%%BoundingBox: 0 0 500 239.521
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moFitSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
-(eoUF< const EOT &, bool >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moFitSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
- (eoUF< const EOT &, bool >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex
index 09420f13f..1cd050400 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex
@@ -1,52 +1,54 @@
-\section{moFitSolContinue$<$ EOT $>$ Class Template Reference}
+\section{mo\-Fit\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
\label{classmo_fit_sol_continue}\index{moFitSolContinue@{moFitSolContinue}}
One possible stop criterion for a solution-based heuristic.
-{\tt \#include $<$moFitSolContinue.h$>$}
+{\tt \#include $<$mo\-Fit\-Sol\-Continue.h$>$}
-Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_fit_sol_continue}
+\includegraphics[height=2cm]{classmo_fit_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moFitSolContinue} ({\bf Fitness} \_\-fitness)
+\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} \_\-fitness)
\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item
-bool {\bf operator()} (const EOT \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item
-void {\bf init} ()
+bool \bf{operator()} (const EOT \&\_\-solution)
+\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item
+void \bf{init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf Fitness} {\bf fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc}
+\bf{Fitness} \bf{fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc}
\begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moFitSolContinue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Fit\-Sol\-Continue$<$ EOT $>$}
One possible stop criterion for a solution-based heuristic.
The stop criterion corresponds to a fitness threshold gained.
-Definition at line 46 of file moFitSolContinue.h.
+
+
+Definition at line 46 of file mo\-Fit\-Sol\-Continue.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}}
-\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moFitSolContinue}$<$ EOT $>$::{\bf moFitSolContinue} ({\bf Fitness} {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_5f0dc5e529e8cd307ff4a1ae982d5b84}
+\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!moFitSolContinue@{moFitSolContinue}}
+\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_5f0dc5e529e8cd307ff4a1ae982d5b84}
Basic constructor.
@@ -58,15 +60,15 @@ Basic constructor.
\end{Desc}
-Definition at line 57 of file moFitSolContinue.h.
+Definition at line 57 of file mo\-Fit\-Sol\-Continue.h.
\subsection{Member Function Documentation}
-\index{moFitSolContinue@{moFitSolContinue}!operator()@{operator()}}
-\index{operator()@{operator()}!moFitSolContinue@{moFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_ce4e02895c13bfd131fc759adf83798f}
+\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!operator()@{operator()}}
+\index{operator()@{operator()}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_ce4e02895c13bfd131fc759adf83798f}
-{\bf Function} that activates the stopping criterion.
+Function that activates the stopping criterion.
Indicates if the fitness threshold has not yet been reached.
@@ -79,23 +81,21 @@ Indicates if the fitness threshold has not yet been reached.
\item[Returns:]true or false according to the value of the fitness. \end{Desc}
-Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+Definition at line 67 of file mo\-Fit\-Sol\-Continue.h.
-Definition at line 67 of file moFitSolContinue.h.
-
-References moFitSolContinue$<$ EOT $>$::fitness.\index{moFitSolContinue@{moFitSolContinue}!init@{init}}
-\index{init@{init}!moFitSolContinue@{moFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}
+References mo\-Fit\-Sol\-Continue$<$ EOT $>$::fitness.\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!init@{init}}
+\index{init@{init}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}
Procedure which allows to initialise all the stuff needed.
It can be also used to reinitialize all the needed things.
-Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
+Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
-Definition at line 81 of file moFitSolContinue.h.
+Definition at line 81 of file mo\-Fit\-Sol\-Continue.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moFitSolContinue.h\end{CompactItemize}
+mo\-Fit\-Sol\-Continue.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps
index c73c60ba3..c9e65107d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 441.989
+%%BoundingBox: 0 0 500 227.273
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moGenSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
-(eoUF< const EOT &, bool >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moGenSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
- (eoUF< const EOT &, bool >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
index 61d36459e..409efb3fd 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex
@@ -1,49 +1,51 @@
-\section{moGenSolContinue$<$ EOT $>$ Class Template Reference}
+\section{mo\-Gen\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
\label{classmo_gen_sol_continue}\index{moGenSolContinue@{moGenSolContinue}}
One possible stop criterion for a solution-based heuristic.
-{\tt \#include $<$moGenSolContinue.h$>$}
+{\tt \#include $<$mo\-Gen\-Sol\-Continue.h$>$}
-Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_gen_sol_continue}
+\includegraphics[height=2cm]{classmo_gen_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moGenSolContinue} (unsigned int \_\-generationMaximumNumber)
+\bf{mo\-Gen\-Sol\-Continue} (unsigned int \_\-generation\-Maximum\-Number)
\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item
-bool {\bf operator()} (const EOT \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} that activates the stop criterion. \item\end{CompactList}\item
-void {\bf init} ()
+bool \bf{operator()} (const EOT \&\_\-solution)
+\begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item
+void \bf{init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int {\bf generationMaximumNumber}\label{classmo_gen_sol_continue_c838d923436b71c584891c1cbe3f47ba}
+unsigned int \bf{generation\-Maximum\-Number}\label{classmo_gen_sol_continue_c838d923436b71c584891c1cbe3f47ba}
\begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item
-unsigned int {\bf generationNumber}\label{classmo_gen_sol_continue_af0b3e5ca3ceee0d843670955c8f1e58}
+unsigned int \bf{generation\-Number}\label{classmo_gen_sol_continue_af0b3e5ca3ceee0d843670955c8f1e58}
\begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moGenSolContinue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Gen\-Sol\-Continue$<$ EOT $>$}
One possible stop criterion for a solution-based heuristic.
The stop criterion corresponds to a maximum number of iteration.
-Definition at line 46 of file moGenSolContinue.h.
+
+
+Definition at line 46 of file mo\-Gen\-Sol\-Continue.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}}
-\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moGenSolContinue}$<$ EOT $>$::{\bf moGenSolContinue} (unsigned int {\em \_\-generationMaximumNumber})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_8e2456421b641d38e3f800f3bbe45159}
+\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!moGenSolContinue@{moGenSolContinue}}
+\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Gen\-Sol\-Continue} (unsigned int {\em \_\-generation\-Maximum\-Number})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_8e2456421b641d38e3f800f3bbe45159}
Simple constructor.
@@ -51,19 +53,19 @@ Simple constructor.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-generationMaximumNumber}]The maximum number of generations. \end{description}
+\item[{\em \_\-generation\-Maximum\-Number}]The maximum number of generations. \end{description}
\end{Desc}
-Definition at line 54 of file moGenSolContinue.h.
+Definition at line 54 of file mo\-Gen\-Sol\-Continue.h.
\subsection{Member Function Documentation}
-\index{moGenSolContinue@{moGenSolContinue}!operator()@{operator()}}
-\index{operator()@{operator()}!moGenSolContinue@{moGenSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moGenSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_2fd5f2f10b6d6208412582578fad48ea}
+\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}}
+\index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_2fd5f2f10b6d6208412582578fad48ea}
-{\bf Function} that activates the stop criterion.
+Function that activates the stop criterion.
Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.
@@ -76,25 +78,23 @@ Increments the counter and returns TRUE if the current number of iteration is lo
\item[Returns:]true or false according to the current generation number. \end{Desc}
-Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+Definition at line 66 of file mo\-Gen\-Sol\-Continue.h.
-Definition at line 66 of file moGenSolContinue.h.
-
-References moGenSolContinue$<$ EOT $>$::generationMaximumNumber, and moGenSolContinue$<$ EOT $>$::generationNumber.\index{moGenSolContinue@{moGenSolContinue}!init@{init}}
-\index{init@{init}!moGenSolContinue@{moGenSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moGenSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}
+References mo\-Gen\-Sol\-Continue$<$ EOT $>$::generation\-Maximum\-Number, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::generation\-Number.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}}
+\index{init@{init}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}
Procedure which allows to initialise the generation counter.
It can also be used to reset the iteration counter.
-Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
+Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
-Definition at line 78 of file moGenSolContinue.h.
+Definition at line 78 of file mo\-Gen\-Sol\-Continue.h.
-References moGenSolContinue$<$ EOT $>$::generationNumber.
+References mo\-Gen\-Sol\-Continue$<$ EOT $>$::generation\-Number.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moGenSolContinue.h\end{CompactItemize}
+mo\-Gen\-Sol\-Continue.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex
index a5ca89321..6d1471054 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex
@@ -1,59 +1,59 @@
-\section{moHC$<$ M $>$ Class Template Reference}
+\section{mo\-HC$<$ M $>$ Class Template Reference}
\label{classmo_h_c}\index{moHC@{moHC}}
Hill Climbing (HC).
-{\tt \#include $<$moHC.h$>$}
-
-Inherits {\bf moAlgo$<$ M::EOType $>$}.
+{\tt \#include $<$mo\-HC.h$>$}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-move\_\-initializer, {\bf moNextMove}$<$ M $>$ \&\_\-next\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moMoveSelect}$<$ M $>$ \&\_\-move\_\-selection, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
+\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
\begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item
-{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-move\_\-explorer, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
+\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-move\_\-explorer, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
\begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item
-bool {\bf operator()} ({\bf EOT} \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} which launches the HC. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (\bf{EOT} \&\_\-solution)
+\begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb}
+typedef M::EOType \bf{EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-explorer}\label{classmo_h_c_ec4e702a6ec240f40ff9d262c36d080b}
+\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-explorer}\label{classmo_h_c_ec4e702a6ec240f40ff9d262c36d080b}
\begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item
-{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-evaluation}\label{classmo_h_c_1175c588c19d3658cfc690d5f3f8d825}
+eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_h_c_1175c588c19d3658cfc690d5f3f8d825}
\begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moHC$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-HC$<$ M $>$}
Hill Climbing (HC).
Class which describes the algorithm for a hill climbing.
-Definition at line 49 of file moHC.h.
+
+
+Definition at line 49 of file mo\-HC.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moHC@{moHC}!moHC@{moHC}}
-\index{moHC@{moHC}!moHC@{moHC}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-move\_\-initializer}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-move\_\-selection}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_44a35bd30df6e79cff95a31b84889bd7}
+\index{moHC@{mo\-HC}!moHC@{moHC}}
+\index{moHC@{moHC}!moHC@{mo\-HC}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_44a35bd30df6e79cff95a31b84889bd7}
Full constructor.
-All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}.
+All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}.
\begin{Desc}
\item[Parameters:]
@@ -62,14 +62,14 @@ All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{
\end{Desc}
-Definition at line 69 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}}
-\index{moHC@{moHC}!moHC@{moHC}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_5002f969ef0a4d959610158fc62f137a}
+Definition at line 69 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}}
+\index{moHC@{moHC}!moHC@{mo\-HC}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_5002f969ef0a4d959610158fc62f137a}
Light constructor.
-This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl} (generally not a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}).
+This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_expl} (generally not a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}).
\begin{Desc}
\item[Parameters:]
@@ -78,17 +78,17 @@ This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl
\end{Desc}
-Definition at line 82 of file moHC.h.
+Definition at line 82 of file mo\-HC.h.
\subsection{Member Function Documentation}
-\index{moHC@{moHC}!operator()@{operator()}}
-\index{operator()@{operator()}!moHC@{moHC}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moHC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_b739f9586b647e32bf31605066f984ad}
+\index{moHC@{mo\-HC}!operator()@{operator()}}
+\index{operator()@{operator()}!moHC@{mo\-HC}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-HC}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_b739f9586b647e32bf31605066f984ad}
-{\bf Function} which launches the HC.
+Function which launches the HC.
-The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.
+The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.
\begin{Desc}
\item[Parameters:]
@@ -99,12 +99,10 @@ The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a}
\item[Returns:]true. \end{Desc}
-Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+Definition at line 94 of file mo\-HC.h.
-Definition at line 94 of file moHC.h.
-
-References moHC$<$ M $>$::full\_\-evaluation, and moHC$<$ M $>$::move\_\-explorer.
+References mo\-HC$<$ M $>$::full\_\-evaluation, and mo\-HC$<$ M $>$::move\_\-explorer.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moHC.h\end{CompactItemize}
+mo\-HC.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps
index 1240e010d..1383bbf1b 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 327.869
+%%BoundingBox: 0 0 500 346.821
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.44167 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 5 def
+/rows 3 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -176,8 +176,6 @@ boxfont setfont
(moHCMoveLoopExpl< M >) cw
(moMoveLoopExpl< M >) cw
(moMoveExpl< M >) cw
-(eoBF< const M::EOType &, M::EOType &, void >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale
(moHCMoveLoopExpl< M >) 0 0 box
(moMoveLoopExpl< M >) 0 1 box
(moMoveExpl< M >) 0 2 box
- (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box
- (eoFunctorBase) 0 4 box
% ----- relations -----
@@ -205,11 +201,3 @@ solid
0 0 1 out
solid
1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
-solid
-0 0 3 out
-solid
-1 0 4 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
index 8a315110c..4dca17dd0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex
@@ -1,60 +1,62 @@
-\section{moHCMoveLoopExpl$<$ M $>$ Class Template Reference}
+\section{mo\-HCMove\-Loop\-Expl$<$ M $>$ Class Template Reference}
\label{classmo_h_c_move_loop_expl}\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}}
-Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}.
+Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}.
-{\tt \#include $<$moHCMoveLoopExpl.h$>$}
+{\tt \#include $<$mo\-HCMove\-Loop\-Expl.h$>$}
-Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=5cm]{classmo_h_c_move_loop_expl}
+\includegraphics[height=3cm]{classmo_h_c_move_loop_expl}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-move\_\-initializer, {\bf moNextMove}$<$ M $>$ \&\_\-next\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moMoveSelect}$<$ M $>$ \&\_\-move\_\-selection)
+\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection)
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-void {\bf operator()} (const {\bf EOT} \&\_\-old\_\-solution, {\bf EOT} \&\_\-new\_\-solution)
+void \bf{operator()} (const \bf{EOT} \&\_\-old\_\-solution, \bf{EOT} \&\_\-new\_\-solution)
\begin{CompactList}\small\item\em Procedure which launches the explorer. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9}
+typedef M::EOType \bf{EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-initializer}\label{classmo_h_c_move_loop_expl_17506f3f1172714f9adbfa4e8a15953a}
+\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-initializer}\label{classmo_h_c_move_loop_expl_17506f3f1172714f9adbfa4e8a15953a}
\begin{CompactList}\small\item\em Move initialiser. \item\end{CompactList}\item
-{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move\_\-generator}\label{classmo_h_c_move_loop_expl_fdc44d40d8859bae1d7b92e77f36aa30}
+\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move\_\-generator}\label{classmo_h_c_move_loop_expl_fdc44d40d8859bae1d7b92e77f36aa30}
\begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item
-{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incremental\_\-evaluation}\label{classmo_h_c_move_loop_expl_a044b28f972d007a22736b646d86f265}
+\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incremental\_\-evaluation}\label{classmo_h_c_move_loop_expl_a044b28f972d007a22736b646d86f265}
\begin{CompactList}\small\item\em (generally) Efficient evaluation. \item\end{CompactList}\item
-{\bf moMoveSelect}$<$ M $>$ \& {\bf move\_\-selection}\label{classmo_h_c_move_loop_expl_5f0532e0ee8ef8ecaeeb4e56342be443}
+\bf{mo\-Move\-Select}$<$ M $>$ \& \bf{move\_\-selection}\label{classmo_h_c_move_loop_expl_5f0532e0ee8ef8ecaeeb4e56342be443}
\begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moHCMoveLoopExpl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-HCMove\-Loop\-Expl$<$ M $>$}
-Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}.
+Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}.
-Definition at line 47 of file moHCMoveLoopExpl.h.
+
+
+Definition at line 47 of file mo\-HCMove\-Loop\-Expl.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
-\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHCMoveLoopExpl}$<$ M $>$::{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-move\_\-initializer}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-move\_\-selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_fac2eb6695ba1b797ffab4f290d760b8}
+\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
+\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_fac2eb6695ba1b797ffab4f290d760b8}
Constructor.
@@ -68,12 +70,12 @@ All the boxes have to be specified.
\end{Desc}
-Definition at line 66 of file moHCMoveLoopExpl.h.
+Definition at line 66 of file mo\-HCMove\-Loop\-Expl.h.
\subsection{Member Function Documentation}
-\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!operator()@{operator()}}
-\index{operator()@{operator()}!moHCMoveLoopExpl@{moHCMoveLoopExpl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moHCMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-old\_\-solution}, {\bf EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_fe9362c10d74a5e6ed09b56345396192}
+\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}}
+\index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-old\_\-solution}, \bf{EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_fe9362c10d74a5e6ed09b56345396192}
Procedure which launches the explorer.
@@ -87,12 +89,10 @@ The exploration starts from an old solution and provides a new solution.
\end{Desc}
-Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}.
+Definition at line 79 of file mo\-HCMove\-Loop\-Expl.h.
-Definition at line 79 of file moHCMoveLoopExpl.h.
-
-References moHCMoveLoopExpl$<$ M $>$::incremental\_\-evaluation, moHCMoveLoopExpl$<$ M $>$::move\_\-initializer, moHCMoveLoopExpl$<$ M $>$::move\_\-selection, and moHCMoveLoopExpl$<$ M $>$::next\_\-move\_\-generator.
+References mo\-HCMove\-Loop\-Expl$<$ M $>$::incremental\_\-evaluation, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-initializer, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-selection, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move\_\-generator.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moHCMoveLoopExpl.h\end{CompactItemize}
+mo\-HCMove\-Loop\-Expl.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex
index 9494ef43a..efaee4402 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex
@@ -1,72 +1,72 @@
-\section{moILS$<$ M $>$ Class Template Reference}
+\section{mo\-ILS$<$ M $>$ Class Template Reference}
\label{classmo_i_l_s}\index{moILS@{moILS}}
Iterated Local Search (ILS).
-{\tt \#include $<$moILS.h$>$}
-
-Inherits {\bf moAlgo$<$ M::EOType $>$}.
+{\tt \#include $<$mo\-ILS.h$>$}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \&\_\-algorithm, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
+\bf{mo\-ILS} (\bf{mo\-Algo}$<$ \bf{EOT} $>$ \&\_\-algorithm, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
\begin{CompactList}\small\item\em Generic constructor. \item\end{CompactList}\item
-{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \&\_\-move\_\-initializer, {\bf moNextMove}$<$ M $>$ \&\_\-next\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moMoveSelect}$<$ M $>$ \&\_\-move\_\-selection, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
-\begin{CompactList}\small\item\em Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
-{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \&\_\-move\_\-initializer, {\bf moNextMove}$<$ M $>$ \&\_\-next\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moTabuList}$<$ M $>$ \&\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-aspiration\_\-criterion, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-moTS\_\-continue, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
-\begin{CompactList}\small\item\em Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
-{\bf moILS} ({\bf moRandMove}$<$ M $>$ \&\_\-random\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-moSA\_\-continue, double \_\-initial\_\-temperature, {\bf moCoolingSchedule} \&\_\-cooling\_\-schedule, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, {\bf moComparator}$<$ {\bf EOT} $>$ \&\_\-acceptance\_\-criterion, {\bf eoMonOp}$<$ {\bf EOT} $>$ \&\_\-perturbation, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
-\begin{CompactList}\small\item\em Constructor for using a \doxyref{moSA}{p.}{classmo_s_a} for the \doxyref{moAlgo}{p.}{classmo_algo}. \item\end{CompactList}\item
-bool {\bf operator()} ({\bf EOT} \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} which launches the ILS. \item\end{CompactList}\end{CompactItemize}
+\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
+\begin{CompactList}\small\item\em Constructor for using a \doxyref{mo\-HC}{p.}{classmo_h_c} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. \item\end{CompactList}\item
+\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-mo\-TS\_\-continue, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
+\begin{CompactList}\small\item\em Constructor for using a \doxyref{mo\-TS}{p.}{classmo_t_s} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. \item\end{CompactList}\item
+\bf{mo\-ILS} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-mo\-SA\_\-continue, double \_\-initial\_\-temperature, \bf{mo\-Cooling\-Schedule} \&\_\-cooling\_\-schedule, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
+\begin{CompactList}\small\item\em Constructor for using a \doxyref{mo\-SA}{p.}{classmo_s_a} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. \item\end{CompactList}\item
+bool \bf{operator()} (\bf{EOT} \&\_\-solution)
+\begin{CompactList}\small\item\em Function which launches the ILS. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_i_l_s_c81bafc611e4d4fd44347cf7162198c7}
+typedef M::EOType \bf{EOT}\label{classmo_i_l_s_c81bafc611e4d4fd44347cf7162198c7}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_i_l_s_8c464a9eae064a78eff75d4c722b619c}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_i_l_s_8c464a9eae064a78eff75d4c722b619c}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moAlgo}$<$ {\bf EOT} $>$ \& {\bf algorithm}\label{classmo_i_l_s_5651a4d94b59d523d341d5d6e24ca311}
+\bf{mo\-Algo}$<$ \bf{EOT} $>$ \& \bf{algorithm}\label{classmo_i_l_s_5651a4d94b59d523d341d5d6e24ca311}
\begin{CompactList}\small\item\em The solution based heuristic. \item\end{CompactList}\item
-{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf continu}\label{classmo_i_l_s_30edab439401d7ec04fd8d37b4513d94}
+\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{continu}\label{classmo_i_l_s_30edab439401d7ec04fd8d37b4513d94}
\begin{CompactList}\small\item\em The stopping criterion. \item\end{CompactList}\item
-{\bf moComparator}$<$ {\bf EOT} $>$ \& {\bf acceptance\_\-criterion}\label{classmo_i_l_s_295f6d0342c67bd3dc4cb82e2adc26be}
+\bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& \bf{acceptance\_\-criterion}\label{classmo_i_l_s_295f6d0342c67bd3dc4cb82e2adc26be}
\begin{CompactList}\small\item\em The acceptance criterion. \item\end{CompactList}\item
-{\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\bf perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2}
+eo\-Mon\-Op$<$ \bf{EOT} $>$ \& \bf{perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2}
\begin{CompactList}\small\item\em The perturbation generator. \item\end{CompactList}\item
-{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-evaluation}\label{classmo_i_l_s_8e8c383ac6ec34aaf071fa18bb54be67}
+eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_i_l_s_8e8c383ac6ec34aaf071fa18bb54be67}
\begin{CompactList}\small\item\em The full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moILS$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-ILS$<$ M $>$}
Iterated Local Search (ILS).
Class which describes the algorithm for a iterated local search.
-Definition at line 50 of file moILS.h.
+
+
+Definition at line 50 of file mo\-ILS.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moILS@{moILS}!moILS@{moILS}}
-\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moAlgo}$<$ {\bf EOT} $>$ \& {\em \_\-algorithm}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c83f81ba0836ae262305efa15eeb3da2}
+\index{moILS@{mo\-ILS}!moILS@{moILS}}
+\index{moILS@{moILS}!moILS@{mo\-ILS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Algo}$<$ \bf{EOT} $>$ \& {\em \_\-algorithm}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c83f81ba0836ae262305efa15eeb3da2}
Generic constructor.
-Generic constructor using a \doxyref{moAlgo}{p.}{classmo_algo}
+Generic constructor using a \doxyref{mo\-Algo}{p.}{classmo_algo}
\begin{Desc}
\item[Parameters:]
@@ -75,59 +75,59 @@ Generic constructor using a \doxyref{moAlgo}{p.}{classmo_algo}
\end{Desc}
-Definition at line 70 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}}
-\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-move\_\-initializer}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-move\_\-selection}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_6d684a1d13ad224a911c8b0277812297}
+Definition at line 70 of file mo\-ILS.h.\index{moILS@{mo\-ILS}!moILS@{moILS}}
+\index{moILS@{moILS}!moILS@{mo\-ILS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_6d684a1d13ad224a911c8b0277812297}
-Constructor for using a \doxyref{moHC}{p.}{classmo_h_c} for the \doxyref{moAlgo}{p.}{classmo_algo}.
+Constructor for using a \doxyref{mo\-HC}{p.}{classmo_h_c} for the \doxyref{mo\-Algo}{p.}{classmo_algo}.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-move\_\-initializer}]The move initialisation (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-next\_\-move\_\-generator}]The move generator (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-incremental\_\-evaluation}]The partial evaluation function (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-move\_\-selection}]The move selection strategy (for the \doxyref{moHC}{p.}{classmo_h_c}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-perturbation}]The pertubation generator. \item[{\em \_\-full\_\-evaluation}]The evaluation function. \end{description}
+\item[{\em \_\-move\_\-initializer}]The move initialisation (for the \doxyref{mo\-HC}{p.}{classmo_h_c}). \item[{\em \_\-next\_\-move\_\-generator}]The move generator (for the \doxyref{mo\-HC}{p.}{classmo_h_c}). \item[{\em \_\-incremental\_\-evaluation}]The partial evaluation function (for the \doxyref{mo\-HC}{p.}{classmo_h_c}). \item[{\em \_\-move\_\-selection}]The move selection strategy (for the \doxyref{mo\-HC}{p.}{classmo_h_c}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-perturbation}]The pertubation generator. \item[{\em \_\-full\_\-evaluation}]The evaluation function. \end{description}
\end{Desc}
-Definition at line 87 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}}
-\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-move\_\-initializer}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-moTS\_\-continue}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_740ac81a0d06eb471592ba0861d3a6d7}
+Definition at line 87 of file mo\-ILS.h.\index{moILS@{mo\-ILS}!moILS@{moILS}}
+\index{moILS@{moILS}!moILS@{mo\-ILS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-mo\-TS\_\-continue}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_740ac81a0d06eb471592ba0861d3a6d7}
-Constructor for using a \doxyref{moTS}{p.}{classmo_t_s} for the \doxyref{moAlgo}{p.}{classmo_algo}.
+Constructor for using a \doxyref{mo\-TS}{p.}{classmo_t_s} for the \doxyref{mo\-Algo}{p.}{classmo_algo}.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-move\_\-initializer}]The move initialisation (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-next\_\-move\_\-generator}]The move generator (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-incremental\_\-evaluation}]The partial evaluation function (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-tabu\_\-list}]The tabu list (for the \doxyref{moTS}{p.}{classmo_t_s} !!!!). \item[{\em \_\-aspiration\_\-criterion}]The aspiration criterion (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-moTS\_\-continue}]The stopping criterion (for the \doxyref{moTS}{p.}{classmo_t_s}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-perturbation}]The pertubation generator. \item[{\em \_\-full\_\-evaluation}]The evaluation function. \end{description}
+\item[{\em \_\-move\_\-initializer}]The move initialisation (for the \doxyref{mo\-TS}{p.}{classmo_t_s}). \item[{\em \_\-next\_\-move\_\-generator}]The move generator (for the \doxyref{mo\-TS}{p.}{classmo_t_s}). \item[{\em \_\-incremental\_\-evaluation}]The partial evaluation function (for the \doxyref{mo\-TS}{p.}{classmo_t_s}). \item[{\em \_\-tabu\_\-list}]The tabu list (for the \doxyref{mo\-TS}{p.}{classmo_t_s} !!!!). \item[{\em \_\-aspiration\_\-criterion}]The aspiration criterion (for the \doxyref{mo\-TS}{p.}{classmo_t_s}). \item[{\em \_\-mo\-TS\_\-continue}]The stopping criterion (for the \doxyref{mo\-TS}{p.}{classmo_t_s}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-perturbation}]The pertubation generator. \item[{\em \_\-full\_\-evaluation}]The evaluation function. \end{description}
\end{Desc}
-Definition at line 108 of file moILS.h.\index{moILS@{moILS}!moILS@{moILS}}
-\index{moILS@{moILS}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moILS}$<$ M $>$::{\bf moILS} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-moSA\_\-continue}, double {\em \_\-initial\_\-temperature}, {\bf moCoolingSchedule} \& {\em \_\-cooling\_\-schedule}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, {\bf moComparator}$<$ {\bf EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, {\bf eoMonOp}$<$ {\bf EOT} $>$ \& {\em \_\-perturbation}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_36bab16abf36957dac36c467b86385bc}
+Definition at line 108 of file mo\-ILS.h.\index{moILS@{mo\-ILS}!moILS@{moILS}}
+\index{moILS@{moILS}!moILS@{mo\-ILS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-mo\-SA\_\-continue}, double {\em \_\-initial\_\-temperature}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-cooling\_\-schedule}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_36bab16abf36957dac36c467b86385bc}
-Constructor for using a \doxyref{moSA}{p.}{classmo_s_a} for the \doxyref{moAlgo}{p.}{classmo_algo}.
+Constructor for using a \doxyref{mo\-SA}{p.}{classmo_s_a} for the \doxyref{mo\-Algo}{p.}{classmo_algo}.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-random\_\-move\_\-generator}]The random move generator (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-incremental\_\-evaluation}]The partial evaluation function (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-moSA\_\-continue}]The stopping criterion (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-initial\_\-temperature}]The initial temperature (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-cooling\_\-schedule}]The cooling schedule (for the \doxyref{moSA}{p.}{classmo_s_a}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-perturbation}]The pertubation generator. \item[{\em \_\-full\_\-evaluation}]The evaluation function. \end{description}
+\item[{\em \_\-random\_\-move\_\-generator}]The random move generator (for the \doxyref{mo\-SA}{p.}{classmo_s_a}). \item[{\em \_\-incremental\_\-evaluation}]The partial evaluation function (for the \doxyref{mo\-SA}{p.}{classmo_s_a}). \item[{\em \_\-mo\-SA\_\-continue}]The stopping criterion (for the \doxyref{mo\-SA}{p.}{classmo_s_a}). \item[{\em \_\-initial\_\-temperature}]The initial temperature (for the \doxyref{mo\-SA}{p.}{classmo_s_a}). \item[{\em \_\-cooling\_\-schedule}]The cooling schedule (for the \doxyref{mo\-SA}{p.}{classmo_s_a}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-acceptance\_\-criterion}]The acceptance criterion. \item[{\em \_\-perturbation}]The pertubation generator. \item[{\em \_\-full\_\-evaluation}]The evaluation function. \end{description}
\end{Desc}
-Definition at line 130 of file moILS.h.
+Definition at line 130 of file mo\-ILS.h.
\subsection{Member Function Documentation}
-\index{moILS@{moILS}!operator()@{operator()}}
-\index{operator()@{operator()}!moILS@{moILS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moILS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_i_l_s_3f6b950e5a6c363f04b8d4c259502488}
+\index{moILS@{mo\-ILS}!operator()@{operator()}}
+\index{operator()@{operator()}!moILS@{mo\-ILS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-ILS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_3f6b950e5a6c363f04b8d4c259502488}
-{\bf Function} which launches the ILS.
+Function which launches the ILS.
-The ILS has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a}, the \doxyref{moTS}{p.}{classmo_t_s} and the \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionnary algorithm.
+The ILS has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a}, the \doxyref{mo\-TS}{p.}{classmo_t_s} and the \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionnary algorithm.
\begin{Desc}
\item[Parameters:]
@@ -138,12 +138,10 @@ The ILS has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a
\item[Returns:]true. \end{Desc}
-Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+Definition at line 146 of file mo\-ILS.h.
-Definition at line 146 of file moILS.h.
-
-References moILS$<$ M $>$::acceptance\_\-criterion, moILS$<$ M $>$::algorithm, moILS$<$ M $>$::continu, moILS$<$ M $>$::full\_\-evaluation, and moILS$<$ M $>$::perturbation.
+References mo\-ILS$<$ M $>$::acceptance\_\-criterion, mo\-ILS$<$ M $>$::algorithm, mo\-ILS$<$ M $>$::continu, mo\-ILS$<$ M $>$::full\_\-evaluation, and mo\-ILS$<$ M $>$::perturbation.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moILS.h\end{CompactItemize}
+mo\-ILS.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
index a00a3c3cb..41cee35a0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 437.158
+%%BoundingBox: 0 0 500 218.579
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.14375 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moImprBestFitAspirCrit< M >) cw
(moAspirCrit< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moImprBestFitAspirCrit< M >) 0 0 box
(moAspirCrit< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
index 370288469..2077ce9f8 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex
@@ -1,60 +1,62 @@
-\section{moImprBestFitAspirCrit$<$ M $>$ Class Template Reference}
+\section{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$ Class Template Reference}
\label{classmo_impr_best_fit_aspir_crit}\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}}
-One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}.
+One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}.
-{\tt \#include $<$moImprBestFitAspirCrit.h$>$}
+{\tt \#include $<$mo\-Impr\-Best\-Fit\-Aspir\-Crit.h$>$}
-Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit}
+\includegraphics[height=2cm]{classmo_impr_best_fit_aspir_crit}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moImprBestFitAspirCrit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340}
+\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340}
\begin{CompactList}\small\item\em Contructor. \item\end{CompactList}\item
-void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}
+void \bf{init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}
\begin{CompactList}\small\item\em Initialisation procedure. \item\end{CompactList}\item
-bool {\bf operator()} (const M \&\_\-move, const {\bf Fitness} \&\_\-fitness)
-\begin{CompactList}\small\item\em {\bf Function} that indicates if the current fitness is better that the already saved fitness. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness)
+\begin{CompactList}\small\item\em Function that indicates if the current fitness is better that the already saved fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf Fitness} {\bf best\_\-fitness}\label{classmo_impr_best_fit_aspir_crit_03230e8672389de65aacd2bf7b6c1184}
+\bf{Fitness} \bf{best\_\-fitness}\label{classmo_impr_best_fit_aspir_crit_03230e8672389de65aacd2bf7b6c1184}
\begin{CompactList}\small\item\em Best fitness found until now. \item\end{CompactList}\item
-bool {\bf first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265}
+bool \bf{first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265}
\begin{CompactList}\small\item\em Indicates that a fitness has been already saved or not. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moImprBestFitAspirCrit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}
-One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}.
+One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}.
This criterion is satisfied when a given fitness is the best ever considered.
-Definition at line 47 of file moImprBestFitAspirCrit.h.
+
+
+Definition at line 47 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h.
\subsection{Member Function Documentation}
-\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}!operator()@{operator()}}
-\index{operator()@{operator()}!moImprBestFitAspirCrit@{moImprBestFitAspirCrit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moImprBestFitAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-move}, const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_b6e5e96d57a6b846033fc22a9951b067}
+\index{moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}!operator()@{operator()}}
+\index{operator()@{operator()}!moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_b6e5e96d57a6b846033fc22a9951b067}
-{\bf Function} that indicates if the current fitness is better that the already saved fitness.
+Function that indicates if the current fitness is better that the already saved fitness.
The first time, the function only saved the current move and fitness.
@@ -67,10 +69,10 @@ The first time, the function only saved the current move and fitness.
\item[Returns:]true The first time and if \_\-fitntess $>$ best\_\-fitness, else false. \end{Desc}
-Definition at line 75 of file moImprBestFitAspirCrit.h.
+Definition at line 73 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h.
-References moImprBestFitAspirCrit$<$ M $>$::best\_\-fitness, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time.
+References mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::best\_\-fitness, and mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::first\_\-time.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moImprBestFitAspirCrit.h\end{CompactItemize}
+mo\-Impr\-Best\-Fit\-Aspir\-Crit.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
index 5f2df0014..bc4ea56dc 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 490.798
+%%BoundingBox: 0 0 500 245.399
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moItRandNextMove< M >) cw
(moNextMove< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moItRandNextMove< M >) 0 0 box
(moNextMove< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
index 17c436d62..0f91e98a2 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex
@@ -1,61 +1,63 @@
-\section{moItRandNextMove$<$ M $>$ Class Template Reference}
+\section{mo\-It\-Rand\-Next\-Move$<$ M $>$ Class Template Reference}
\label{classmo_it_rand_next_move}\index{moItRandNextMove@{moItRandNextMove}}
-One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}.
+One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}.
-{\tt \#include $<$moItRandNextMove.h$>$}
+{\tt \#include $<$mo\-It\-Rand\-Next\-Move.h$>$}
-Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_it_rand_next_move}
+\includegraphics[height=2cm]{classmo_it_rand_next_move}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \&\_\-random\_\-move\_\-generator, unsigned int \_\-iteration\_\-maximum\_\-number)
+\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, unsigned int \_\-iteration\_\-maximum\_\-number)
\begin{CompactList}\small\item\em The constructor. \item\end{CompactList}\item
-bool {\bf operator()} (M \&\_\-move, const {\bf EOT} \&\_\-solution)
+bool \bf{operator()} (M \&\_\-move, const \bf{EOT} \&\_\-solution)
\begin{CompactList}\small\item\em Generation of a new move. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf}
+typedef M::EOType \bf{EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moRandMove}$<$ M $>$ \& {\bf random\_\-move\_\-generator}\label{classmo_it_rand_next_move_92601819402ad00d01933113d0bcf40d}
+\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{random\_\-move\_\-generator}\label{classmo_it_rand_next_move_92601819402ad00d01933113d0bcf40d}
\begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item
-unsigned int {\bf iteration\_\-maximum\_\-number}\label{classmo_it_rand_next_move_1b06067aee7a78f8a255563391514d2d}
+unsigned int \bf{iteration\_\-maximum\_\-number}\label{classmo_it_rand_next_move_1b06067aee7a78f8a255563391514d2d}
\begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item
-unsigned int {\bf iteration\_\-number}\label{classmo_it_rand_next_move_2f8d52c88d6c002be518091cc52beca1}
+unsigned int \bf{iteration\_\-number}\label{classmo_it_rand_next_move_2f8d52c88d6c002be518091cc52beca1}
\begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moItRandNextMove$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-It\-Rand\-Next\-Move$<$ M $>$}
-One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}.
+One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}.
-This class is a move (\doxyref{moMove}{p.}{classmo_move}) generator with a bound for the maximum number of iterations.
+This class is a move (\doxyref{mo\-Move}{p.}{classmo_move}) generator with a bound for the maximum number of iterations.
-Definition at line 47 of file moItRandNextMove.h.
+
+
+Definition at line 47 of file mo\-It\-Rand\-Next\-Move.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}}
-\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moItRandNextMove}$<$ M $>$::{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, unsigned int {\em \_\-iteration\_\-maximum\_\-number})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_c27b1fb0d64d4862dd886f7a59419b8c}
+\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!moItRandNextMove@{moItRandNextMove}}
+\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, unsigned int {\em \_\-iteration\_\-maximum\_\-number})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_c27b1fb0d64d4862dd886f7a59419b8c}
The constructor.
-{\bf Parameters} only for initialising the attributes.
+Parameters only for initialising the attributes.
\begin{Desc}
\item[Parameters:]
@@ -64,12 +66,12 @@ The constructor.
\end{Desc}
-Definition at line 61 of file moItRandNextMove.h.
+Definition at line 61 of file mo\-It\-Rand\-Next\-Move.h.
\subsection{Member Function Documentation}
-\index{moItRandNextMove@{moItRandNextMove}!operator()@{operator()}}
-\index{operator()@{operator()}!moItRandNextMove@{moItRandNextMove}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moItRandNextMove}$<$ M $>$::operator() (M \& {\em \_\-move}, const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_21454db723a12fe6c8eb5caeccd32df6}
+\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!operator()@{operator()}}
+\index{operator()@{operator()}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::operator() (M \& {\em \_\-move}, const \bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_21454db723a12fe6c8eb5caeccd32df6}
Generation of a new move.
@@ -85,10 +87,10 @@ If the maximum number is not already reached, the current move is forgotten and
\item[Returns:]false if the maximum number of iteration is reached, else true. \end{Desc}
-Definition at line 73 of file moItRandNextMove.h.
+Definition at line 73 of file mo\-It\-Rand\-Next\-Move.h.
-References moItRandNextMove$<$ M $>$::iteration\_\-maximum\_\-number, moItRandNextMove$<$ M $>$::iteration\_\-number, and moItRandNextMove$<$ M $>$::random\_\-move\_\-generator.
+References mo\-It\-Rand\-Next\-Move$<$ M $>$::iteration\_\-maximum\_\-number, mo\-It\-Rand\-Next\-Move$<$ M $>$::iteration\_\-number, and mo\-It\-Rand\-Next\-Move$<$ M $>$::random\_\-move\_\-generator.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moItRandNextMove.h\end{CompactItemize}
+mo\-It\-Rand\-Next\-Move.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
index 1362d6392..d14d35f38 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex
@@ -1,47 +1,43 @@
-\section{moLSCheckPoint$<$ M $>$ Class Template Reference}
+\section{mo\-LSCheck\-Point$<$ M $>$ Class Template Reference}
\label{classmo_l_s_check_point}\index{moLSCheckPoint@{moLSCheckPoint}}
Class which allows a checkpointing system.
-{\tt \#include $<$moLSCheckPoint.h$>$}
+{\tt \#include $<$mo\-LSCheck\-Point.h$>$}
-Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H]
-\begin{center}
-\leavevmode
-\includegraphics[height=3cm]{classmo_l_s_check_point}
-\end{center}
-\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-void {\bf operator()} (const M \&\_\-move, const typename M::EOType \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} which launches the checkpointing. \item\end{CompactList}\item
-void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-function)
+void \bf{operator()} (const M \&\_\-move, const typename M::EOType \&\_\-solution)
+\begin{CompactList}\small\item\em Function which launches the checkpointing. \item\end{CompactList}\item
+void \bf{add} (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-function)
\begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-std::vector$<$ {\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf functions}\label{classmo_l_s_check_point_56a7427a6aebac7955c22bab302c050a}
+std::vector$<$ eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ \bf{functions}\label{classmo_l_s_check_point_56a7427a6aebac7955c22bab302c050a}
\begin{CompactList}\small\item\em Vector of functions. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moLSCheckPoint$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-LSCheck\-Point$<$ M $>$}
Class which allows a checkpointing system.
Thanks to this class, at each iteration, additionnal function can be used (and not only one).
-Definition at line 46 of file moLSCheckPoint.h.
+
+
+Definition at line 46 of file mo\-LSCheck\-Point.h.
\subsection{Member Function Documentation}
-\index{moLSCheckPoint@{moLSCheckPoint}!operator()@{operator()}}
-\index{operator()@{operator()}!moLSCheckPoint@{moLSCheckPoint}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::operator() (const M \& {\em \_\-move}, const typename M::EOType \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_e9b9d41e40dd7bab648327686b2b938d}
+\index{moLSCheckPoint@{mo\-LSCheck\-Point}!operator()@{operator()}}
+\index{operator()@{operator()}!moLSCheckPoint@{mo\-LSCheck\-Point}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::operator() (const M \& {\em \_\-move}, const typename M::EOType \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_e9b9d41e40dd7bab648327686b2b938d}
-{\bf Function} which launches the checkpointing.
+Function which launches the checkpointing.
Each saved function is used on the current move and the current solution.
@@ -52,11 +48,11 @@ Each saved function is used on the current move and the current solution.
\end{Desc}
-Definition at line 57 of file moLSCheckPoint.h.
+Definition at line 57 of file mo\-LSCheck\-Point.h.
-References moLSCheckPoint$<$ M $>$::functions.\index{moLSCheckPoint@{moLSCheckPoint}!add@{add}}
-\index{add@{add}!moLSCheckPoint@{moLSCheckPoint}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::add ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-function})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_f95f2dc556cdfbdc81688562ca95202d}
+References mo\-LSCheck\-Point$<$ M $>$::functions.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}}
+\index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::add (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-function})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_f95f2dc556cdfbdc81688562ca95202d}
Procedure which add a new function to the function vector.
@@ -68,10 +64,10 @@ The new function is added at the end of the vector. \begin{Desc}
\end{Desc}
-Definition at line 72 of file moLSCheckPoint.h.
+Definition at line 72 of file mo\-LSCheck\-Point.h.
-References moLSCheckPoint$<$ M $>$::functions.
+References mo\-LSCheck\-Point$<$ M $>$::functions.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moLSCheckPoint.h\end{CompactItemize}
+mo\-LSCheck\-Point.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps
index 3e62629a9..35d64af4d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 476.19
+%%BoundingBox: 0 0 500 238.095
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.05 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.1 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moLinearCoolingSchedule) cw
(moCoolingSchedule) cw
-(eoUF< double &, bool >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moLinearCoolingSchedule) 0 0 box
(moCoolingSchedule) 0 1 box
- (eoUF< double &, bool >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
index e4ff3c703..619e63641 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex
@@ -1,45 +1,47 @@
-\section{moLinearCoolingSchedule Class Reference}
+\section{mo\-Linear\-Cooling\-Schedule Class Reference}
\label{classmo_linear_cooling_schedule}\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}}
-One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
-{\tt \#include $<$moLinearCoolingSchedule.h$>$}
+{\tt \#include $<$mo\-Linear\-Cooling\-Schedule.h$>$}
-Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H]
+Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_linear_cooling_schedule}
+\includegraphics[height=2cm]{classmo_linear_cooling_schedule}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moLinearCoolingSchedule} (double \_\-threshold, double \_\-quantity)
+\bf{mo\-Linear\-Cooling\-Schedule} (double \_\-threshold, double \_\-quantity)
\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item
-bool {\bf operator()} (double \&\_\-current\_\-temperature)
-\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (double \&\_\-current\_\-temperature)
+\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-double {\bf threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76}
+double \bf{threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76}
\begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item
-double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed}
+double \bf{quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed}
\begin{CompactList}\small\item\em The quantity that allows the temperature to decrease. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}.
+One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}.
An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold.
-Definition at line 46 of file moLinearCoolingSchedule.h.
+
+
+Definition at line 46 of file mo\-Linear\-Cooling\-Schedule.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
-\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moLinearCoolingSchedule::moLinearCoolingSchedule (double {\em \_\-threshold}, double {\em \_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_420939ebf57f01d242cbe4eb668dffde}
+\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
+\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Linear\-Cooling\-Schedule::mo\-Linear\-Cooling\-Schedule (double {\em \_\-threshold}, double {\em \_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_420939ebf57f01d242cbe4eb668dffde}
Simple constructor.
@@ -51,15 +53,15 @@ Simple constructor.
\end{Desc}
-Definition at line 55 of file moLinearCoolingSchedule.h.
+Definition at line 55 of file mo\-Linear\-Cooling\-Schedule.h.
\subsection{Member Function Documentation}
-\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!operator()@{operator()}}
-\index{operator()@{operator()}!moLinearCoolingSchedule@{moLinearCoolingSchedule}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-current\_\-temperature})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_b0a1886aaa7ee2a0c8e929e55ca321ce}
+\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}}
+\index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-current\_\-temperature})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_b0a1886aaa7ee2a0c8e929e55ca321ce}
-{\bf Function} which proceeds to the cooling.
+Function which proceeds to the cooling.
It decreases the temperature and indicates if it is greater than the threshold.
@@ -72,12 +74,10 @@ It decreases the temperature and indicates if it is greater than the threshold.
\item[Returns:]true if the new temperature (current temperature - quantity) is greater than the threshold, false otherwise. \end{Desc}
-Implements {\bf eoUF$<$ double \&, bool $>$}.
-
-Definition at line 65 of file moLinearCoolingSchedule.h.
+Definition at line 65 of file mo\-Linear\-Cooling\-Schedule.h.
References quantity, and threshold.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moLinearCoolingSchedule.h\end{CompactItemize}
+mo\-Linear\-Cooling\-Schedule.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex
index eff88ad06..5cd25c61c 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex
@@ -1,33 +1,29 @@
-\section{moMove$<$ EOT $>$ Class Template Reference}
+\section{mo\-Move$<$ EOT $>$ Class Template Reference}
\label{classmo_move}\index{moMove@{moMove}}
Definition of a move.
-{\tt \#include $<$moMove.h$>$}
+{\tt \#include $<$mo\-Move.h$>$}
-Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H]
-\begin{center}
-\leavevmode
-\includegraphics[height=3cm]{classmo_move}
-\end{center}
-\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef EOT {\bf EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba}
+typedef EOT \bf{EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moMove$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Move$<$ EOT $>$}
Definition of a move.
A move transforms a solution to another close solution. It describes how a solution can be modified to another one.
-Definition at line 49 of file moMove.h.
+
+
+Definition at line 49 of file mo\-Move.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moMove.h\end{CompactItemize}
+mo\-Move.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps
index 18fb8889f..708dd0b50 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 163.934
+%%BoundingBox: 0 0 500 173.41
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 5 def
+/rows 3 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moMoveExpl< M >) cw
-(eoBF< const M::EOType &, M::EOType &, void >) cw
-(eoFunctorBase) cw
(moMoveLoopExpl< M >) cw
(moHCMoveLoopExpl< M >) cw
(moTSMoveLoopExpl< M >) cw
@@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moMoveExpl< M >) 0.5 2 box
- (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box
- (eoFunctorBase) 0.5 4 box
(moMoveLoopExpl< M >) 0.5 1 box
(moHCMoveLoopExpl< M >) 0 0 box
(moTSMoveLoopExpl< M >) 1 0 box
% ----- relations -----
-solid
-0 0.5 2 out
-solid
-1 0.5 3 in
-solid
-0 0.5 3 out
-solid
-1 0.5 4 in
solid
1 0.5 1.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex
index 9d53ebd21..f0a20eb24 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex
@@ -1,27 +1,29 @@
-\section{moMoveExpl$<$ M $>$ Class Template Reference}
+\section{mo\-Move\-Expl$<$ M $>$ Class Template Reference}
\label{classmo_move_expl}\index{moMoveExpl@{moMoveExpl}}
-Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer.
+Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer.
-{\tt \#include $<$moMoveExpl.h$>$}
+{\tt \#include $<$mo\-Move\-Expl.h$>$}
-Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4.59016cm]{classmo_move_expl}
+\includegraphics[height=3cm]{classmo_move_expl}
\end{center}
\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moMoveExpl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Move\-Expl$<$ M $>$}
-Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer.
+Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer.
-Only a description...See \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}.
+Only a description...See \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}.
-Definition at line 45 of file moMoveExpl.h.
+
+
+Definition at line 46 of file mo\-Move\-Expl.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moMoveExpl.h\end{CompactItemize}
+mo\-Move\-Expl.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
index e49ccdc4c..93e64f287 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex
@@ -1,27 +1,23 @@
-\section{moMoveIncrEval$<$ M $>$ Class Template Reference}
+\section{mo\-Move\-Incr\-Eval$<$ M $>$ Class Template Reference}
\label{classmo_move_incr_eval}\index{moMoveIncrEval@{moMoveIncrEval}}
(generally) Efficient evaluation function based a move and a solution.
-{\tt \#include $<$moMoveIncrEval.h$>$}
+{\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$}
-Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H]
-\begin{center}
-\leavevmode
-\includegraphics[height=3cm]{classmo_move_incr_eval}
-\end{center}
-\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moMoveIncrEval$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Move\-Incr\-Eval$<$ M $>$}
(generally) Efficient evaluation function based a move and a solution.
From a move and a solution, it computes a new fitness that could be associated to the solution if this one is updated.
-Definition at line 49 of file moMoveIncrEval.h.
+
+
+Definition at line 49 of file mo\-Move\-Incr\-Eval.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moMoveIncrEval.h\end{CompactItemize}
+mo\-Move\-Incr\-Eval.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex
index 949a2d4c9..c3ecf461a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex
@@ -1,27 +1,23 @@
-\section{moMoveInit$<$ M $>$ Class Template Reference}
+\section{mo\-Move\-Init$<$ M $>$ Class Template Reference}
\label{classmo_move_init}\index{moMoveInit@{moMoveInit}}
-Move (\doxyref{moMove}{p.}{classmo_move}) initializer.
+Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer.
-{\tt \#include $<$moMoveInit.h$>$}
+{\tt \#include $<$mo\-Move\-Init.h$>$}
-Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H]
-\begin{center}
-\leavevmode
-\includegraphics[height=3cm]{classmo_move_init}
-\end{center}
-\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moMoveInit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Move\-Init$<$ M $>$}
-Move (\doxyref{moMove}{p.}{classmo_move}) initializer.
+Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer.
Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used.
-Definition at line 47 of file moMoveInit.h.
+
+
+Definition at line 47 of file mo\-Move\-Init.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moMoveInit.h\end{CompactItemize}
+mo\-Move\-Init.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps
index c6a78b5b1..76326be37 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 163.934
+%%BoundingBox: 0 0 500 173.41
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 5 def
+/rows 3 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moMoveLoopExpl< M >) cw
(moMoveExpl< M >) cw
-(eoBF< const M::EOType &, M::EOType &, void >) cw
-(eoFunctorBase) cw
(moHCMoveLoopExpl< M >) cw
(moTSMoveLoopExpl< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale
(moMoveLoopExpl< M >) 0.5 1 box
(moMoveExpl< M >) 0.5 2 box
- (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box
- (eoFunctorBase) 0.5 4 box
(moHCMoveLoopExpl< M >) 0 0 box
(moTSMoveLoopExpl< M >) 1 0 box
@@ -204,14 +200,6 @@ solid
solid
1 0.5 2 in
solid
-0 0.5 2 out
-solid
-1 0.5 3 in
-solid
-0 0.5 3 out
-solid
-1 0.5 4 in
-solid
1 0.5 0.25 out
solid
0 1 1 conn
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
index 2132e4306..102be85ad 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex
@@ -1,27 +1,29 @@
-\section{moMoveLoopExpl$<$ M $>$ Class Template Reference}
+\section{mo\-Move\-Loop\-Expl$<$ M $>$ Class Template Reference}
\label{classmo_move_loop_expl}\index{moMoveLoopExpl@{moMoveLoopExpl}}
Class which describes an iterative explorer.
-{\tt \#include $<$moMoveLoopExpl.h$>$}
+{\tt \#include $<$mo\-Move\-Loop\-Expl.h$>$}
-Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4.59016cm]{classmo_move_loop_expl}
+\includegraphics[height=3cm]{classmo_move_loop_expl}
\end{center}
\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moMoveLoopExpl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Move\-Loop\-Expl$<$ M $>$}
Class which describes an iterative explorer.
-Only a description... \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}.
+Only a description... \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}.
-Definition at line 47 of file moMoveLoopExpl.h.
+
+
+Definition at line 47 of file mo\-Move\-Loop\-Expl.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moMoveLoopExpl.h\end{CompactItemize}
+mo\-Move\-Loop\-Expl.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps
index b61e2bf9f..86a37c002 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 101.01
+%%BoundingBox: 0 0 500 83.8574
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 4.95 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 5.9625 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 3 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moMoveSelect< M >) cw
-(eoBF< M &, M::EOType::Fitness &, void >) cw
-(eoFunctorBase) cw
(moBestImprSelect< M >) cw
(moFirstImprSelect< M >) cw
(moRandImprSelect< M >) cw
@@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moMoveSelect< M >) 1 1 box
- (eoBF< M &, M::EOType::Fitness &, void >) 1 2 box
- (eoFunctorBase) 1 3 box
(moBestImprSelect< M >) 0 0 box
(moFirstImprSelect< M >) 1 0 box
(moRandImprSelect< M >) 2 0 box
% ----- relations -----
-solid
-0 1 1 out
-solid
-1 1 2 in
-solid
-0 1 2 out
-solid
-1 1 3 in
solid
1 1 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex
index 62736edfd..d682c30d0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex
@@ -1,44 +1,46 @@
-\section{moMoveSelect$<$ M $>$ Class Template Reference}
+\section{mo\-Move\-Select$<$ M $>$ Class Template Reference}
\label{classmo_move_select}\index{moMoveSelect@{moMoveSelect}}
-Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}).
+Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}).
-{\tt \#include $<$moMoveSelect.h$>$}
+{\tt \#include $<$mo\-Move\-Select.h$>$}
-Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2.82828cm]{classmo_move_select}
+\includegraphics[height=2cm]{classmo_move_select}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void {\bf init} (const {\bf Fitness} \&\_\-fitness)=0
+virtual void \bf{init} (const \bf{Fitness} \&\_\-fitness)=0
\begin{CompactList}\small\item\em Procedure which initialises all that the move selector needs including the initial fitness. \item\end{CompactList}\item
-virtual bool {\bf update} (const M \&\_\-move, const {\bf Fitness} \&\_\-fitness)=0
-\begin{CompactList}\small\item\em {\bf Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize}
+virtual bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness)=0
+\begin{CompactList}\small\item\em Function which updates the best solutions. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moMoveSelect$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Move\-Select$<$ M $>$}
-Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}).
+Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}).
-It iteratively considers some moves (\doxyref{moMove}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
+It iteratively considers some moves (\doxyref{mo\-Move}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.
-Definition at line 50 of file moMoveSelect.h.
+
+
+Definition at line 50 of file mo\-Move\-Select.h.
\subsection{Member Function Documentation}
-\index{moMoveSelect@{moMoveSelect}!init@{init}}
-\index{init@{init}!moMoveSelect@{moMoveSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moMoveSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_58038bd859632c1bd022d23d9792bdca}
+\index{moMoveSelect@{mo\-Move\-Select}!init@{init}}
+\index{init@{init}!moMoveSelect@{mo\-Move\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Move\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_58038bd859632c1bd022d23d9792bdca}
Procedure which initialises all that the move selector needs including the initial fitness.
@@ -52,12 +54,12 @@ In order to know the fitness of the solution, for which the neighborhood will be
\end{Desc}
-Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_83f961549986b8ad94692e433aa79114}, {\bf moFirstImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_a923437ecc3db50e7052b002a9a1bbf8}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_7af99966b31aa387ecef74fd307a42e8}.\index{moMoveSelect@{moMoveSelect}!update@{update}}
-\index{update@{update}!moMoveSelect@{moMoveSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf moMoveSelect}$<$ M $>$::update (const M \& {\em \_\-move}, const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}
+Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_83f961549986b8ad94692e433aa79114}, \bf{mo\-First\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_first_impr_select_a923437ecc3db50e7052b002a9a1bbf8}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_7af99966b31aa387ecef74fd307a42e8}.\index{moMoveSelect@{mo\-Move\-Select}!update@{update}}
+\index{update@{update}!moMoveSelect@{mo\-Move\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool \bf{mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}
-{\bf Function} which updates the best solutions.
+Function which updates the best solutions.
\begin{Desc}
\item[Parameters:]
@@ -68,8 +70,8 @@ Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_
\item[Returns:]a boolean that expresses the need to resume the exploration. \end{Desc}
-Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_5c0729fd316b0ef78406bce5ca91de2a}, {\bf moFirstImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_f68b7ee7b35bf7347c16006f0587d313}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_b20cfd0164266aa75960cba3c1673f69}.
+Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_5c0729fd316b0ef78406bce5ca91de2a}, \bf{mo\-First\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_first_impr_select_f68b7ee7b35bf7347c16006f0587d313}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_b20cfd0164266aa75960cba3c1673f69}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moMoveSelect.h\end{CompactItemize}
+mo\-Move\-Select.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps
index 08b997f12..d9586a593 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 490.798
+%%BoundingBox: 0 0 500 245.399
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moNextMove< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
(moItRandNextMove< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
@@ -189,20 +187,10 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moNextMove< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
(moItRandNextMove< M >) 0 0 box
% ----- relations -----
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
solid
1 0 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex
index fe0d8d923..b69390f0b 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex
@@ -1,27 +1,29 @@
-\section{moNextMove$<$ M $>$ Class Template Reference}
+\section{mo\-Next\-Move$<$ M $>$ Class Template Reference}
\label{classmo_next_move}\index{moNextMove@{moNextMove}}
-Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}).
+Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}).
-{\tt \#include $<$moNextMove.h$>$}
+{\tt \#include $<$mo\-Next\-Move.h$>$}
-Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_next_move}
+\includegraphics[height=2cm]{classmo_next_move}
\end{center}
\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moNextMove$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Next\-Move$<$ M $>$}
-Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}).
+Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}).
-Useful for the explorer (for \doxyref{moTS}{p.}{classmo_t_s} or \doxyref{moHC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used.
+Useful for the explorer (for \doxyref{mo\-TS}{p.}{classmo_t_s} or \doxyref{mo\-HC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used.
-Definition at line 47 of file moNextMove.h.
+
+
+Definition at line 47 of file mo\-Next\-Move.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moNextMove.h\end{CompactItemize}
+mo\-Next\-Move.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
index f5d50a373..4a1de4c86 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 583.942
+%%BoundingBox: 0 0 500 291.971
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.7125 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moNoAspirCrit< M >) cw
(moAspirCrit< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moNoAspirCrit< M >) 0 0 box
(moAspirCrit< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
index 3168eb3e7..1ebd893bc 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex
@@ -1,41 +1,43 @@
-\section{moNoAspirCrit$<$ M $>$ Class Template Reference}
+\section{mo\-No\-Aspir\-Crit$<$ M $>$ Class Template Reference}
\label{classmo_no_aspir_crit}\index{moNoAspirCrit@{moNoAspirCrit}}
-One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}).
+One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}).
-{\tt \#include $<$moNoAspirCrit.h$>$}
+{\tt \#include $<$mo\-No\-Aspir\-Crit.h$>$}
-Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_no_aspir_crit}
+\includegraphics[height=2cm]{classmo_no_aspir_crit}
\end{center}
\end{figure}
-\subsection*{Private Member Functions}
+\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-bool {\bf operator()} (const M \&\_\-move, const typename M::EOType::Fitness \&\_\-fitness)
-\begin{CompactList}\small\item\em {\bf Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item
-void {\bf init} ()
-\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (const M \&\_\-move, const typename M::EOType::Fitness \&\_\-fitness)
+\begin{CompactList}\small\item\em Function which describes the aspiration criterion behaviour. \item\end{CompactList}\item
+void \bf{init} ()
+\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moNoAspirCrit$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-No\-Aspir\-Crit$<$ M $>$}
-One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}).
+One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}).
The simplest : never satisfied.
-Definition at line 47 of file moNoAspirCrit.h.
+
+
+Definition at line 47 of file mo\-No\-Aspir\-Crit.h.
\subsection{Member Function Documentation}
-\index{moNoAspirCrit@{moNoAspirCrit}!operator()@{operator()}}
-\index{operator()@{operator()}!moNoAspirCrit@{moNoAspirCrit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moNoAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-move}, const typename M::EOType::Fitness \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_289aac56f03c4651fcbcec4a91fb6fd6}
+\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!operator()@{operator()}}
+\index{operator()@{operator()}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-move}, const typename M::EOType::Fitness \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_aspir_crit_289aac56f03c4651fcbcec4a91fb6fd6}
-{\bf Function} which describes the aspiration criterion behaviour.
+Function which describes the aspiration criterion behaviour.
Does nothing.
@@ -48,19 +50,19 @@ Does nothing.
\item[Returns:]false. \end{Desc}
-Definition at line 57 of file moNoAspirCrit.h.\index{moNoAspirCrit@{moNoAspirCrit}!init@{init}}
-\index{init@{init}!moNoAspirCrit@{moNoAspirCrit}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moNoAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}
+Definition at line 59 of file mo\-No\-Aspir\-Crit.h.\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!init@{init}}
+\index{init@{init}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}
-Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}.
+Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}.
Nothing...
-Implements {\bf moAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}.
+Implements \bf{mo\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}.
-Definition at line 66 of file moNoAspirCrit.h.
+Definition at line 73 of file mo\-No\-Aspir\-Crit.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moNoAspirCrit.h\end{CompactItemize}
+mo\-No\-Aspir\-Crit.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps
index 67d7d5048..6c532ffcd 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 386.473
+%%BoundingBox: 0 0 500 193.237
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.29375 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.5875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moNoFitImprSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
-(eoUF< const EOT &, bool >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moNoFitImprSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
- (eoUF< const EOT &, bool >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex
index be8997c1c..0314d36c5 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex
@@ -1,61 +1,63 @@
-\section{moNoFitImprSolContinue$<$ EOT $>$ Class Template Reference}
+\section{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
\label{classmo_no_fit_impr_sol_continue}\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}}
One possible stop criterion for a solution-based heuristic.
-{\tt \#include $<$moNoFitImprSolContinue.h$>$}
+{\tt \#include $<$mo\-No\-Fit\-Impr\-Sol\-Continue.h$>$}
-Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_no_fit_impr_sol_continue}
+\includegraphics[height=2cm]{classmo_no_fit_impr_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moNoFitImprSolContinue} (unsigned int \_\-maxNumberOfIterationWithoutImprovement)
+\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int \_\-max\-Number\-Of\-Iteration\-Without\-Improvement)
\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item
-bool {\bf operator()} (const EOT \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item
-void {\bf init} ()
+bool \bf{operator()} (const EOT \&\_\-solution)
+\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item
+void \bf{init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b}
+unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b}
\begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item
-bool {\bf firstFitnessSaved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef}
+bool \bf{first\-Fitness\-Saved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef}
\begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item
-{\bf Fitness} {\bf fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7}
+\bf{Fitness} \bf{fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7}
\begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item
-unsigned int {\bf counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb}
+unsigned int \bf{counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb}
\begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moNoFitImprSolContinue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$}
One possible stop criterion for a solution-based heuristic.
The stop criterion corresponds to a maximum number of iterations without improvement.
-Definition at line 46 of file moNoFitImprSolContinue.h.
+
+
+Definition at line 46 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}}
-\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moNoFitImprSolContinue}$<$ EOT $>$::{\bf moNoFitImprSolContinue} (unsigned int {\em \_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_0793f68a0ad558c8203b97c33c8f9c90}
+\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}}
+\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int {\em \_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_0793f68a0ad558c8203b97c33c8f9c90}
Basic constructor.
@@ -63,19 +65,19 @@ Basic constructor.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description}
+\item[{\em \_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description}
\end{Desc}
-Definition at line 57 of file moNoFitImprSolContinue.h.
+Definition at line 57 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h.
\subsection{Member Function Documentation}
-\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!operator()@{operator()}}
-\index{operator()@{operator()}!moNoFitImprSolContinue@{moNoFitImprSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_d8966c73cbe625644df9061377f7221a}
+\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!operator()@{operator()}}
+\index{operator()@{operator()}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_d8966c73cbe625644df9061377f7221a}
-{\bf Function} that activates the stopping criterion.
+Function that activates the stopping criterion.
Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). \begin{Desc}
\item[Parameters:]
@@ -86,25 +88,23 @@ Indicates if the fitness has not been improved since a given number of iteration
\item[Returns:]true or false. \end{Desc}
-Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+Definition at line 67 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h.
-Definition at line 67 of file moNoFitImprSolContinue.h.
-
-References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, and moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!init@{init}}
-\index{init@{init}!moNoFitImprSolContinue@{moNoFitImprSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moNoFitImprSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}
+References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::fitness, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!init@{init}}
+\index{init@{init}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}
Procedure which allows to initialise all the stuff needed.
It can be also used to reinitialize all the needed things.
-Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
+Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
-Definition at line 102 of file moNoFitImprSolContinue.h.
+Definition at line 102 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h.
-References moNoFitImprSolContinue$<$ EOT $>$::counter, and moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved.
+References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moNoFitImprSolContinue.h\end{CompactItemize}
+mo\-No\-Fit\-Impr\-Sol\-Continue.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps
index fe55210a4..74d2fc0f6 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 303.03
+%%BoundingBox: 0 0 500 251.572
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.9875 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moRandImprSelect< M >) cw
(moMoveSelect< M >) cw
-(eoBF< M &, M::EOType::Fitness &, void >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moRandImprSelect< M >) 0 0 box
(moMoveSelect< M >) 0 1 box
- (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
index df5de5fde..cb9743f3f 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex
@@ -1,61 +1,66 @@
-\section{moRandImprSelect$<$ M $>$ Class Template Reference}
+\section{mo\-Rand\-Impr\-Select$<$ M $>$ Class Template Reference}
\label{classmo_rand_impr_select}\index{moRandImprSelect@{moRandImprSelect}}
-One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}).
+One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}).
-{\tt \#include $<$moRandImprSelect.h$>$}
+{\tt \#include $<$mo\-Rand\-Impr\-Select.h$>$}
-Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_rand_impr_select}
+\includegraphics[height=2cm]{classmo_rand_impr_select}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-void {\bf init} (const {\bf Fitness} \&\_\-fitness)
-\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item
-bool {\bf update} (const M \&\_\-move, const {\bf Fitness} \&\_\-fitness)
-\begin{CompactList}\small\item\em {\bf Function} that updates the fitness and move vectors. \item\end{CompactList}\item
-void {\bf operator()} (M \&\_\-move, {\bf Fitness} \&\_\-fitness)
+void \bf{init} (const \bf{Fitness} \&\_\-fitness)
+\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item
+bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness)
+\begin{CompactList}\small\item\em Function that updates the fitness and move vectors. \item\end{CompactList}\item
+void \bf{operator()} (M \&\_\-move, \bf{Fitness} \&\_\-fitness)
\begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf Fitness} {\bf initial\_\-fitness}\label{classmo_rand_impr_select_d566fa23689861b1d04257e53c71ae20}
+\bf{Fitness} \bf{initial\_\-fitness}\label{classmo_rand_impr_select_d566fa23689861b1d04257e53c71ae20}
\begin{CompactList}\small\item\em Fitness of the current solution. \item\end{CompactList}\item
-std::vector$<$ {\bf Fitness} $>$ {\bf better\_\-fitnesses}\label{classmo_rand_impr_select_220d6e3db838b11938e59bc7b29a0db6}
+std::vector$<$ \bf{Fitness} $>$ \bf{better\_\-fitnesses}\label{classmo_rand_impr_select_220d6e3db838b11938e59bc7b29a0db6}
\begin{CompactList}\small\item\em Candidate fitnesse vector. \item\end{CompactList}\item
-std::vector$<$ M $>$ {\bf better\_\-moves}\label{classmo_rand_impr_select_8a2e7bd7d7a74d7f7402ef25737b09e1}
+std::vector$<$ M $>$ \bf{better\_\-moves}\label{classmo_rand_impr_select_8a2e7bd7d7a74d7f7402ef25737b09e1}
-\begin{CompactList}\small\item\em Candidate move vector. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em Candidate move vector. \item\end{CompactList}\item
+bool \bf{first\-Time}\label{classmo_rand_impr_select_18f21c5ec337b45f634aaa094ad698ae}
+
+\begin{CompactList}\small\item\em Indicate if update has been called or not. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moRandImprSelect$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Rand\-Impr\-Select$<$ M $>$}
-One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}).
+One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}).
All the neighbors are considered. One of them that enables an improvment of the objective function is choosen.
-Definition at line 49 of file moRandImprSelect.h.
+
+
+Definition at line 49 of file mo\-Rand\-Impr\-Select.h.
\subsection{Member Function Documentation}
-\index{moRandImprSelect@{moRandImprSelect}!init@{init}}
-\index{init@{init}!moRandImprSelect@{moRandImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_7af99966b31aa387ecef74fd307a42e8}
+\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!init@{init}}
+\index{init@{init}!moRandImprSelect@{mo\-Rand\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_7af99966b31aa387ecef74fd307a42e8}
-Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}.
+Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}.
Give a value to the initialise fitness. Clean the move and fitness vectors.
@@ -66,16 +71,16 @@ Give a value to the initialise fitness. Clean the move and fitness vectors.
\end{Desc}
-Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_58038bd859632c1bd022d23d9792bdca}.
+Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_58038bd859632c1bd022d23d9792bdca}.
-Definition at line 63 of file moRandImprSelect.h.
+Definition at line 63 of file mo\-Rand\-Impr\-Select.h.
-References moRandImprSelect$<$ M $>$::better\_\-fitnesses, moRandImprSelect$<$ M $>$::better\_\-moves, and moRandImprSelect$<$ M $>$::initial\_\-fitness.\index{moRandImprSelect@{moRandImprSelect}!update@{update}}
-\index{update@{update}!moRandImprSelect@{moRandImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moRandImprSelect}$<$ M $>$::update (const M \& {\em \_\-move}, const {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_b20cfd0164266aa75960cba3c1673f69}
+References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-moves, mo\-Rand\-Impr\-Select$<$ M $>$::first\-Time, and mo\-Rand\-Impr\-Select$<$ M $>$::initial\_\-fitness.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!update@{update}}
+\index{update@{update}!moRandImprSelect@{mo\-Rand\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_b20cfd0164266aa75960cba3c1673f69}
-{\bf Function} that updates the fitness and move vectors.
+Function that updates the fitness and move vectors.
if a move give a better fitness than the initial fitness, it is saved and the fitness too.
@@ -88,13 +93,13 @@ if a move give a better fitness than the initial fitness, it is saved and the fi
\item[Returns:]true. \end{Desc}
-Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}.
+Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404}.
-Definition at line 79 of file moRandImprSelect.h.
+Definition at line 80 of file mo\-Rand\-Impr\-Select.h.
-References moRandImprSelect$<$ M $>$::better\_\-fitnesses, moRandImprSelect$<$ M $>$::better\_\-moves, and moRandImprSelect$<$ M $>$::initial\_\-fitness.\index{moRandImprSelect@{moRandImprSelect}!operator()@{operator()}}
-\index{operator()@{operator()}!moRandImprSelect@{moRandImprSelect}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::operator() (M \& {\em \_\-move}, {\bf Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_1bc88f10830960c1d88e22e444c4e670}
+References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-moves, mo\-Rand\-Impr\-Select$<$ M $>$::first\-Time, and mo\-Rand\-Impr\-Select$<$ M $>$::initial\_\-fitness.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}}
+\index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_rand_impr_select_1bc88f10830960c1d88e22e444c4e670}
The move selection.
@@ -108,12 +113,10 @@ One the saved move is randomly chosen.
\end{Desc}
-Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}.
+Definition at line 100 of file mo\-Rand\-Impr\-Select.h.
-Definition at line 98 of file moRandImprSelect.h.
-
-References moRandImprSelect$<$ M $>$::better\_\-fitnesses, moRandImprSelect$<$ M $>$::better\_\-moves, and eoRng::random().
+References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-moves, and mo\-Rand\-Impr\-Select$<$ M $>$::first\-Time.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moRandImprSelect.h\end{CompactItemize}
+mo\-Rand\-Impr\-Select.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex
index 3593c7055..5c76871d6 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex
@@ -1,27 +1,23 @@
-\section{moRandMove$<$ M $>$ Class Template Reference}
+\section{mo\-Rand\-Move$<$ M $>$ Class Template Reference}
\label{classmo_rand_move}\index{moRandMove@{moRandMove}}
Random move generator.
-{\tt \#include $<$moRandMove.h$>$}
+{\tt \#include $<$mo\-Rand\-Move.h$>$}
-Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H]
-\begin{center}
-\leavevmode
-\includegraphics[height=3cm]{classmo_rand_move}
-\end{center}
-\end{figure}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moRandMove$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Rand\-Move$<$ M $>$}
Random move generator.
-Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{moSA}{p.}{classmo_s_a}.
+Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{mo\-SA}{p.}{classmo_s_a}.
-Definition at line 46 of file moRandMove.h.
+
+
+Definition at line 46 of file mo\-Rand\-Move.h.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moRandMove.h\end{CompactItemize}
+mo\-Rand\-Move.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex
index d55b636ad..97777c58a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex
@@ -1,64 +1,64 @@
-\section{moSA$<$ M $>$ Class Template Reference}
+\section{mo\-SA$<$ M $>$ Class Template Reference}
\label{classmo_s_a}\index{moSA@{moSA}}
Simulated Annealing (SA).
-{\tt \#include $<$moSA.h$>$}
-
-Inherits {\bf moAlgo$<$ M::EOType $>$}.
+{\tt \#include $<$mo\-SA.h$>$}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-random\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, double \_\-initial\_\-temperature, {\bf moCoolingSchedule} \&\_\-cooling\_\-schedule, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
+\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, double \_\-initial\_\-temperature, \bf{mo\-Cooling\-Schedule} \&\_\-cooling\_\-schedule, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
\begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item
-bool {\bf operator()} ({\bf EOT} \&\_\-solution)
+bool \bf{operator()} (\bf{EOT} \&\_\-solution)
\begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5}
+typedef M::EOType \bf{EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moRandMove}$<$ M $>$ \& {\bf random\_\-move\_\-generator}\label{classmo_s_a_92656523f556669862fcffdccea178dd}
+\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{random\_\-move\_\-generator}\label{classmo_s_a_92656523f556669862fcffdccea178dd}
\begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item
-{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incremental\_\-evaluation}\label{classmo_s_a_fdb49f837dc602624554279418c94bdb}
+\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incremental\_\-evaluation}\label{classmo_s_a_fdb49f837dc602624554279418c94bdb}
\begin{CompactList}\small\item\em A (generally) efficient evaluation function. \item\end{CompactList}\item
-{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf continu}\label{classmo_s_a_776586a839c2bbd6d12a731c12a1b748}
+\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{continu}\label{classmo_s_a_776586a839c2bbd6d12a731c12a1b748}
\begin{CompactList}\small\item\em Stopping criterion before temperature update. \item\end{CompactList}\item
-double {\bf initial\_\-temperature}\label{classmo_s_a_e07bf4ca64248e94ab85e8a1ba32aa8c}
+double \bf{initial\_\-temperature}\label{classmo_s_a_e07bf4ca64248e94ab85e8a1ba32aa8c}
\begin{CompactList}\small\item\em Initial temperature. \item\end{CompactList}\item
-{\bf moCoolingSchedule} \& {\bf cooling\_\-schedule}\label{classmo_s_a_f514ae01cdfc67bf0b87d5389b3792e5}
+\bf{mo\-Cooling\-Schedule} \& \bf{cooling\_\-schedule}\label{classmo_s_a_f514ae01cdfc67bf0b87d5389b3792e5}
\begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item
-{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-evaluation}\label{classmo_s_a_ace30095ffc4924d84e14a0e59f7746f}
+eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_s_a_ace30095ffc4924d84e14a0e59f7746f}
\begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moSA$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-SA$<$ M $>$}
Simulated Annealing (SA).
Class that describes a Simulated Annealing algorithm.
-Definition at line 53 of file moSA.h.
+
+
+Definition at line 53 of file mo\-SA.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moSA@{moSA}!moSA@{moSA}}
-\index{moSA@{moSA}!moSA@{moSA}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSA}$<$ M $>$::{\bf moSA} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, double {\em \_\-initial\_\-temperature}, {\bf moCoolingSchedule} \& {\em \_\-cooling\_\-schedule}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_12e7da3a56b82daa29a30d1254da5823}
+\index{moSA@{mo\-SA}!moSA@{moSA}}
+\index{moSA@{moSA}!moSA@{mo\-SA}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-SA}$<$ M $>$::\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, double {\em \_\-initial\_\-temperature}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-cooling\_\-schedule}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_12e7da3a56b82daa29a30d1254da5823}
SA constructor.
@@ -72,17 +72,17 @@ All the boxes used by a SA need to be given.
\end{Desc}
-Definition at line 74 of file moSA.h.
+Definition at line 74 of file mo\-SA.h.
\subsection{Member Function Documentation}
-\index{moSA@{moSA}!operator()@{operator()}}
-\index{operator()@{operator()}!moSA@{moSA}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_bea8176b0c05a96696b2ab29d3f3c544}
+\index{moSA@{mo\-SA}!operator()@{operator()}}
+\index{operator()@{operator()}!moSA@{mo\-SA}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-SA}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_bea8176b0c05a96696b2ab29d3f3c544}
function that launches the SA algorithm.
-As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm.
+As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm.
\begin{Desc}
\item[Parameters:]
@@ -93,12 +93,10 @@ As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the S
\item[Returns:]TRUE. \end{Desc}
-Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+Definition at line 89 of file mo\-SA.h.
-Definition at line 89 of file moSA.h.
-
-References moSA$<$ M $>$::continu, moSA$<$ M $>$::cooling\_\-schedule, moSA$<$ M $>$::full\_\-evaluation, moSA$<$ M $>$::incremental\_\-evaluation, moSA$<$ M $>$::initial\_\-temperature, moSA$<$ M $>$::random\_\-move\_\-generator, and eoRng::uniform().
+References mo\-SA$<$ M $>$::continu, mo\-SA$<$ M $>$::cooling\_\-schedule, mo\-SA$<$ M $>$::full\_\-evaluation, mo\-SA$<$ M $>$::incremental\_\-evaluation, mo\-SA$<$ M $>$::initial\_\-temperature, and mo\-SA$<$ M $>$::random\_\-move\_\-generator.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moSA.h\end{CompactItemize}
+mo\-SA.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
index b0dcef476..624cb75de 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 427.807
+%%BoundingBox: 0 0 500 213.904
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.16875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.3375 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moSimpleMoveTabuList< M >) cw
(moTabuList< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moSimpleMoveTabuList< M >) 0 0 box
(moTabuList< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
index 992ff613a..29d7657c1 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex
@@ -1,87 +1,89 @@
-\section{moSimpleMoveTabuList$<$ M $>$ Class Template Reference}
+\section{mo\-Simple\-Move\-Tabu\-List$<$ M $>$ Class Template Reference}
\label{classmo_simple_move_tabu_list}\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}}
Class describing a move tabu list with a limited memory.
-{\tt \#include $<$moSimpleMoveTabuList.h$>$}
+{\tt \#include $<$mo\-Simple\-Move\-Tabu\-List.h$>$}
-Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_simple_move_tabu_list}
+\includegraphics[height=2cm]{classmo_simple_move_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7}
+typedef M::EOType \bf{EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef std::list$<$ M $>$::iterator {\bf moveIterator}\label{classmo_simple_move_tabu_list_4ca9387c0a20bb9f4142682cbfee26bf}
+typedef std::list$<$ M $>$::iterator \bf{move\-Iterator}\label{classmo_simple_move_tabu_list_4ca9387c0a20bb9f4142682cbfee26bf}
\begin{CompactList}\small\item\em Alias for an iterator of a move list. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moSimpleMoveTabuList} (unsigned int \_\-memory\_\-maximum\_\-size)\label{classmo_simple_move_tabu_list_c27e7fabe1370ea65f56981c5cbc1769}
+\bf{mo\-Simple\-Move\-Tabu\-List} (unsigned int \_\-memory\_\-maximum\_\-size)\label{classmo_simple_move_tabu_list_c27e7fabe1370ea65f56981c5cbc1769}
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-bool {\bf operator()} (const M \&\_\-move, const {\bf EOT} \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf 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} \&\_\-solution)
+bool \bf{operator()} (const M \&\_\-move, const \bf{EOT} \&\_\-solution)
+\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} \&\_\-solution)
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
-void {\bf update} ()
+void \bf{update} ()
\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item
-void {\bf init} ()
+void \bf{init} ()
\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Member Functions}
\begin{CompactItemize}
\item
-void {\bf removeMove} (const M \&\_\-move)
+void \bf{remove\-Move} (const M \&\_\-move)
\begin{CompactList}\small\item\em Procedure that removes a given move from the tabu list (if it is into, else do nothing). \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int {\bf memory\_\-maximum\_\-size}\label{classmo_simple_move_tabu_list_fea7fe7c62a6da9b8f087a2732f44251}
+unsigned int \bf{memory\_\-maximum\_\-size}\label{classmo_simple_move_tabu_list_fea7fe7c62a6da9b8f087a2732f44251}
\begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item
-unsigned int {\bf memory\_\-size}\label{classmo_simple_move_tabu_list_defd20fe6d0d51fdaedbc5b95018aea7}
+unsigned int \bf{memory\_\-size}\label{classmo_simple_move_tabu_list_defd20fe6d0d51fdaedbc5b95018aea7}
\begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item
-std::list$<$ M $>$ {\bf tabuList}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a}
+std::list$<$ M $>$ \bf{tabu\-List}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a}
\begin{CompactList}\small\item\em The move tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moSimpleMoveTabuList$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Simple\-Move\-Tabu\-List$<$ M $>$}
Class describing a move tabu list with a limited memory.
-Definition at line 46 of file moSimpleMoveTabuList.h.
+
+
+Definition at line 46 of file mo\-Simple\-Move\-Tabu\-List.h.
\subsection{Member Function Documentation}
-\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!operator()@{operator()}}
-\index{operator()@{operator()}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleMoveTabuList}$<$ M $>$::operator() (const M \& {\em \_\-move}, const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_8d38f296f3d7721025820f16f25fcf7e}
+\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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_8d38f296f3d7721025820f16f25fcf7e}
-{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not.
+Function that indicates if, in a given state, the \_\-move is tabu or not.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-solution}]A solution. \end{description}
+\item[{\em \_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-solution}]A solution. \end{description}
\end{Desc}
\begin{Desc}
\item[Returns:]true or false. \end{Desc}
-Definition at line 69 of file moSimpleMoveTabuList.h.
+Definition at line 69 of file mo\-Simple\-Move\-Tabu\-List.h.
-References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}}
-\index{add@{add}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::add (const M \& {\em \_\-move}, const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_e6c0835fbfab2bdc63097cf2fd5328aa}
+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 \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_e6c0835fbfab2bdc63097cf2fd5328aa}
Procedure to add a move in the tabu list.
@@ -95,35 +97,35 @@ The two parameters have not to be modified so they are constant parameters.
\end{Desc}
-Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_55204939b6d67b6d37b4af725d70cf6d}.
+Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_55204939b6d67b6d37b4af725d70cf6d}.
-Definition at line 86 of file moSimpleMoveTabuList.h.
+Definition at line 86 of file mo\-Simple\-Move\-Tabu\-List.h.
-References moSimpleMoveTabuList$<$ M $>$::memory\_\-maximum\_\-size, moSimpleMoveTabuList$<$ M $>$::memory\_\-size, moSimpleMoveTabuList$<$ M $>$::removeMove(), and moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!update@{update}}
-\index{update@{update}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}
+References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::memory\_\-maximum\_\-size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::memory\_\-size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::remove\-Move(), and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}}
+\index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}
Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
+Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
-Definition at line 110 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!init@{init}}
-\index{init@{init}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}
+Definition at line 110 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}}
+\index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}
Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
+Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
-Definition at line 115 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!removeMove@{removeMove}}
-\index{removeMove@{removeMove}!moSimpleMoveTabuList@{moSimpleMoveTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::removeMove (const M \& {\em \_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_922ac2e3c45cbb94698517265be95de5}
+Definition at line 115 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!removeMove@{removeMove}}
+\index{removeMove@{removeMove}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::remove\-Move (const M \& {\em \_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_922ac2e3c45cbb94698517265be95de5}
Procedure that removes a given move from the tabu list (if it is into, else do nothing).
@@ -131,16 +133,16 @@ Procedure that removes a given move from the tabu list (if it is into, else do n
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \end{description}
+\item[{\em \_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \end{description}
\end{Desc}
-Definition at line 126 of file moSimpleMoveTabuList.h.
+Definition at line 126 of file mo\-Simple\-Move\-Tabu\-List.h.
-References moSimpleMoveTabuList$<$ M $>$::tabuList.
+References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.
-Referenced by moSimpleMoveTabuList$<$ M $>$::add().
+Referenced by mo\-Simple\-Move\-Tabu\-List$<$ M $>$::add().
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moSimpleMoveTabuList.h\end{CompactItemize}
+mo\-Simple\-Move\-Tabu\-List.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
index 06f8e8fc5..e46012fd0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 400
+%%BoundingBox: 0 0 500 200
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moSimpleSolutionTabuList< M >) cw
(moTabuList< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moSimpleSolutionTabuList< M >) 0 0 box
(moTabuList< M >) 0 1 box
- (eoBF< A1, A2, R >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
index 4706babdc..6a96c6fd9 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex
@@ -1,68 +1,70 @@
-\section{moSimpleSolutionTabuList$<$ M $>$ Class Template Reference}
+\section{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$ Class Template Reference}
\label{classmo_simple_solution_tabu_list}\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
Class describing a solution tabu list with limited length.
-{\tt \#include $<$moSimpleSolutionTabuList.h$>$}
+{\tt \#include $<$mo\-Simple\-Solution\-Tabu\-List.h$>$}
-Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_simple_solution_tabu_list}
+\includegraphics[height=2cm]{classmo_simple_solution_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9}
+typedef M::EOType \bf{EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef std::list$<$ {\bf EOT} $>$::iterator {\bf solutionIterator}\label{classmo_simple_solution_tabu_list_3438db9ed9e1a94a24c418d8cbadec54}
+typedef std::list$<$ \bf{EOT} $>$::iterator \bf{solution\-Iterator}\label{classmo_simple_solution_tabu_list_3438db9ed9e1a94a24c418d8cbadec54}
\begin{CompactList}\small\item\em Alias for an iterator of a solution list. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moSimpleSolutionTabuList} (unsigned int \_\-memory\_\-maximum\_\-size)
+\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int \_\-memory\_\-maximum\_\-size)
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-bool {\bf operator()} (const M \&\_\-move, const {\bf EOT} \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf 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} \&\_\-solution)
+bool \bf{operator()} (const M \&\_\-move, const \bf{EOT} \&\_\-solution)
+\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} \&\_\-solution)
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
-void {\bf update} ()
+void \bf{update} ()
\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item
-void {\bf init} ()
+void \bf{init} ()
\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Member Functions}
\begin{CompactItemize}
\item
-void {\bf removeSolution} (const {\bf EOT} \&\_\-solution)
+void \bf{remove\-Solution} (const \bf{EOT} \&\_\-solution)
\begin{CompactList}\small\item\em Procedure that removes a given solution from the tabu list (if it is into, else does nothing). \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int {\bf memory\_\-maximum\_\-size}\label{classmo_simple_solution_tabu_list_06631e7b9a2511e3c11540aa14b9e636}
+unsigned int \bf{memory\_\-maximum\_\-size}\label{classmo_simple_solution_tabu_list_06631e7b9a2511e3c11540aa14b9e636}
\begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item
-unsigned int {\bf memory\_\-size}\label{classmo_simple_solution_tabu_list_0d54e6b0af0e6088aafae596392c9490}
+unsigned int \bf{memory\_\-size}\label{classmo_simple_solution_tabu_list_0d54e6b0af0e6088aafae596392c9490}
\begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item
-std::list$<$ {\bf EOT} $>$ {\bf tabuList}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b}
+std::list$<$ \bf{EOT} $>$ \bf{tabu\-List}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b}
\begin{CompactList}\small\item\em The solution tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moSimpleSolutionTabuList$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}
Class describing a solution tabu list with limited length.
-Definition at line 46 of file moSimpleSolutionTabuList.h.
+
+
+Definition at line 46 of file mo\-Simple\-Solution\-Tabu\-List.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSimpleSolutionTabuList}$<$ M $>$::{\bf moSimpleSolutionTabuList} (unsigned int {\em \_\-memory\_\-maximum\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8499bf947de47519d155e9e45f815d41}
+\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
+\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int {\em \_\-memory\_\-maximum\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8499bf947de47519d155e9e45f815d41}
Constructor.
@@ -74,30 +76,30 @@ Constructor.
\end{Desc}
-Definition at line 60 of file moSimpleSolutionTabuList.h.
+Definition at line 60 of file mo\-Simple\-Solution\-Tabu\-List.h.
\subsection{Member Function Documentation}
-\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!operator()@{operator()}}
-\index{operator()@{operator()}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleSolutionTabuList}$<$ M $>$::operator() (const M \& {\em \_\-move}, const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_9052858ae3e6765cbe4c344bdae6c692}
+\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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_9052858ae3e6765cbe4c344bdae6c692}
-{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not.
+Function that indicates if, in a given state, the \_\-move is tabu or not.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-solution}]A solution. \end{description}
+\item[{\em \_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-solution}]A solution. \end{description}
\end{Desc}
\begin{Desc}
\item[Returns:]true or false. \end{Desc}
-Definition at line 69 of file moSimpleSolutionTabuList.h.
+Definition at line 69 of file mo\-Simple\-Solution\-Tabu\-List.h.
-References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}}
-\index{add@{add}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::add (const M \& {\em \_\-move}, const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_58ae13e7642c429ea51ff679a932aceb}
+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 \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_58ae13e7642c429ea51ff679a932aceb}
Procedure to add a move in the tabu list.
@@ -111,35 +113,35 @@ The two parameters have not to be modified so they are constant parameters.
\end{Desc}
-Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_55204939b6d67b6d37b4af725d70cf6d}.
+Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_55204939b6d67b6d37b4af725d70cf6d}.
-Definition at line 89 of file moSimpleSolutionTabuList.h.
+Definition at line 89 of file mo\-Simple\-Solution\-Tabu\-List.h.
-References moSimpleSolutionTabuList$<$ M $>$::memory\_\-maximum\_\-size, moSimpleSolutionTabuList$<$ M $>$::memory\_\-size, moSimpleSolutionTabuList$<$ M $>$::removeSolution(), and moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!update@{update}}
-\index{update@{update}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}
+References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::memory\_\-maximum\_\-size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::memory\_\-size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::remove\-Solution(), and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}}
+\index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}
Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
+Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}.
-Definition at line 115 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!init@{init}}
-\index{init@{init}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}
+Definition at line 115 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}}
+\index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}
Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
+Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}.
-Definition at line 120 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!removeSolution@{removeSolution}}
-\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::removeSolution (const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_e4a57001a201e1fb7446902381a7ac7d}
+Definition at line 120 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!removeSolution@{removeSolution}}
+\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::remove\-Solution (const \bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_e4a57001a201e1fb7446902381a7ac7d}
Procedure that removes a given solution from the tabu list (if it is into, else does nothing).
@@ -151,12 +153,12 @@ Procedure that removes a given solution from the tabu list (if it is into, else
\end{Desc}
-Definition at line 131 of file moSimpleSolutionTabuList.h.
+Definition at line 131 of file mo\-Simple\-Solution\-Tabu\-List.h.
-References moSimpleSolutionTabuList$<$ M $>$::tabuList.
+References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.
-Referenced by moSimpleSolutionTabuList$<$ M $>$::add().
+Referenced by mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::add().
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moSimpleSolutionTabuList.h\end{CompactItemize}
+mo\-Simple\-Solution\-Tabu\-List.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps
index 3914bf1d9..34ec5563d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 96.6184
+%%BoundingBox: 0 0 500 48.3092
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 5.175 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 10.35 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 4 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moSolContinue< EOT >) cw
-(eoUF< const EOT &, bool >) cw
-(eoFunctorBase) cw
(moFitSolContinue< EOT >) cw
(moGenSolContinue< EOT >) cw
(moNoFitImprSolContinue< EOT >) cw
@@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moSolContinue< EOT >) 1.5 1 box
- (eoUF< const EOT &, bool >) 1.5 2 box
- (eoFunctorBase) 1.5 3 box
(moFitSolContinue< EOT >) 0 0 box
(moGenSolContinue< EOT >) 1 0 box
(moNoFitImprSolContinue< EOT >) 2 0 box
@@ -201,14 +197,6 @@ boundx scalefactor div boundy scalefactor div scale
% ----- relations -----
-solid
-0 1.5 1 out
-solid
-1 1.5 2 in
-solid
-0 1.5 2 out
-solid
-1 1.5 3 in
solid
1 1.5 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex
index 04ba970c0..fc282875f 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex
@@ -1,44 +1,46 @@
-\section{moSolContinue$<$ EOT $>$ Class Template Reference}
+\section{mo\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
\label{classmo_sol_continue}\index{moSolContinue@{moSolContinue}}
Class that describes a stop criterion for a solution-based heuristic.
-{\tt \#include $<$moSolContinue.h$>$}
+{\tt \#include $<$mo\-Sol\-Continue.h$>$}
-Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=2.70531cm]{classmo_sol_continue}
+\includegraphics[height=1.35266cm]{classmo_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void {\bf init} ()=0
+virtual void \bf{init} ()=0
\begin{CompactList}\small\item\em Procedure which initialises all that the stop criterion needs. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moSolContinue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Sol\-Continue$<$ EOT $>$}
Class that describes a stop criterion for a solution-based heuristic.
-It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}).
+It allows to add an initialisation procedure to an object that is a unary function (eo\-UF).
-Definition at line 48 of file moSolContinue.h.
+
+
+Definition at line 48 of file mo\-Sol\-Continue.h.
\subsection{Member Function Documentation}
-\index{moSolContinue@{moSolContinue}!init@{init}}
-\index{init@{init}!moSolContinue@{moSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void {\bf moSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}
+\index{moSolContinue@{mo\-Sol\-Continue}!init@{init}}
+\index{init@{init}!moSolContinue@{mo\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void \bf{mo\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}
Procedure which initialises all that the stop criterion needs.
Generally, it allocates some data structures or initialises some counters.
-Implemented in {\bf moFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, {\bf moNoFitImprSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and {\bf moSteadyFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}.
+Implemented in \bf{mo\-Fit\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, \bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, \bf{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and \bf{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moSolContinue.h\end{CompactItemize}
+mo\-Sol\-Continue.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps
index 944e80b1e..ab211e5df 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 388.35
+%%BoundingBox: 0 0 500 194.175
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.2875 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 2.575 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -175,8 +175,6 @@ boxfont setfont
1 boundaspect scale
(moSteadyFitSolContinue< EOT >) cw
(moSolContinue< EOT >) cw
-(eoUF< const EOT &, bool >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale
(moSteadyFitSolContinue< EOT >) 0 0 box
(moSolContinue< EOT >) 0 1 box
- (eoUF< const EOT &, bool >) 0 2 box
- (eoFunctorBase) 0 3 box
% ----- relations -----
@@ -199,11 +195,3 @@ solid
0 0 0 out
solid
1 0 1 in
-solid
-0 0 1 out
-solid
-1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex
index a30d99821..5ab93e0b6 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex
@@ -1,67 +1,69 @@
-\section{moSteadyFitSolContinue$<$ EOT $>$ Class Template Reference}
+\section{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$ Class Template Reference}
\label{classmo_steady_fit_sol_continue}\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}}
One possible stopping criterion for a solution-based heuristic.
-{\tt \#include $<$moSteadyFitSolContinue.h$>$}
+{\tt \#include $<$mo\-Steady\-Fit\-Sol\-Continue.h$>$}
-Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_steady_fit_sol_continue}
+\includegraphics[height=2cm]{classmo_steady_fit_sol_continue}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moSteadyFitSolContinue} (unsigned int \_\-maxNumberOfIterations, unsigned int \_\-maxNumberOfIterationWithoutImprovement)
+\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int \_\-max\-Number\-Of\-Iterations, unsigned int \_\-max\-Number\-Of\-Iteration\-Without\-Improvement)
\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item
-bool {\bf operator()} (const EOT \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item
-void {\bf init} ()
+bool \bf{operator()} (const EOT \&\_\-solution)
+\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item
+void \bf{init} ()
\begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-unsigned int {\bf maxNumberOfIterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8}
+unsigned int \bf{max\-Number\-Of\-Iterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8}
\begin{CompactList}\small\item\em Maximum number of iterations before considering the fitness. \item\end{CompactList}\item
-unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40}
+unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40}
\begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item
-bool {\bf maxNumberOfIterationsReached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887}
+bool \bf{max\-Number\-Of\-Iterations\-Reached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887}
-\begin{CompactList}\small\item\em Flag that indicates that the maxNumberIteration have been reached. \item\end{CompactList}\item
-bool {\bf firstFitnessSaved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3}
+\begin{CompactList}\small\item\em Flag that indicates that the max\-Number\-Iteration have been reached. \item\end{CompactList}\item
+bool \bf{first\-Fitness\-Saved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3}
\begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item
-{\bf Fitness} {\bf fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e}
+\bf{Fitness} \bf{fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e}
\begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item
-unsigned int {\bf counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce}
+unsigned int \bf{counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce}
\begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class EOT$>$ class moSteadyFitSolContinue$<$ EOT $>$}
+\subsubsection*{template$<$class EOT$>$ class mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$}
One possible stopping criterion for a solution-based heuristic.
The stop criterion corresponds to a maximum number of iterations without improvement (after a minimum number of iterations).
-Definition at line 46 of file moSteadyFitSolContinue.h.
+
+
+Definition at line 46 of file mo\-Steady\-Fit\-Sol\-Continue.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}}
-\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moSteadyFitSolContinue}$<$ EOT $>$::{\bf moSteadyFitSolContinue} (unsigned int {\em \_\-maxNumberOfIterations}, unsigned int {\em \_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_c5e0e998b73e3a48ca3e87f4f816569b}
+\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}}
+\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int {\em \_\-max\-Number\-Of\-Iterations}, unsigned int {\em \_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_c5e0e998b73e3a48ca3e87f4f816569b}
Basic constructor.
@@ -69,19 +71,19 @@ Basic constructor.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-maxNumberOfIterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description}
+\item[{\em \_\-max\-Number\-Of\-Iterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description}
\end{Desc}
-Definition at line 58 of file moSteadyFitSolContinue.h.
+Definition at line 58 of file mo\-Steady\-Fit\-Sol\-Continue.h.
\subsection{Member Function Documentation}
-\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!operator()@{operator()}}
-\index{operator()@{operator()}!moSteadyFitSolContinue@{moSteadyFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_f7432bccb768d50a2fef248c2b174904}
+\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!operator()@{operator()}}
+\index{operator()@{operator()}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_f7432bccb768d50a2fef248c2b174904}
-{\bf Function} that activates the stopping criterion.
+Function that activates the stopping criterion.
Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations).
@@ -94,25 +96,23 @@ Indicates if the fitness has not been improved since a number of iterations (aft
\item[Returns:]true or false. \end{Desc}
-Implements {\bf eoUF$<$ const EOT \&, bool $>$}.
+Definition at line 70 of file mo\-Steady\-Fit\-Sol\-Continue.h.
-Definition at line 70 of file moSteadyFitSolContinue.h.
-
-References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, moSteadyFitSolContinue$<$ EOT $>$::fitness, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterations, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!init@{init}}
-\index{init@{init}!moSteadyFitSolContinue@{moSteadyFitSolContinue}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moSteadyFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}
+References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::fitness, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!init@{init}}
+\index{init@{init}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}
Procedure which allows to initialise the stuff needed.
It can be also used to reinitialize the counter all the needed things.
-Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
+Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}.
-Definition at line 114 of file moSteadyFitSolContinue.h.
+Definition at line 114 of file mo\-Steady\-Fit\-Sol\-Continue.h.
-References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached.
+References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moSteadyFitSolContinue.h\end{CompactItemize}
+mo\-Steady\-Fit\-Sol\-Continue.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex
index 4d16a15ef..87dc4c160 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex
@@ -1,62 +1,62 @@
-\section{moTS$<$ M $>$ Class Template Reference}
+\section{mo\-TS$<$ M $>$ Class Template Reference}
\label{classmo_t_s}\index{moTS@{moTS}}
Tabu Search (TS).
-{\tt \#include $<$moTS.h$>$}
-
-Inherits {\bf moAlgo$<$ M::EOType $>$}.
+{\tt \#include $<$mo\-TS.h$>$}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-move\_\-initializer, {\bf moNextMove}$<$ M $>$ \&\_\-next\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moTabuList}$<$ M $>$ \&\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-aspiration\_\-criterion, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
-\begin{CompactList}\small\item\em Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item
-{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-move\_\-explorer, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-continue, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-full\_\-evaluation)
+\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
+\begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item
+\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-move\_\-explorer, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation)
\begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item
-bool {\bf operator()} ({\bf EOT} \&\_\-solution)
-\begin{CompactList}\small\item\em {\bf Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize}
+bool \bf{operator()} (\bf{EOT} \&\_\-solution)
+\begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1}
+typedef M::EOType \bf{EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca}
+typedef EOT::Fitness \bf{Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-explorer}\label{classmo_t_s_9fd948a2c586f1991f5a1eee927af8a6}
+\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-explorer}\label{classmo_t_s_9fd948a2c586f1991f5a1eee927af8a6}
\begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item
-{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf continu}\label{classmo_t_s_962a37393faf5239e657388d375cd9b3}
+\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{continu}\label{classmo_t_s_962a37393faf5239e657388d375cd9b3}
\begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item
-{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-evaluation}\label{classmo_t_s_f44bb408007e2bff99f7a201842e8e48}
+eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_t_s_f44bb408007e2bff99f7a201842e8e48}
\begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moTS$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-TS$<$ M $>$}
Tabu Search (TS).
Generic algorithm that describes a tabu search.
-Definition at line 50 of file moTS.h.
+
+
+Definition at line 50 of file mo\-TS.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moTS@{moTS}!moTS@{moTS}}
-\index{moTS@{moTS}!moTS@{moTS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-move\_\-initializer}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_336408ddf8b7a29ffa8e01e9c18d8e10}
+\index{moTS@{mo\-TS}!moTS@{moTS}}
+\index{moTS@{moTS}!moTS@{mo\-TS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_336408ddf8b7a29ffa8e01e9c18d8e10}
-Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes.
+Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes.
-In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} is instanciated.
+In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} is instanciated.
\begin{Desc}
\item[Parameters:]
@@ -65,9 +65,9 @@ In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl
\end{Desc}
-Definition at line 72 of file moTS.h.\index{moTS@{moTS}!moTS@{moTS}}
-\index{moTS@{moTS}!moTS@{moTS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-continue}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_7e435fac1b8d5a410b7374d114e005e2}
+Definition at line 72 of file mo\-TS.h.\index{moTS@{mo\-TS}!moTS@{moTS}}
+\index{moTS@{moTS}!moTS@{mo\-TS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_7e435fac1b8d5a410b7374d114e005e2}
Constructor with less parameters.
@@ -77,21 +77,21 @@ The explorer is given in the parameters.
\begin{Desc}
\item[Parameters:]
\begin{description}
-\item[{\em \_\-move\_\-explorer}]The explorer (generally different that a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-full\_\-evaluation}]A full evaluation function. \end{description}
+\item[{\em \_\-move\_\-explorer}]The explorer (generally different that a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl}). \item[{\em \_\-continue}]The stopping criterion. \item[{\em \_\-full\_\-evaluation}]A full evaluation function. \end{description}
\end{Desc}
-Definition at line 89 of file moTS.h.
+Definition at line 89 of file mo\-TS.h.
\subsection{Member Function Documentation}
-\index{moTS@{moTS}!operator()@{operator()}}
-\index{operator()@{operator()}!moTS@{moTS}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moTS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_2a011779723e24a5132a37593775bf56}
+\index{moTS@{mo\-TS}!operator()@{operator()}}
+\index{operator()@{operator()}!moTS@{mo\-TS}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-TS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2a011779723e24a5132a37593775bf56}
-{\bf Function} which launchs the Tabu Search.
+Function which launchs the Tabu Search.
-Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm.
+Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm.
\begin{Desc}
\item[Parameters:]
@@ -102,12 +102,10 @@ Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref
\item[Returns:]TRUE. \end{Desc}
-Implements {\bf eoUF$<$ M::EOType \&, bool $>$}.
+Definition at line 102 of file mo\-TS.h.
-Definition at line 102 of file moTS.h.
-
-References moTS$<$ M $>$::continu, moTS$<$ M $>$::full\_\-evaluation, and moTS$<$ M $>$::move\_\-explorer.
+References mo\-TS$<$ M $>$::continu, mo\-TS$<$ M $>$::full\_\-evaluation, and mo\-TS$<$ M $>$::move\_\-explorer.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moTS.h\end{CompactItemize}
+mo\-TS.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps
index fd31fc02a..d8324527a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 327.869
+%%BoundingBox: 0 0 500 352.941
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 1.41667 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 5 def
+/rows 3 def
/cols 1 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -176,8 +176,6 @@ boxfont setfont
(moTSMoveLoopExpl< M >) cw
(moMoveLoopExpl< M >) cw
(moMoveExpl< M >) cw
-(eoBF< const M::EOType &, M::EOType &, void >) cw
-(eoFunctorBase) cw
/boxwidth boxwidth marginwidth 2 mul add def
/xspacing boxwidth distx add def
/yspacing boxheight disty add def
@@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale
(moTSMoveLoopExpl< M >) 0 0 box
(moMoveLoopExpl< M >) 0 1 box
(moMoveExpl< M >) 0 2 box
- (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box
- (eoFunctorBase) 0 4 box
% ----- relations -----
@@ -205,11 +201,3 @@ solid
0 0 1 out
solid
1 0 2 in
-solid
-0 0 2 out
-solid
-1 0 3 in
-solid
-0 0 3 out
-solid
-1 0 4 in
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
index 3b32dfa1c..b45f31c1d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex
@@ -1,68 +1,70 @@
-\section{moTSMoveLoopExpl$<$ M $>$ Class Template Reference}
+\section{mo\-TSMove\-Loop\-Expl$<$ M $>$ Class Template Reference}
\label{classmo_t_s_move_loop_expl}\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}}
Explorer for a Tabu Search algorithm.
-{\tt \#include $<$moTSMoveLoopExpl.h$>$}
+{\tt \#include $<$mo\-TSMove\-Loop\-Expl.h$>$}
-Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=5cm]{classmo_t_s_move_loop_expl}
+\includegraphics[height=3cm]{classmo_t_s_move_loop_expl}
\end{center}
\end{figure}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-move\_\-initializer, {\bf moNextMove}$<$ M $>$ \&\_\-next\_\-move\_\-generator, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-incremental\_\-evaluation, {\bf moTabuList}$<$ M $>$ \&\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-aspiration\_\-criterion)
+\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion)
\begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item
-void {\bf operator()} (const {\bf EOT} \&\_\-old\_\-solution, {\bf EOT} \&\_\-new\_\-solution)
+void \bf{operator()} (const \bf{EOT} \&\_\-old\_\-solution, \bf{EOT} \&\_\-new\_\-solution)
\begin{CompactList}\small\item\em Procedure which lauches the exploration. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527}
+typedef M::EOType \bf{EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item
-typedef M::EOType::Fitness {\bf Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018}
+typedef M::EOType::Fitness \bf{Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018}
\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize}
\subsection*{Private Attributes}
\begin{CompactItemize}
\item
-{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-initializer}\label{classmo_t_s_move_loop_expl_cd680d22382b9941d2c34133a641d443}
+\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-initializer}\label{classmo_t_s_move_loop_expl_cd680d22382b9941d2c34133a641d443}
\begin{CompactList}\small\item\em Move initialisation. \item\end{CompactList}\item
-{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move\_\-generator}\label{classmo_t_s_move_loop_expl_a2bbb593af2beefb05a307277c22b3d5}
+\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move\_\-generator}\label{classmo_t_s_move_loop_expl_a2bbb593af2beefb05a307277c22b3d5}
\begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item
-{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incremental\_\-evaluation}\label{classmo_t_s_move_loop_expl_491fa46e1cb7935cb515b27b85bf8765}
+\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incremental\_\-evaluation}\label{classmo_t_s_move_loop_expl_491fa46e1cb7935cb515b27b85bf8765}
\begin{CompactList}\small\item\em Efficient evaluation. \item\end{CompactList}\item
-{\bf moBestImprSelect}$<$ M $>$ {\bf move\_\-selection}\label{classmo_t_s_move_loop_expl_1caa6939fbe65ec4255e9e6dc3ce333b}
+\bf{mo\-Best\-Impr\-Select}$<$ M $>$ \bf{move\_\-selection}\label{classmo_t_s_move_loop_expl_1caa6939fbe65ec4255e9e6dc3ce333b}
\begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\item
-{\bf moTabuList}$<$ M $>$ \& {\bf tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790}
+\bf{mo\-Tabu\-List}$<$ M $>$ \& \bf{tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790}
\begin{CompactList}\small\item\em Tabu list. \item\end{CompactList}\item
-{\bf moAspirCrit}$<$ M $>$ \& {\bf aspiration\_\-criterion}\label{classmo_t_s_move_loop_expl_bdfc8efb22599c150b3c3d44cd416b09}
+\bf{mo\-Aspir\-Crit}$<$ M $>$ \& \bf{aspiration\_\-criterion}\label{classmo_t_s_move_loop_expl_bdfc8efb22599c150b3c3d44cd416b09}
\begin{CompactList}\small\item\em Aspiration criterion. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moTSMoveLoopExpl$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-TSMove\-Loop\-Expl$<$ M $>$}
Explorer for a Tabu Search algorithm.
-It is used by a \doxyref{moTS}{p.}{classmo_t_s}.
+It is used by a \doxyref{mo\-TS}{p.}{classmo_t_s}.
-Definition at line 53 of file moTSMoveLoopExpl.h.
+
+
+Definition at line 53 of file mo\-TSMove\-Loop\-Expl.h.
\subsection{Constructor \& Destructor Documentation}
-\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
-\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTSMoveLoopExpl}$<$ M $>$::{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-move\_\-initializer}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_be5cf0853777718c3bbcbef456b50bc7}
+\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
+\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_be5cf0853777718c3bbcbef456b50bc7}
Constructor.
@@ -74,14 +76,14 @@ Constructor.
\end{Desc}
-Definition at line 71 of file moTSMoveLoopExpl.h.
+Definition at line 71 of file mo\-TSMove\-Loop\-Expl.h.
-References moTSMoveLoopExpl$<$ M $>$::aspiration\_\-criterion, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list.
+References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspiration\_\-criterion, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list.
\subsection{Member Function Documentation}
-\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!operator()@{operator()}}
-\index{operator()@{operator()}!moTSMoveLoopExpl@{moTSMoveLoopExpl}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moTSMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-old\_\-solution}, {\bf EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_853743f2e21def3ea129556f47fafa55}
+\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}}
+\index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-old\_\-solution}, \bf{EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_853743f2e21def3ea129556f47fafa55}
Procedure which lauches the exploration.
@@ -95,12 +97,10 @@ The exploration continues while the chosen move is not in the tabu list or the a
\end{Desc}
-Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}.
+Definition at line 90 of file mo\-TSMove\-Loop\-Expl.h.
-Definition at line 90 of file moTSMoveLoopExpl.h.
-
-References moTSMoveLoopExpl$<$ M $>$::aspiration\_\-criterion, moTSMoveLoopExpl$<$ M $>$::incremental\_\-evaluation, moTSMoveLoopExpl$<$ M $>$::move\_\-initializer, moTSMoveLoopExpl$<$ M $>$::move\_\-selection, moTSMoveLoopExpl$<$ M $>$::next\_\-move\_\-generator, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list.
+References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspiration\_\-criterion, mo\-TSMove\-Loop\-Expl$<$ M $>$::incremental\_\-evaluation, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-initializer, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-selection, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move\_\-generator, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moTSMoveLoopExpl.h\end{CompactItemize}
+mo\-TSMove\-Loop\-Expl.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps
index 43c125a8a..63ca07c99 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps
@@ -5,7 +5,7 @@
%%For:
%Magnification: 1.00
%%Orientation: Portrait
-%%BoundingBox: 0 0 500 200
+%%BoundingBox: 0 0 500 100
%%Pages: 0
%%BeginSetup
%%EndSetup
@@ -19,12 +19,12 @@
/marginwidth 10 def
/distx 20 def
/disty 40 def
-/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height)
+/boundaspect 5 def % aspect ratio of the BoundingBox (width/height)
/boundx 500 def
/boundy boundx boundaspect div def
/xspacing 0 def
/yspacing 0 def
-/rows 4 def
+/rows 2 def
/cols 2 def
/scalefactor 0 def
/boxfont /Times-Roman findfont fontheight scalefont def
@@ -174,8 +174,6 @@
boxfont setfont
1 boundaspect scale
(moTabuList< M >) cw
-(eoBF< A1, A2, R >) cw
-(eoFunctorBase) cw
(moSimpleMoveTabuList< M >) cw
(moSimpleSolutionTabuList< M >) cw
/boxwidth boxwidth marginwidth 2 mul add def
@@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale
% ----- classes -----
(moTabuList< M >) 0.5 1 box
- (eoBF< A1, A2, R >) 0.5 2 box
- (eoFunctorBase) 0.5 3 box
(moSimpleMoveTabuList< M >) 0 0 box
(moSimpleSolutionTabuList< M >) 1 0 box
% ----- relations -----
-solid
-0 0.5 1 out
-solid
-1 0.5 2 in
-solid
-0 0.5 2 out
-solid
-1 0.5 3 in
solid
1 0.5 0.25 out
solid
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex
index b940647c0..74ed52d91 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex
@@ -1,46 +1,48 @@
-\section{moTabuList$<$ M $>$ Class Template Reference}
+\section{mo\-Tabu\-List$<$ M $>$ Class Template Reference}
\label{classmo_tabu_list}\index{moTabuList@{moTabuList}}
-Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses.
+Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses.
-{\tt \#include $<$moTabuList.h$>$}
+{\tt \#include $<$mo\-Tabu\-List.h$>$}
-Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H]
+Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H]
\begin{center}
\leavevmode
-\includegraphics[height=4cm]{classmo_tabu_list}
+\includegraphics[height=2cm]{classmo_tabu_list}
\end{center}
\end{figure}
\subsection*{Public Types}
\begin{CompactItemize}
\item
-typedef M::EOType {\bf EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df}
+typedef M::EOType \bf{EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df}
\begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize}
\subsection*{Public Member Functions}
\begin{CompactItemize}
\item
-virtual void {\bf add} (const M \&\_\-move, const {\bf EOT} \&\_\-solution)=0
+virtual void \bf{add} (const M \&\_\-move, const \bf{EOT} \&\_\-solution)=0
\begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item
-virtual void {\bf update} ()=0
+virtual void \bf{update} ()=0
\begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item
-virtual void {\bf init} ()=0
+virtual void \bf{init} ()=0
\begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
-\subsubsection*{template$<$class M$>$ class moTabuList$<$ M $>$}
+\subsubsection*{template$<$class M$>$ class mo\-Tabu\-List$<$ M $>$}
-Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses.
+Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses.
-It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{moTS}{p.}{classmo_t_s}.
+It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}.
-Definition at line 46 of file moTabuList.h.
+
+
+Definition at line 46 of file mo\-Tabu\-List.h.
\subsection{Member Function Documentation}
-\index{moTabuList@{moTabuList}!add@{add}}
-\index{add@{add}!moTabuList@{moTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::add (const M \& {\em \_\-move}, const {\bf EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_55204939b6d67b6d37b4af725d70cf6d}
+\index{moTabuList@{mo\-Tabu\-List}!add@{add}}
+\index{add@{add}!moTabuList@{mo\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-move}, const \bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_55204939b6d67b6d37b4af725d70cf6d}
Procedure to add a move in the tabu list.
@@ -54,26 +56,26 @@ The two parameters have not to be modified so they are constant parameters.
\end{Desc}
-Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_e6c0835fbfab2bdc63097cf2fd5328aa}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_58ae13e7642c429ea51ff679a932aceb}.\index{moTabuList@{moTabuList}!update@{update}}
-\index{update@{update}!moTabuList@{moTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}
+Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_e6c0835fbfab2bdc63097cf2fd5328aa}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_58ae13e7642c429ea51ff679a932aceb}.\index{moTabuList@{mo\-Tabu\-List}!update@{update}}
+\index{update@{update}!moTabuList@{mo\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}
Procedure that updates the tabu list content.
Generally, a counter associated to each saved move is decreased by one.
-Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{moTabuList}!init@{init}}
-\index{init@{init}!moTabuList@{moTabuList}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}
+Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{mo\-Tabu\-List}!init@{init}}
+\index{init@{init}!moTabuList@{mo\-Tabu\-List}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}
Procedure which initialises the tabu list.
Can be useful if the data structure needs to be allocated before being used.
-Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}.
+Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}.
The documentation for this class was generated from the following file:\begin{CompactItemize}
\item
-moTabuList.h\end{CompactItemize}
+mo\-Tabu\-List.h\end{CompactItemize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty b/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty
index d8898e955..59a3c18a1 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty
@@ -10,8 +10,8 @@
{\fancyplain{}{\bfseries\rightmark}}
\rhead[\fancyplain{}{\bfseries\leftmark}]
{\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by Doxygen }}
+\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Feb 29 16:29:28 2008 for Paradis\-EO-MO-Moving\-Objects by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Feb 29 16:29:28 2008 for Paradis\-EO-MO-Moving\-Objects by Doxygen }}
\cfoot{}
\newenvironment{Code}
{\footnotesize}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex
index 6f4fa3033..f45576d4f 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex
@@ -1,81 +1,57 @@
-\section{ParadisEO-MOMovingObjects Class Hierarchy}
+\section{Paradis\-EO-MO-Moving\-Objects Class Hierarchy}
This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList}
-\item eoFunctorBase{\tt [external]}\begin{CompactList}
-\item eoBF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moAspirCrit$<$ M $>$}{\pageref{classmo_aspir_crit}}{}
+\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{}
+\item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{}
\begin{CompactList}
-\item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
-\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{}
+\item \contentsline{section}{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{}
+\item \contentsline{section}{mo\-No\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{}
\end{CompactList}
-\item \contentsline{section}{moComparator$<$ EOT $>$}{\pageref{classmo_comparator}}{}
+\item \contentsline{section}{mo\-Comparator$<$ EOT $>$}{\pageref{classmo_comparator}}{}
\begin{CompactList}
-\item \contentsline{section}{moFitComparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{}
+\item \contentsline{section}{mo\-Fit\-Comparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{}
\end{CompactList}
-\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{}
-\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{}
-\item \contentsline{section}{moMoveInit$<$ M $>$}{\pageref{classmo_move_init}}{}
-\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{}
+\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{}
\begin{CompactList}
-\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{}
+\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{}
+\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{}
\end{CompactList}
-\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{}
+\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{}
+\item \contentsline{section}{mo\-ILS$<$ M $>$}{\pageref{classmo_i_l_s}}{}
+\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{}
+\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{}
+\item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{}
\begin{CompactList}
-\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{}
-\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{}
-\end{CompactList}
-\end{CompactList}
-\item eoBF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{}
+\item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{}
\begin{CompactList}
-\item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{}
+\item \contentsline{section}{mo\-HCMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{}
+\item \contentsline{section}{mo\-TSMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{}
+\end{CompactList}
+\end{CompactList}
+\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{}
+\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{}
+\item \contentsline{section}{mo\-Move\-Select$<$ M $>$}{\pageref{classmo_move_select}}{}
\begin{CompactList}
-\item \contentsline{section}{moHCMoveLoopExpl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{}
-\item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{}
+\item \contentsline{section}{mo\-Best\-Impr\-Select$<$ M $>$}{\pageref{classmo_best_impr_select}}{}
+\item \contentsline{section}{mo\-First\-Impr\-Select$<$ M $>$}{\pageref{classmo_first_impr_select}}{}
+\item \contentsline{section}{mo\-Rand\-Impr\-Select$<$ M $>$}{\pageref{classmo_rand_impr_select}}{}
\end{CompactList}
-\end{CompactList}
-\end{CompactList}
-\item eoBF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moMoveSelect$<$ M $>$}{\pageref{classmo_move_select}}{}
+\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{}
\begin{CompactList}
-\item \contentsline{section}{moBestImprSelect$<$ M $>$}{\pageref{classmo_best_impr_select}}{}
-\item \contentsline{section}{moFirstImprSelect$<$ M $>$}{\pageref{classmo_first_impr_select}}{}
-\item \contentsline{section}{moRandImprSelect$<$ M $>$}{\pageref{classmo_rand_impr_select}}{}
+\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{}
\end{CompactList}
-\end{CompactList}
-\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{}
+\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{}
+\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{}
+\item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{}
\begin{CompactList}
-\item \contentsline{section}{moFitSolContinue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{}
-\item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{}
-\item \contentsline{section}{moNoFitImprSolContinue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{}
-\item \contentsline{section}{moSteadyFitSolContinue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{}
+\item \contentsline{section}{mo\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{}
+\item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{}
+\item \contentsline{section}{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{}
+\item \contentsline{section}{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{}
\end{CompactList}
-\end{CompactList}
-\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{}
+\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{}
\begin{CompactList}
-\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{}
-\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{}
+\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{}
+\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{}
\end{CompactList}
-\end{CompactList}
-\item eoUF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList}
-\item eoMonOp$<$ EOT $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{}
-\end{CompactList}
-\end{CompactList}
-\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{}
-\end{CompactList}
-\item eoUF$<$ EOType \&, bool $>${\tt [external]}\item eoUF$<$ M \&, void $>${\tt [external]}\begin{CompactList}
-\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{}
-\end{CompactList}
-\item eoUF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList}
-\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList}
-\end{CompactList}
-\item eoOp$<$ EOType $>${\tt [external]}\begin{CompactList}
-\item eoMonOp$<$ EOT $>${\tt [external]}\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList}
-\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{}
-\item \contentsline{section}{moILS$<$ M $>$}{\pageref{classmo_i_l_s}}{}
-\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{}
-\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{}
+\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{}
\end{CompactList}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex
index d5e5ec254..369fe2d8e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex
@@ -1,5 +1,5 @@
\section{Introduction}\label{main_Introduction}
-MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par
+MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par
It contains classes for almost any kind of one solution based heuristics.\section{AUTHORS}\label{main_authors}
\begin{TabularC}{1}
\hline
@@ -7,12 +7,12 @@ Sebastien CAHON \\\hline
{\tt Jean-Charles BOISSON} \\\hline
\end{TabularC}
\section{LICENSE}\label{main_LICENSE}
-This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the CeCILL license as circulated by CEA, CNRS and INRIA at the following URL \char`\"{}http://www.cecill.info\char`\"{}.
+This software is governed by the Ce\-CILL license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the Ce\-CILL license as circulated by CEA, CNRS and INRIA at the following URL \char`\"{}http://www.cecill.info\char`\"{}.
As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability.
-In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security. The fact that you are presently reading this means that you have had knowledge of the CeCILL license and that you accept its terms.
+In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security. The fact that you are presently reading this means that you have had knowledge of the Ce\-CILL license and that you accept its terms.
-ParadisEO WebSite : {\tt http://paradiseo.gforge.inria.fr} Contact: {\tt paradiseo-help@lists.gforge.inria.fr}\section{Home Page}\label{main_Paradiseo}
+Paradis\-EO Web\-Site : \tt{http://paradiseo.gforge.inria.fr} Contact: \tt{paradiseo-help@lists.gforge.inria.fr}\section{Home Page}\label{main_Paradiseo}
{\tt http://paradiseo.gforge.inria.fr}\section{Installation}\label{main_Installation}
The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.
\ No newline at end of file
diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex
index 8032f6ef5..ae4ddebcc 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex
+++ b/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex
@@ -7,7 +7,6 @@
\usepackage{float}
\usepackage{textcomp}
\usepackage{alltt}
-\usepackage[utf8]{inputenc}
\usepackage{doxygen}
\makeindex
\setcounter{tocdepth}{1}
@@ -16,11 +15,11 @@
\begin{titlepage}
\vspace*{7cm}
\begin{center}
-{\Large ParadisEO-MOMovingObjects Reference Manual\\[1ex]\large 1.0 }\\
+{\Large Paradis\-EO-MO-Moving\-Objects Reference Manual\\[1ex]\large 1.1 }\\
\vspace*{1cm}
-{\large Generated by Doxygen 1.5.4}\\
+{\large Generated by Doxygen 1.4.7}\\
\vspace*{0.5cm}
-{\small Wed Jan 16 15:50:40 2008}\\
+{\small Fri Feb 29 16:29:28 2008}\\
\end{center}
\end{titlepage}
\clearemptydoublepage
@@ -30,11 +29,11 @@
\pagenumbering{arabic}
\chapter{Welcome to PARADISEO-Moving Objects }
\label{index}\input{main}
-\chapter{ParadisEO-MOMovingObjects Hierarchical Index}
+\chapter{Paradis\-EO-MO-Moving\-Objects Hierarchical Index}
\input{hierarchy}
-\chapter{ParadisEO-MOMovingObjects Class Index}
+\chapter{Paradis\-EO-MO-Moving\-Objects Class Index}
\input{annotated}
-\chapter{ParadisEO-MOMovingObjects Class Documentation}
+\chapter{Paradis\-EO-MO-Moving\-Objects Class Documentation}
\input{classmo_algo}
\include{classmo_aspir_crit}
\include{classmo_best_impr_select}
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3
index 66458266c..589028da2 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3
@@ -1,4 +1,4 @@
-.TH "moAlgo" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moAlgo" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moAlgo \- Description of an algorithm of the paradiseo-mo library.
.PP
\fC#include \fP
.PP
-Inherits \fBeoMonOp< EOT >\fP.
-.PP
.SH "Detailed Description"
.PP
@@ -24,4 +22,4 @@ Definition at line 46 of file moAlgo.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3
index 9e18390f2..45bda1adb 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3
@@ -1,4 +1,4 @@
-.TH "moAspirCrit" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moAspirCrit" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType::Fitness &, bool >\fP.
-.PP
Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP.
.PP
.SS "Public Member Functions"
@@ -43,4 +41,4 @@ Implemented in \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3
index 47ba4b7c7..5d21f3ebc 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3
@@ -1,4 +1,4 @@
-.TH "moBestImprSelect" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moBestImprSelect" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.ti -1c
.RI "bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)"
.br
-.RI "\fI\fBFunction\fP that indicates if the current move has not improved the fitness. \fP"
+.RI "\fIFunction that indicates if the current move has not improved the fitness. \fP"
.ti -1c
.RI "void \fBoperator()\fP (M &_move, \fBFitness\fP &_fitness)"
.br
@@ -81,7 +81,7 @@ Definition at line 58 of file moBestImprSelect.h.
References moBestImprSelect< M >::first_time.
.SS "template bool \fBmoBestImprSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP that indicates if the current move has not improved the fitness.
+Function that indicates if the current move has not improved the fitness.
.PP
If the given fitness enables an improvment, the move (\fBmoMove\fP) and the fitness linked to this move are saved.
.PP
@@ -101,10 +101,10 @@ TRUE if the move does not improve the fitness.
.PP
Implements \fBmoMoveSelect< M >\fP.
.PP
-Definition at line 76 of file moBestImprSelect.h.
+Definition at line 77 of file moBestImprSelect.h.
.PP
References moBestImprSelect< M >::best_fitness, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.
-.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline, virtual]\fP"
+.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline]\fP"
.PP
Procedure which saved the best move and fitness.
.PP
@@ -117,12 +117,10 @@ Procedure which saved the best move and fitness.
.PP
.PP
-Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
-.PP
-Definition at line 94 of file moBestImprSelect.h.
+Definition at line 95 of file moBestImprSelect.h.
.PP
References moBestImprSelect< M >::best_fitness, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3
index a5cc82367..c6bdad506 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3
@@ -1,4 +1,4 @@
-.TH "moComparator" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moComparator" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moComparator \- Template for classes which need to compare two EOT and indicate
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const EOT &, EOT &, bool >\fP.
-.PP
Inherited by \fBmoFitComparator< EOT >\fP.
.PP
.SH "Detailed Description"
@@ -26,4 +24,4 @@ Definition at line 45 of file moComparator.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
index b0e999a18..cab6ab0e7 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3
@@ -1,4 +1,4 @@
-.TH "moCoolingSchedule" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moCoolingSchedule" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moCoolingSchedule \- This class gives the description of a cooling schedule.
.PP
\fC#include \fP
.PP
-Inherits \fBeoUF< double &, bool >\fP.
-.PP
Inherited by \fBmoExponentialCoolingSchedule\fP, and \fBmoLinearCoolingSchedule\fP.
.PP
.SH "Detailed Description"
@@ -24,4 +22,4 @@ Definition at line 46 of file moCoolingSchedule.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
index 42847c550..6f6b07cf4 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3
@@ -1,4 +1,4 @@
-.TH "moExponentialCoolingSchedule" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moExponentialCoolingSchedule" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP.
.ti -1c
.RI "bool \fBoperator()\fP (double &_temperature)"
.br
-.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP"
+.RI "\fIFunction which proceeds to the cooling. \fP"
.in -1c
.SS "Private Attributes"
@@ -61,9 +61,9 @@ Simple constructor.
Definition at line 55 of file moExponentialCoolingSchedule.h.
.SH "Member Function Documentation"
.PP
-.SS "bool moExponentialCoolingSchedule::operator() (double & _temperature)\fC [inline, virtual]\fP"
+.SS "bool moExponentialCoolingSchedule::operator() (double & _temperature)\fC [inline]\fP"
.PP
-\fBFunction\fP which proceeds to the cooling.
+Function which proceeds to the cooling.
.PP
It decreases the temperature and indicates if it is greater than the threshold.
.PP
@@ -78,8 +78,6 @@ if the new temperature (current temperature * ratio) is greater than the thresho
.RE
.PP
-.PP
-Implements \fBeoUF< double &, bool >\fP.
.PP
Definition at line 65 of file moExponentialCoolingSchedule.h.
.PP
@@ -87,4 +85,4 @@ References ratio, and threshold.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
index e5990c8d0..ba199ee4e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3
@@ -1,4 +1,4 @@
-.TH "moFirstImprSelect" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moFirstImprSelect" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.ti -1c
.RI "bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)"
.br
-.RI "\fI\fBFunction\fP that indicates if the current move has not improved the fitness. \fP"
+.RI "\fIFunction that indicates if the current move has not improved the fitness. \fP"
.ti -1c
.RI "void \fBoperator()\fP (M &_move, \fBFitness\fP &_fitness)"
.br
@@ -87,7 +87,7 @@ Definition at line 60 of file moFirstImprSelect.h.
References moFirstImprSelect< M >::initial_fitness, and moFirstImprSelect< M >::valid.
.SS "template bool \fBmoFirstImprSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP that indicates if the current move has not improved the fitness.
+Function that indicates if the current move has not improved the fitness.
.PP
If the given fitness enables an improvment, the move (\fBmoMove\fP) should be applied to the current solution.
.PP
@@ -110,7 +110,7 @@ Implements \fBmoMoveSelect< M >\fP.
Definition at line 75 of file moFirstImprSelect.h.
.PP
References moFirstImprSelect< M >::best_fitness, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::initial_fitness, and moFirstImprSelect< M >::valid.
-.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline, virtual]\fP"
+.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline]\fP"
.PP
Procedure which saved the best move and fitness.
.PP
@@ -122,8 +122,6 @@ Procedure which saved the best move and fitness.
.RE
.PP
-.PP
-Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
.PP
Definition at line 96 of file moFirstImprSelect.h.
.PP
@@ -131,4 +129,4 @@ References moFirstImprSelect< M >::best_fitness, moFirstImprSelect< M >::best_mo
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3
index f94827437..a1542226d 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3
@@ -1,4 +1,4 @@
-.TH "moFitComparator" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moFitComparator" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -18,7 +18,7 @@ Inherits \fBmoComparator< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &_solution1, const EOT &_solution2)"
.br
-.RI "\fI\fBFunction\fP which makes the comparison and gives the result. \fP"
+.RI "\fIFunction which makes the comparison and gives the result. \fP"
.in -1c
.SH "Detailed Description"
.PP
@@ -33,7 +33,7 @@ Definition at line 46 of file moFitComparator.h.
.PP
.SS "template bool \fBmoFitComparator\fP< EOT >::operator() (const EOT & _solution1, const EOT & _solution2)\fC [inline]\fP"
.PP
-\fBFunction\fP which makes the comparison and gives the result.
+Function which makes the comparison and gives the result.
.PP
\fBParameters:\fP
.RS 4
@@ -53,4 +53,4 @@ Definition at line 56 of file moFitComparator.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3
index 91f0dd14e..68deb1a5e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moFitSolContinue" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moFitSolContinue" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &_solution)"
.br
-.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP"
+.RI "\fIFunction that activates the stopping criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -69,9 +69,9 @@ Basic constructor.
Definition at line 57 of file moFitSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP that activates the stopping criterion.
+Function that activates the stopping criterion.
.PP
Indicates if the fitness threshold has not yet been reached.
.PP
@@ -86,8 +86,6 @@ true or false according to the value of the fitness.
.RE
.PP
-.PP
-Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 67 of file moFitSolContinue.h.
.PP
@@ -104,4 +102,4 @@ Definition at line 81 of file moFitSolContinue.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3
index be6b06834..83a58fb4c 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moGenSolContinue" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moGenSolContinue" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &_solution)"
.br
-.RI "\fI\fBFunction\fP that activates the stop criterion. \fP"
+.RI "\fIFunction that activates the stop criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -65,9 +65,9 @@ Simple constructor.
Definition at line 54 of file moGenSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP that activates the stop criterion.
+Function that activates the stop criterion.
.PP
Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.
.PP
@@ -82,8 +82,6 @@ true or false according to the current generation number.
.RE
.PP
-.PP
-Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 66 of file moGenSolContinue.h.
.PP
@@ -102,4 +100,4 @@ References moGenSolContinue< EOT >::generationNumber.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3
index 2a180b59a..db3b80672 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3
@@ -1,4 +1,4 @@
-.TH "moHC" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moHC" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIFull constructor. \fP"
.ti -1c
-.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &_move_explorer, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &_move_explorer, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fILight constructor. \fP"
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &_solution)"
.br
-.RI "\fI\fBFunction\fP which launches the HC. \fP"
+.RI "\fIFunction which launches the HC. \fP"
.in -1c
.SS "Private Types"
@@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIComplete exploration of the neighborhood. \fP"
.ti -1c
-.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP"
+.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_evaluation\fP"
.br
.RI "\fIA full evaluation function. \fP"
.in -1c
@@ -63,7 +63,7 @@ Class which describes the algorithm for a hill climbing.
Definition at line 49 of file moHC.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Full constructor.
.PP
@@ -85,7 +85,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP.
.PP
Definition at line 69 of file moHC.h.
-.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & _move_explorer, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & _move_explorer, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Light constructor.
.PP
@@ -103,9 +103,9 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM
Definition at line 82 of file moHC.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP which launches the HC.
+Function which launches the HC.
.PP
The HC has to improve a current solution. As the \fBmoSA\fP and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.
.PP
@@ -120,8 +120,6 @@ true.
.RE
.PP
-.PP
-Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
Definition at line 94 of file moHC.h.
.PP
@@ -129,4 +127,4 @@ References moHC< M >::full_evaluation, and moHC< M >::move_explorer.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
index a93bf5338..1369547b9 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3
@@ -1,4 +1,4 @@
-.TH "moHCMoveLoopExpl" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moHCMoveLoopExpl" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -87,7 +87,7 @@ All the boxes have to be specified.
Definition at line 66 of file moHCMoveLoopExpl.h.
.SH "Member Function Documentation"
.PP
-.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\fC [inline, virtual]\fP"
+.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\fC [inline]\fP"
.PP
Procedure which launches the explorer.
.PP
@@ -101,8 +101,6 @@ The exploration starts from an old solution and provides a new solution.
.RE
.PP
-.PP
-Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
.PP
Definition at line 79 of file moHCMoveLoopExpl.h.
.PP
@@ -110,4 +108,4 @@ References moHCMoveLoopExpl< M >::incremental_evaluation, moHCMoveLoopExpl< M >:
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3
index 7d0086ebd..45b094d5a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3
@@ -1,4 +1,4 @@
-.TH "moILS" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moILS" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,25 +16,25 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > &_algorithm, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > &_algorithm, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIGeneric constructor. \fP"
.ti -1c
-.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIConstructor for using a \fBmoHC\fP for the \fBmoAlgo\fP. \fP"
.ti -1c
-.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIConstructor for using a \fBmoTS\fP for the \fBmoAlgo\fP. \fP"
.ti -1c
-.RI "\fBmoILS\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoILS\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIConstructor for using a \fBmoSA\fP for the \fBmoAlgo\fP. \fP"
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &_solution)"
.br
-.RI "\fI\fBFunction\fP which launches the ILS. \fP"
+.RI "\fIFunction which launches the ILS. \fP"
.in -1c
.SS "Private Types"
@@ -64,11 +64,11 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIThe acceptance criterion. \fP"
.ti -1c
-.RI "\fBeoMonOp\fP< \fBEOT\fP > & \fBperturbation\fP"
+.RI "eoMonOp< \fBEOT\fP > & \fBperturbation\fP"
.br
.RI "\fIThe perturbation generator. \fP"
.ti -1c
-.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP"
+.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_evaluation\fP"
.br
.RI "\fIThe full evaluation function. \fP"
.in -1c
@@ -83,7 +83,7 @@ Class which describes the algorithm for a iterated local search.
Definition at line 50 of file moILS.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > & _algorithm, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > & _algorithm, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Generic constructor.
.PP
@@ -105,7 +105,7 @@ Generic constructor using a \fBmoAlgo\fP
.PP
Definition at line 70 of file moILS.h.
-.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Constructor for using a \fBmoHC\fP for the \fBmoAlgo\fP.
.PP
@@ -131,7 +131,7 @@ Constructor for using a \fBmoHC\fP for the \fBmoAlgo\fP.
.PP
Definition at line 87 of file moILS.h.
-.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Constructor for using a \fBmoTS\fP for the \fBmoAlgo\fP.
.PP
@@ -161,7 +161,7 @@ Constructor for using a \fBmoTS\fP for the \fBmoAlgo\fP.
.PP
Definition at line 108 of file moILS.h.
-.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Constructor for using a \fBmoSA\fP for the \fBmoAlgo\fP.
.PP
@@ -191,9 +191,9 @@ Constructor for using a \fBmoSA\fP for the \fBmoAlgo\fP.
Definition at line 130 of file moILS.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoILS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoILS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP which launches the ILS.
+Function which launches the ILS.
.PP
The ILS has to improve a current solution. As the \fBmoSA\fP, the \fBmoTS\fP and the \fBmoHC\fP, it can be used for HYBRIDATION in an evolutionnary algorithm.
.PP
@@ -208,8 +208,6 @@ true.
.RE
.PP
-.PP
-Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
Definition at line 146 of file moILS.h.
.PP
@@ -217,4 +215,4 @@ References moILS< M >::acceptance_criterion, moILS< M >::algorithm, moILS< M >::
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
index a8e43fafe..5542abe64 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3
@@ -1,4 +1,4 @@
-.TH "moImprBestFitAspirCrit" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moImprBestFitAspirCrit" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -34,7 +34,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &_move, const \fBFitness\fP &_fitness)"
.br
-.RI "\fI\fBFunction\fP that indicates if the current fitness is better that the already saved fitness. \fP"
+.RI "\fIFunction that indicates if the current fitness is better that the already saved fitness. \fP"
.in -1c
.SS "Private Attributes"
@@ -61,7 +61,7 @@ Definition at line 47 of file moImprBestFitAspirCrit.h.
.PP
.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & _move, const \fBFitness\fP & _fitness)\fC [inline]\fP"
.PP
-\fBFunction\fP that indicates if the current fitness is better that the already saved fitness.
+Function that indicates if the current fitness is better that the already saved fitness.
.PP
The first time, the function only saved the current move and fitness.
.PP
@@ -79,10 +79,10 @@ true The first time and if _fitntess > best_fitness, else false.
.PP
.PP
-Definition at line 75 of file moImprBestFitAspirCrit.h.
+Definition at line 73 of file moImprBestFitAspirCrit.h.
.PP
References moImprBestFitAspirCrit< M >::best_fitness, and moImprBestFitAspirCrit< M >::first_time.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3
index fd0dafeb7..d748228dd 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3
@@ -1,4 +1,4 @@
-.TH "moItRandNextMove" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moItRandNextMove" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -63,7 +63,7 @@ Definition at line 47 of file moItRandNextMove.h.
.PP
The constructor.
.PP
-\fBParameters\fP only for initialising the attributes.
+Parameters only for initialising the attributes.
.PP
\fBParameters:\fP
.RS 4
@@ -103,4 +103,4 @@ References moItRandNextMove< M >::iteration_maximum_number, moItRandNextMove< M
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
index 08fc5f065..48142cc78 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3
@@ -1,4 +1,4 @@
-.TH "moLSCheckPoint" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moLSCheckPoint" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,17 +10,15 @@ moLSCheckPoint \- Class which allows a checkpointing system.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP.
-.PP
.SS "Public Member Functions"
.in +1c
.ti -1c
.RI "void \fBoperator()\fP (const M &_move, const typename M::EOType &_solution)"
.br
-.RI "\fI\fBFunction\fP which launches the checkpointing. \fP"
+.RI "\fIFunction which launches the checkpointing. \fP"
.ti -1c
-.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &_function)"
+.RI "void \fBadd\fP (eoBF< const M &, const typename M::EOType &, void > &_function)"
.br
.RI "\fIProcedure which add a new function to the function vector. \fP"
.in -1c
@@ -28,7 +26,7 @@ Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP.
.in +1c
.ti -1c
-.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunctions\fP"
+.RI "std::vector< eoBF< const M &, const typename M::EOType &, void > * > \fBfunctions\fP"
.br
.RI "\fIVector of functions. \fP"
.in -1c
@@ -45,7 +43,7 @@ Definition at line 46 of file moLSCheckPoint.h.
.PP
.SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & _move, const typename M::EOType & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP which launches the checkpointing.
+Function which launches the checkpointing.
.PP
Each saved function is used on the current move and the current solution.
.PP
@@ -61,7 +59,7 @@ Each saved function is used on the current move and the current solution.
Definition at line 57 of file moLSCheckPoint.h.
.PP
References moLSCheckPoint< M >::functions.
-.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & _function)\fC [inline]\fP"
+.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & _function)\fC [inline]\fP"
.PP
Procedure which add a new function to the function vector.
.PP
@@ -80,4 +78,4 @@ References moLSCheckPoint< M >::functions.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
index 92dace154..17e0d9f13 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3
@@ -1,4 +1,4 @@
-.TH "moLinearCoolingSchedule" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moLinearCoolingSchedule" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP.
.ti -1c
.RI "bool \fBoperator()\fP (double &_current_temperature)"
.br
-.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP"
+.RI "\fIFunction which proceeds to the cooling. \fP"
.in -1c
.SS "Private Attributes"
@@ -61,9 +61,9 @@ Simple constructor.
Definition at line 55 of file moLinearCoolingSchedule.h.
.SH "Member Function Documentation"
.PP
-.SS "bool moLinearCoolingSchedule::operator() (double & _current_temperature)\fC [inline, virtual]\fP"
+.SS "bool moLinearCoolingSchedule::operator() (double & _current_temperature)\fC [inline]\fP"
.PP
-\fBFunction\fP which proceeds to the cooling.
+Function which proceeds to the cooling.
.PP
It decreases the temperature and indicates if it is greater than the threshold.
.PP
@@ -78,8 +78,6 @@ true if the new temperature (current temperature - quantity) is greater than the
.RE
.PP
-.PP
-Implements \fBeoUF< double &, bool >\fP.
.PP
Definition at line 65 of file moLinearCoolingSchedule.h.
.PP
@@ -87,4 +85,4 @@ References quantity, and threshold.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3
index 762fc31b5..a582d0604 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3
@@ -1,4 +1,4 @@
-.TH "moMove" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMove" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moMove \- Definition of a move.
.PP
\fC#include \fP
.PP
-Inherits \fBeoUF< EOT &, void >\fP.
-.PP
.SS "Public Types"
.in +1c
@@ -32,4 +30,4 @@ Definition at line 49 of file moMove.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3
index 166c420dd..236f12380 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3
@@ -1,4 +1,4 @@
-.TH "moMoveExpl" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveExpl" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moMoveExpl \- Description of a move (\fBmoMove\fP) explorer.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
-.PP
Inherited by \fBmoMoveLoopExpl< M >\fP.
.PP
.SH "Detailed Description"
@@ -22,8 +20,8 @@ Description of a move (\fBmoMove\fP) explorer.
Only a description...See \fBmoMoveLoopExpl\fP.
.PP
-Definition at line 45 of file moMoveExpl.h.
+Definition at line 46 of file moMoveExpl.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
index 299f9023c..0e7861192 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3
@@ -1,4 +1,4 @@
-.TH "moMoveIncrEval" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveIncrEval" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness >\fP.
-.PP
.SH "Detailed Description"
.PP
@@ -24,4 +22,4 @@ Definition at line 49 of file moMoveIncrEval.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3
index 935771e0c..ea5522461 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3
@@ -1,4 +1,4 @@
-.TH "moMoveInit" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveInit" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moMoveInit \- Move (\fBmoMove\fP) initializer.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, void >\fP.
-.PP
.SH "Detailed Description"
.PP
@@ -24,4 +22,4 @@ Definition at line 47 of file moMoveInit.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
index 7b0cd19a9..04bf32ed8 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3
@@ -1,4 +1,4 @@
-.TH "moMoveLoopExpl" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveLoopExpl" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -26,4 +26,4 @@ Definition at line 47 of file moMoveLoopExpl.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3
index 824acc615..8acba244e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3
@@ -1,4 +1,4 @@
-.TH "moMoveSelect" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moMoveSelect" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moMoveSelect \- Class that describes a move selector (\fBmoMove\fP).
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
-.PP
Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP.
.PP
.SS "Public Types"
@@ -32,7 +30,7 @@ Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBm
.ti -1c
.RI "virtual bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)=0"
.br
-.RI "\fI\fBFunction\fP which updates the best solutions. \fP"
+.RI "\fIFunction which updates the best solutions. \fP"
.in -1c
.SH "Detailed Description"
.PP
@@ -61,7 +59,7 @@ In order to know the fitness of the solution, for which the neighborhood will be
Implemented in \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP.
.SS "template virtual bool \fBmoMoveSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [pure virtual]\fP"
.PP
-\fBFunction\fP which updates the best solutions.
+Function which updates the best solutions.
.PP
\fBParameters:\fP
.RS 4
@@ -81,4 +79,4 @@ Implemented in \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \f
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3
index 3d5236a6f..02a97e449 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3
@@ -1,4 +1,4 @@
-.TH "moNextMove" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moNextMove" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP).
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, bool >\fP.
-.PP
Inherited by \fBmoItRandNextMove< M >\fP.
.PP
.SH "Detailed Description"
@@ -26,4 +24,4 @@ Definition at line 47 of file moNextMove.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
index c6e9c0556..709480b77 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3
@@ -1,4 +1,4 @@
-.TH "moNoAspirCrit" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moNoAspirCrit" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -12,13 +12,13 @@ moNoAspirCrit \- One of the possible aspiration criterion (\fBmoAspirCrit\fP).
.PP
Inherits \fBmoAspirCrit< M >< M >\fP.
.PP
-.SS "Private Member Functions"
+.SS "Public Member Functions"
.in +1c
.ti -1c
.RI "bool \fBoperator()\fP (const M &_move, const typename M::EOType::Fitness &_fitness)"
.br
-.RI "\fI\fBFunction\fP which describes the aspiration criterion behaviour. \fP"
+.RI "\fIFunction which describes the aspiration criterion behaviour. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -35,9 +35,9 @@ The simplest : never satisfied.
Definition at line 47 of file moNoAspirCrit.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & _move, const typename M::EOType::Fitness & _fitness)\fC [inline, private]\fP"
+.SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & _move, const typename M::EOType::Fitness & _fitness)\fC [inline]\fP"
.PP
-\fBFunction\fP which describes the aspiration criterion behaviour.
+Function which describes the aspiration criterion behaviour.
.PP
Does nothing.
.PP
@@ -55,8 +55,8 @@ false.
.PP
.PP
-Definition at line 57 of file moNoAspirCrit.h.
-.SS "template void \fBmoNoAspirCrit\fP< M >::init ()\fC [inline, private, virtual]\fP"
+Definition at line 59 of file moNoAspirCrit.h.
+.SS "template void \fBmoNoAspirCrit\fP< M >::init ()\fC [inline, virtual]\fP"
.PP
Procedure which initialises all that needs a \fBmoNoAspirCrit\fP.
.PP
@@ -64,8 +64,8 @@ Nothing...
.PP
Implements \fBmoAspirCrit< M >\fP.
.PP
-Definition at line 66 of file moNoAspirCrit.h.
+Definition at line 73 of file moNoAspirCrit.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3
index 1725f3f45..3faabadef 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moNoFitImprSolContinue" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moNoFitImprSolContinue" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &_solution)"
.br
-.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP"
+.RI "\fIFunction that activates the stopping criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -81,9 +81,9 @@ Basic constructor.
Definition at line 57 of file moNoFitImprSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP that activates the stopping criterion.
+Function that activates the stopping criterion.
.PP
Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations).
.PP
@@ -98,8 +98,6 @@ true or false.
.RE
.PP
-.PP
-Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 67 of file moNoFitImprSolContinue.h.
.PP
@@ -118,4 +116,4 @@ References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< E
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3
index f330879b3..40c2e8f13 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3
@@ -1,4 +1,4 @@
-.TH "moRandImprSelect" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moRandImprSelect" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.ti -1c
.RI "bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)"
.br
-.RI "\fI\fBFunction\fP that updates the fitness and move vectors. \fP"
+.RI "\fIFunction that updates the fitness and move vectors. \fP"
.ti -1c
.RI "void \fBoperator()\fP (M &_move, \fBFitness\fP &_fitness)"
.br
@@ -51,6 +51,10 @@ Inherits \fBmoMoveSelect< M >< M >\fP.
.RI "std::vector< M > \fBbetter_moves\fP"
.br
.RI "\fICandidate move vector. \fP"
+.ti -1c
+.RI "bool \fBfirstTime\fP"
+.br
+.RI "\fIIndicate if update has been called or not. \fP"
.in -1c
.SH "Detailed Description"
.PP
@@ -80,10 +84,10 @@ Implements \fBmoMoveSelect< M >\fP.
.PP
Definition at line 63 of file moRandImprSelect.h.
.PP
-References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, and moRandImprSelect< M >::initial_fitness.
+References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, moRandImprSelect< M >::firstTime, and moRandImprSelect< M >::initial_fitness.
.SS "template bool \fBmoRandImprSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [inline, virtual]\fP"
.PP
-\fBFunction\fP that updates the fitness and move vectors.
+Function that updates the fitness and move vectors.
.PP
if a move give a better fitness than the initial fitness, it is saved and the fitness too.
.PP
@@ -103,10 +107,10 @@ true.
.PP
Implements \fBmoMoveSelect< M >\fP.
.PP
-Definition at line 79 of file moRandImprSelect.h.
+Definition at line 80 of file moRandImprSelect.h.
.PP
-References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, and moRandImprSelect< M >::initial_fitness.
-.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline, virtual]\fP"
+References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, moRandImprSelect< M >::firstTime, and moRandImprSelect< M >::initial_fitness.
+.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline]\fP"
.PP
The move selection.
.PP
@@ -121,12 +125,10 @@ One the saved move is randomly chosen.
.PP
.PP
-Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP.
+Definition at line 100 of file moRandImprSelect.h.
.PP
-Definition at line 98 of file moRandImprSelect.h.
-.PP
-References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, and eoRng::random().
+References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, and moRandImprSelect< M >::firstTime.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3
index 2998012ac..b594e62f1 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3
@@ -1,4 +1,4 @@
-.TH "moRandMove" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moRandMove" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moRandMove \- Random move generator.
.PP
\fC#include \fP
.PP
-Inherits \fBeoUF< M &, void >\fP.
-.PP
.SH "Detailed Description"
.PP
@@ -24,4 +22,4 @@ Definition at line 46 of file moRandMove.h.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3
index 25a657ab4..eb45f78ce 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3
@@ -1,4 +1,4 @@
-.TH "moSA" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSA" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fISA constructor. \fP"
.ti -1c
@@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIThe cooling schedule. \fP"
.ti -1c
-.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP"
+.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_evaluation\fP"
.br
.RI "\fIA full evaluation function. \fP"
.in -1c
@@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm.
Definition at line 53 of file moSA.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
SA constructor.
.PP
@@ -101,7 +101,7 @@ All the boxes used by a SA need to be given.
Definition at line 74 of file moSA.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP"
.PP
function that launches the SA algorithm.
.PP
@@ -118,13 +118,11 @@ TRUE.
.RE
.PP
-.PP
-Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
Definition at line 89 of file moSA.h.
.PP
-References moSA< M >::continu, moSA< M >::cooling_schedule, moSA< M >::full_evaluation, moSA< M >::incremental_evaluation, moSA< M >::initial_temperature, moSA< M >::random_move_generator, and eoRng::uniform().
+References moSA< M >::continu, moSA< M >::cooling_schedule, moSA< M >::full_evaluation, moSA< M >::incremental_evaluation, moSA< M >::initial_temperature, and moSA< M >::random_move_generator.
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
index 7774c967d..c21b5547c 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3
@@ -1,4 +1,4 @@
-.TH "moSimpleMoveTabuList" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSimpleMoveTabuList" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -34,7 +34,7 @@ Inherits \fBmoTabuList< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &_move, const \fBEOT\fP &_solution)"
.br
-.RI "\fI\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. \fP"
+.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 &_solution)"
.br
@@ -83,7 +83,7 @@ Definition at line 46 of file moSimpleMoveTabuList.h.
.PP
.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & _move, const \fBEOT\fP & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP that indicates if, in a given state, the _move is tabu or not.
+Function that indicates if, in a given state, the _move is tabu or not.
.PP
\fBParameters:\fP
.RS 4
@@ -159,4 +159,4 @@ Referenced by moSimpleMoveTabuList< M >::add().
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
index 2dabb93b2..da2d8a0e5 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3
@@ -1,4 +1,4 @@
-.TH "moSimpleSolutionTabuList" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSimpleSolutionTabuList" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -34,7 +34,7 @@ Inherits \fBmoTabuList< M >< M >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const M &_move, const \fBEOT\fP &_solution)"
.br
-.RI "\fI\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. \fP"
+.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 &_solution)"
.br
@@ -97,7 +97,7 @@ Definition at line 60 of file moSimpleSolutionTabuList.h.
.PP
.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & _move, const \fBEOT\fP & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP that indicates if, in a given state, the _move is tabu or not.
+Function that indicates if, in a given state, the _move is tabu or not.
.PP
\fBParameters:\fP
.RS 4
@@ -173,4 +173,4 @@ Referenced by moSimpleSolutionTabuList< M >::add().
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3
index c66bbf35b..bdb0543d0 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moSolContinue" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSolContinue" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moSolContinue \- Class that describes a stop criterion for a solution-based heur
.PP
\fC#include \fP
.PP
-Inherits \fBeoUF< const EOT &, bool >\fP.
-.PP
Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP.
.PP
.SS "Public Member Functions"
@@ -28,7 +26,7 @@ Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmo
.SS "template class moSolContinue< EOT >"
Class that describes a stop criterion for a solution-based heuristic.
-It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP).
+It allows to add an initialisation procedure to an object that is a unary function (eoUF).
.PP
Definition at line 48 of file moSolContinue.h.
.SH "Member Function Documentation"
@@ -43,4 +41,4 @@ Implemented in \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fB
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3
index 2dccea0a5..a39cf8b77 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3
@@ -1,4 +1,4 @@
-.TH "moSteadyFitSolContinue" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moSteadyFitSolContinue" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP.
.ti -1c
.RI "bool \fBoperator()\fP (const EOT &_solution)"
.br
-.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP"
+.RI "\fIFunction that activates the stopping criterion. \fP"
.ti -1c
.RI "void \fBinit\fP ()"
.br
@@ -91,9 +91,9 @@ Basic constructor.
Definition at line 58 of file moSteadyFitSolContinue.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP that activates the stopping criterion.
+Function that activates the stopping criterion.
.PP
Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations).
.PP
@@ -108,8 +108,6 @@ true or false.
.RE
.PP
-.PP
-Implements \fBeoUF< const EOT &, bool >\fP.
.PP
Definition at line 70 of file moSteadyFitSolContinue.h.
.PP
@@ -128,4 +126,4 @@ References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3
index 734711fd2..064987957 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3
@@ -1,4 +1,4 @@
-.TH "moTS" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moTS" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.in +1c
.ti -1c
-.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP"
.ti -1c
-.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &_move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)"
+.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &_move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, eoEvalFunc< \fBEOT\fP > &_full_evaluation)"
.br
.RI "\fIConstructor with less parameters. \fP"
.ti -1c
.RI "bool \fBoperator()\fP (\fBEOT\fP &_solution)"
.br
-.RI "\fI\fBFunction\fP which launchs the Tabu Search. \fP"
+.RI "\fIFunction which launchs the Tabu Search. \fP"
.in -1c
.SS "Private Types"
@@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP.
.br
.RI "\fIStop criterion. \fP"
.ti -1c
-.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP"
+.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_evaluation\fP"
.br
.RI "\fIFull evaluation function. \fP"
.in -1c
@@ -67,7 +67,7 @@ Generic algorithm that describes a tabu search.
Definition at line 50 of file moTS.h.
.SH "Constructor & Destructor Documentation"
.PP
-.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Constructor of a \fBmoTS\fP specifying all the boxes.
.PP
@@ -93,7 +93,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated.
.PP
Definition at line 72 of file moTS.h.
-.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & _move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
+.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & _move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP"
.PP
Constructor with less parameters.
.PP
@@ -113,9 +113,9 @@ The explorer is given in the parameters.
Definition at line 89 of file moTS.h.
.SH "Member Function Documentation"
.PP
-.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline, virtual]\fP"
+.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP"
.PP
-\fBFunction\fP which launchs the Tabu Search.
+Function which launchs the Tabu Search.
.PP
Algorithm of the tabu search. As a \fBmoSA\fP or a \fBmoHC\fP, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.
.PP
@@ -130,8 +130,6 @@ TRUE.
.RE
.PP
-.PP
-Implements \fBeoUF< M::EOType &, bool >\fP.
.PP
Definition at line 102 of file moTS.h.
.PP
@@ -139,4 +137,4 @@ References moTS< M >::continu, moTS< M >::full_evaluation, and moTS< M >::move_e
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
index 1026a5a38..567d04a4e 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3
@@ -1,4 +1,4 @@
-.TH "moTSMoveLoopExpl" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moTSMoveLoopExpl" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -99,7 +99,7 @@ Definition at line 71 of file moTSMoveLoopExpl.h.
References moTSMoveLoopExpl< M >::aspiration_criterion, and moTSMoveLoopExpl< M >::tabu_list.
.SH "Member Function Documentation"
.PP
-.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\fC [inline, virtual]\fP"
+.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\fC [inline]\fP"
.PP
Procedure which lauches the exploration.
.PP
@@ -113,8 +113,6 @@ The exploration continues while the chosen move is not in the tabu list or the a
.RE
.PP
-.PP
-Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP.
.PP
Definition at line 90 of file moTSMoveLoopExpl.h.
.PP
@@ -122,4 +120,4 @@ References moTSMoveLoopExpl< M >::aspiration_criterion, moTSMoveLoopExpl< M >::i
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3
index b3f521143..4338fb889 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3
+++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3
@@ -1,4 +1,4 @@
-.TH "moTabuList" 3 "16 Jan 2008" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*-
+.TH "moTabuList" 3 "29 Feb 2008" "Version 1.1" "ParadisEO-MO-MovingObjects" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -10,8 +10,6 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses.
.PP
\fC#include \fP
.PP
-Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP.
-.PP
Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP.
.PP
.SS "Public Types"
@@ -82,4 +80,4 @@ Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList<
.SH "Author"
.PP
-Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code.
+Generated automatically by Doxygen for ParadisEO-MO-MovingObjects from the source code.
diff --git a/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag b/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag
index 7ca1a54d1..9d818e64a 100644
--- a/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag
+++ b/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag
@@ -14,13 +14,11 @@
moAlgoclassmo_algo.htmlEOT
- eoMonOp< EOT >
moAspirCritclassmo_aspir_crit.htmlM
- eoBF
virtual voidinit
@@ -88,12 +86,10 @@
moComparatorclassmo_comparator.htmlEOT
- eoBF
moCoolingScheduleclassmo_cooling_schedule.html
- eoUF< double &, bool >
moExponentialCoolingSchedule
@@ -625,7 +621,6 @@
moLSCheckPointclassmo_l_s_check_point.htmlM
- eoBF
voidoperator()
@@ -652,7 +647,6 @@
moMoveclassmo_move.htmlEOT
- eoUF< EOT &, void >
EOTEOType
@@ -665,19 +659,16 @@
moMoveExplclassmo_move_expl.htmlM
- eoBF< const M::EOType &, M::EOType &, void >
moMoveIncrEvalclassmo_move_incr_eval.htmlM
- eoBF
moMoveInitclassmo_move_init.htmlM
- eoBF
moMoveLoopExpl
@@ -689,7 +680,6 @@
moMoveSelectclassmo_move_select.htmlM
- eoBF< M &, M::EOType::Fitness &, void >
M::EOType::FitnessFitness
@@ -716,21 +706,20 @@
moNextMoveclassmo_next_move.htmlM
- eoBF
moNoAspirCritclassmo_no_aspir_crit.htmlMmoAspirCrit
-
+ booloperator()classmo_no_aspir_crit.html289aac56f03c4651fcbcec4a91fb6fd6(const M &_move, const typename M::EOType::Fitness &_fitness)
-
+ voidinitclassmo_no_aspir_crit.html
@@ -854,12 +843,18 @@
8a2e7bd7d7a74d7f7402ef25737b09e1
+
+ bool
+ firstTime
+ classmo_rand_impr_select.html
+ 18f21c5ec337b45f634aaa094ad698ae
+
+ moRandMoveclassmo_rand_move.htmlM
- eoUF< M &, void >
moSA
@@ -1107,7 +1102,6 @@
moSolContinueclassmo_sol_continue.htmlEOT
- eoUF< const EOT &, bool >
virtual voidinit
@@ -1196,7 +1190,6 @@
moTabuListclassmo_tabu_list.htmlM
- eoBF
M::EOTypeEOT