From 4b78cb81fc69cc0714689cf036cc38f874bb7408 Mon Sep 17 00:00:00 2001 From: jboisson Date: Thu, 21 Dec 2006 10:03:26 +0000 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20la=20doc=20avec=20l?= =?UTF-8?q?es=20liens=20vers=20paradiseo-eo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@107 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/docs/Doxyfile | 2 +- trunk/paradiseo-mo/docs/html/annotated.html | 2 +- .../docs/html/class_empty_selection.html | 2 +- trunk/paradiseo-mo/docs/html/classes.html | 2 +- .../paradiseo-mo/docs/html/classmo_algo.html | 12 +- .../docs/html/classmo_aspir_crit-members.html | 6 +- .../docs/html/classmo_aspir_crit.html | 10 +- .../docs/html/classmo_aspir_crit.png | Bin 778 -> 1233 bytes .../classmo_best_impr_select-members.html | 7 +- .../docs/html/classmo_best_impr_select.html | 10 +- .../docs/html/classmo_best_impr_select.png | Bin 513 -> 1074 bytes .../docs/html/classmo_cool_sched.html | 8 +- .../docs/html/classmo_cool_sched.png | Bin 430 -> 798 bytes .../html/classmo_easy_cool_sched-members.html | 4 +- .../docs/html/classmo_easy_cool_sched.html | 10 +- .../docs/html/classmo_easy_cool_sched.png | Bin 422 -> 782 bytes .../classmo_first_impr_select-members.html | 7 +- .../docs/html/classmo_first_impr_select.html | 10 +- .../docs/html/classmo_first_impr_select.png | Bin 512 -> 1067 bytes .../classmo_gen_sol_continue-members.html | 7 +- .../docs/html/classmo_gen_sol_continue.html | 10 +- .../docs/html/classmo_gen_sol_continue.png | Bin 522 -> 900 bytes .../docs/html/classmo_h_c-members.html | 4 +- trunk/paradiseo-mo/docs/html/classmo_h_c.html | 22 ++-- trunk/paradiseo-mo/docs/html/classmo_h_c.png | Bin 454 -> 1507 bytes .../classmo_h_c_move_loop_expl-members.html | 4 +- .../docs/html/classmo_h_c_move_loop_expl.html | 12 +- .../docs/html/classmo_h_c_move_loop_expl.png | Bin 658 -> 1569 bytes ...ssmo_impr_best_fit_aspir_crit-members.html | 6 +- .../classmo_impr_best_fit_aspir_crit.html | 6 +- .../html/classmo_impr_best_fit_aspir_crit.png | Bin 548 -> 905 bytes .../classmo_it_rand_next_move-members.html | 2 +- .../docs/html/classmo_it_rand_next_move.html | 6 +- .../docs/html/classmo_it_rand_next_move.png | Bin 511 -> 847 bytes .../html/classmo_l_s_check_point-members.html | 6 +- .../docs/html/classmo_l_s_check_point.html | 16 ++- .../docs/html/classmo_move-members.html | 6 +- .../paradiseo-mo/docs/html/classmo_move.html | 10 +- .../docs/html/classmo_move_expl.html | 12 +- .../docs/html/classmo_move_expl.png | Bin 983 -> 1884 bytes .../docs/html/classmo_move_incr_eval.html | 10 +- .../docs/html/classmo_move_init.html | 10 +- .../docs/html/classmo_move_loop_expl.html | 10 +- .../docs/html/classmo_move_loop_expl.png | Bin 1024 -> 2000 bytes .../html/classmo_move_select-members.html | 6 +- .../docs/html/classmo_move_select.html | 12 +- .../docs/html/classmo_move_select.png | Bin 988 -> 1886 bytes .../docs/html/classmo_next_move.html | 8 +- .../docs/html/classmo_next_move.png | Bin 518 -> 861 bytes .../html/classmo_no_aspir_crit-members.html | 6 +- .../docs/html/classmo_no_aspir_crit.html | 6 +- .../docs/html/classmo_no_aspir_crit.png | Bin 478 -> 782 bytes .../classmo_rand_impr_select-members.html | 7 +- .../docs/html/classmo_rand_impr_select.html | 10 +- .../docs/html/classmo_rand_impr_select.png | Bin 517 -> 1076 bytes .../docs/html/classmo_rand_move.html | 10 +- .../docs/html/classmo_s_a-members.html | 4 +- trunk/paradiseo-mo/docs/html/classmo_s_a.html | 18 ++- trunk/paradiseo-mo/docs/html/classmo_s_a.png | Bin 462 -> 1521 bytes .../html/classmo_sol_continue-members.html | 6 +- .../docs/html/classmo_sol_continue.html | 10 +- .../docs/html/classmo_sol_continue.png | Bin 533 -> 913 bytes .../docs/html/classmo_t_s-members.html | 4 +- trunk/paradiseo-mo/docs/html/classmo_t_s.html | 22 ++-- trunk/paradiseo-mo/docs/html/classmo_t_s.png | Bin 457 -> 1503 bytes .../classmo_t_s_move_loop_expl-members.html | 4 +- .../docs/html/classmo_t_s_move_loop_expl.html | 12 +- .../docs/html/classmo_t_s_move_loop_expl.png | Bin 659 -> 1577 bytes .../docs/html/classmo_tabu_list-members.html | 6 +- .../docs/html/classmo_tabu_list.html | 10 +- trunk/paradiseo-mo/docs/html/files.html | 2 +- trunk/paradiseo-mo/docs/html/functions.html | 2 +- .../docs/html/functions_func.html | 2 +- .../docs/html/functions_type.html | 2 +- .../docs/html/functions_vars.html | 2 +- trunk/paradiseo-mo/docs/html/hierarchy.html | 82 +++++++++--- .../docs/html/index_8h-source.html | 2 +- trunk/paradiseo-mo/docs/html/installdox | 2 +- trunk/paradiseo-mo/docs/html/main.html | 12 +- .../paradiseo-mo/docs/html/mo_8h-source.html | 2 +- .../docs/html/mo_algo_8h-source.html | 4 +- .../docs/html/mo_aspir_crit_8h-source.html | 4 +- .../html/mo_best_impr_select_8h-source.html | 2 +- .../docs/html/mo_cool_sched_8h-source.html | 4 +- .../html/mo_easy_cool_sched_8h-source.html | 2 +- .../html/mo_first_impr_select_8h-source.html | 2 +- .../html/mo_gen_sol_continue_8h-source.html | 2 +- .../docs/html/mo_h_c_8h-source.html | 2 +- .../html/mo_h_c_move_loop_expl_8h-source.html | 2 +- ...mo_impr_best_fit_aspir_crit_8h-source.html | 2 +- .../html/mo_it_rand_next_move_8h-source.html | 2 +- .../html/mo_l_s_check_point_8h-source.html | 6 +- .../docs/html/mo_move_8h-source.html | 4 +- .../docs/html/mo_move_expl_8h-source.html | 4 +- .../html/mo_move_incr_eval_8h-source.html | 4 +- .../docs/html/mo_move_init_8h-source.html | 4 +- .../html/mo_move_loop_expl_8h-source.html | 2 +- .../docs/html/mo_move_select_8h-source.html | 4 +- .../docs/html/mo_next_move_8h-source.html | 4 +- .../docs/html/mo_no_aspir_crit_8h-source.html | 2 +- .../html/mo_rand_impr_select_8h-source.html | 2 +- .../docs/html/mo_rand_move_8h-source.html | 4 +- .../docs/html/mo_s_a_8h-source.html | 2 +- .../docs/html/mo_sol_continue_8h-source.html | 4 +- .../docs/html/mo_t_s_8h-source.html | 2 +- .../html/mo_t_s_move_loop_expl_8h-source.html | 2 +- .../docs/html/mo_tabu_list_8h-source.html | 4 +- trunk/paradiseo-mo/docs/html/search.php | 2 +- trunk/paradiseo-mo/docs/html/tree.html | 124 ++++++++++++------ .../paradiseo-mo/docs/latex/classmo_algo.tex | 6 + .../docs/latex/classmo_aspir_crit.eps | 18 ++- .../docs/latex/classmo_aspir_crit.tex | 2 +- .../docs/latex/classmo_best_impr_select.eps | 18 ++- .../docs/latex/classmo_best_impr_select.tex | 6 +- .../docs/latex/classmo_cool_sched.eps | 18 ++- .../docs/latex/classmo_cool_sched.tex | 2 +- .../docs/latex/classmo_easy_cool_sched.eps | 18 ++- .../docs/latex/classmo_easy_cool_sched.tex | 6 +- .../docs/latex/classmo_first_impr_select.eps | 18 ++- .../docs/latex/classmo_first_impr_select.tex | 6 +- .../docs/latex/classmo_gen_sol_continue.eps | 18 ++- .../docs/latex/classmo_gen_sol_continue.tex | 6 +- trunk/paradiseo-mo/docs/latex/classmo_h_c.eps | 40 ++++-- trunk/paradiseo-mo/docs/latex/classmo_h_c.tex | 16 ++- .../docs/latex/classmo_h_c_move_loop_expl.eps | 18 ++- .../docs/latex/classmo_h_c_move_loop_expl.tex | 6 +- .../classmo_impr_best_fit_aspir_crit.eps | 18 ++- .../classmo_impr_best_fit_aspir_crit.tex | 2 +- .../docs/latex/classmo_it_rand_next_move.eps | 18 ++- .../docs/latex/classmo_it_rand_next_move.tex | 2 +- .../docs/latex/classmo_l_s_check_point.tex | 12 +- .../paradiseo-mo/docs/latex/classmo_move.tex | 6 + .../docs/latex/classmo_move_expl.eps | 18 ++- .../docs/latex/classmo_move_expl.tex | 2 +- .../docs/latex/classmo_move_incr_eval.tex | 6 + .../docs/latex/classmo_move_init.tex | 6 + .../docs/latex/classmo_move_loop_expl.eps | 18 ++- .../docs/latex/classmo_move_loop_expl.tex | 2 +- .../docs/latex/classmo_move_select.eps | 18 ++- .../docs/latex/classmo_move_select.tex | 2 +- .../docs/latex/classmo_next_move.eps | 18 ++- .../docs/latex/classmo_next_move.tex | 2 +- .../docs/latex/classmo_no_aspir_crit.eps | 18 ++- .../docs/latex/classmo_no_aspir_crit.tex | 2 +- .../docs/latex/classmo_rand_impr_select.eps | 18 ++- .../docs/latex/classmo_rand_impr_select.tex | 6 +- .../docs/latex/classmo_rand_move.tex | 6 + trunk/paradiseo-mo/docs/latex/classmo_s_a.eps | 40 ++++-- trunk/paradiseo-mo/docs/latex/classmo_s_a.tex | 12 +- .../docs/latex/classmo_sol_continue.eps | 18 ++- .../docs/latex/classmo_sol_continue.tex | 4 +- trunk/paradiseo-mo/docs/latex/classmo_t_s.eps | 40 ++++-- trunk/paradiseo-mo/docs/latex/classmo_t_s.tex | 16 ++- .../docs/latex/classmo_t_s_move_loop_expl.eps | 18 ++- .../docs/latex/classmo_t_s_move_loop_expl.tex | 6 +- .../docs/latex/classmo_tabu_list.tex | 6 + trunk/paradiseo-mo/docs/latex/doxygen.sty | 4 +- trunk/paradiseo-mo/docs/latex/hierarchy.tex | 64 ++++++--- trunk/paradiseo-mo/docs/latex/main.tex | 10 +- trunk/paradiseo-mo/docs/latex/refman.tex | 2 +- .../docs/man/man3/EmptySelection.3 | 2 +- trunk/paradiseo-mo/docs/man/man3/moAlgo.3 | 4 +- .../paradiseo-mo/docs/man/man3/moAspirCrit.3 | 4 +- .../docs/man/man3/moBestImprSelect.3 | 6 +- .../paradiseo-mo/docs/man/man3/moCoolSched.3 | 4 +- .../docs/man/man3/moEasyCoolSched.3 | 6 +- .../docs/man/man3/moFirstImprSelect.3 | 6 +- .../docs/man/man3/moGenSolContinue.3 | 6 +- trunk/paradiseo-mo/docs/man/man3/moHC.3 | 16 ++- .../docs/man/man3/moHCMoveLoopExpl.3 | 6 +- .../docs/man/man3/moImprBestFitAspirCrit.3 | 2 +- .../docs/man/man3/moItRandNextMove.3 | 2 +- .../docs/man/man3/moLSCheckPoint.3 | 10 +- trunk/paradiseo-mo/docs/man/man3/moMove.3 | 4 +- trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 | 4 +- .../docs/man/man3/moMoveIncrEval.3 | 4 +- trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 | 4 +- .../docs/man/man3/moMoveLoopExpl.3 | 2 +- .../paradiseo-mo/docs/man/man3/moMoveSelect.3 | 4 +- trunk/paradiseo-mo/docs/man/man3/moNextMove.3 | 4 +- .../docs/man/man3/moNoAspirCrit.3 | 2 +- .../docs/man/man3/moRandImprSelect.3 | 6 +- trunk/paradiseo-mo/docs/man/man3/moRandMove.3 | 4 +- trunk/paradiseo-mo/docs/man/man3/moSA.3 | 12 +- .../docs/man/man3/moSolContinue.3 | 6 +- trunk/paradiseo-mo/docs/man/man3/moTS.3 | 16 ++- .../docs/man/man3/moTSMoveLoopExpl.3 | 6 +- trunk/paradiseo-mo/docs/man/man3/moTabuList.3 | 4 +- trunk/paradiseo-mo/docs/mo.doxytag | 13 ++ 189 files changed, 1111 insertions(+), 450 deletions(-) diff --git a/trunk/paradiseo-mo/docs/Doxyfile b/trunk/paradiseo-mo/docs/Doxyfile index 049bdf56a..d5074bb99 100644 --- a/trunk/paradiseo-mo/docs/Doxyfile +++ b/trunk/paradiseo-mo/docs/Doxyfile @@ -198,7 +198,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = +TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html GENERATE_TAGFILE = mo.doxytag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES diff --git a/trunk/paradiseo-mo/docs/html/annotated.html b/trunk/paradiseo-mo/docs/html/annotated.html index a49e5a194..9c09ffd2e 100644 --- a/trunk/paradiseo-mo/docs/html/annotated.html +++ b/trunk/paradiseo-mo/docs/html/annotated.html @@ -58,7 +58,7 @@ moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/class_empty_selection.html b/trunk/paradiseo-mo/docs/html/class_empty_selection.html index 279ef7926..f617dc40b 100644 --- a/trunk/paradiseo-mo/docs/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/docs/html/class_empty_selection.html @@ -45,7 +45,7 @@ This class is used as an exception that can be thrown if a solution selector has

Definition at line 21 of file moMoveSelect.h.

The documentation for this class was generated from the following file: -
Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classes.html b/trunk/paradiseo-mo/docs/html/classes.html index 85548e4e5..6465dd0d2 100644 --- a/trunk/paradiseo-mo/docs/html/classes.html +++ b/trunk/paradiseo-mo/docs/html/classes.html @@ -45,7 +45,7 @@ moMoveExpl   
  T  
moFirstImprSelect   moMoveIncrEval   moTabuList   
  G  
moMoveInit   moTS   moGenSolContinue   moMoveLoopExpl   moTSMoveLoopExpl   

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

-

Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_algo.html b/trunk/paradiseo-mo/docs/html/classmo_algo.html index ac1e65af5..1b7f21b1b 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_algo.html +++ b/trunk/paradiseo-mo/docs/html/classmo_algo.html @@ -28,11 +28,19 @@
  • Class Hierarchy
  • Class Members
    • -

    moAlgo< EOT > Class Template Reference

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

    moAlgo< EOT > Class Template Reference

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

    #include <moAlgo.h>

    +

    Inheritance diagram for moAlgo< EOT >: +

    + +eoMonOp< EOT > +eoOp< EOType > +eoUF< EOT &, bool > +eoFunctorBase +
    @@ -48,7 +56,7 @@ Description of an algorithm of the paradiseo-mo library.

    Definition at line 21 of file moAlgo.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html index 542fdccbd..ff3aeb566 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html @@ -29,8 +29,12 @@
  • Class Members

    • moAspirCrit< M > Member List

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

    + -
    functor_category()eoBF< A1, A2, R > [static]
    init()=0moAspirCrit< M > [pure virtual]

    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html index 850cba007..eede7fcd2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moAspirCrit< M > Class Template Reference

    Description of the conditions in which a tabu move could be accepted. +

    moAspirCrit< M > Class Template Reference

    Description of the conditions in which a tabu move could be accepted. More...

    #include <moAspirCrit.h> @@ -36,8 +36,10 @@

    Inheritance diagram for moAspirCrit< M >:

    -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -84,7 +86,7 @@ Implemented in moAspirCrit.h -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png index b959606a7b2df5e8ea6c548dbd4123dfa983d5f5..e6cefe1bfc95c5549aef2ed609a360dc8c7c1e9c 100644 GIT binary patch delta 1179 zcmeBTyT~~~oa+D!GXn#|?axmxPE<6mXG!;TaSW-L^LB1--W&sgwq~uT=HGbRVisgA zoyWd1=v{rwt$BtLhu=MVQ?=ppchyISXMAifF9=I{R9UTk>AlsjNVmWh@xh{uQWqNP zBuylfCp+(+V#d4Ic8mAQyVr9WZhbYF$>5u}@!0eoOz}R9x8Ao}y>(!}bkZ&3ad~I> z6Yu)R3-?}q9_}PP`IGUMA6xWud2SV|+Rk-k|88*4b{qezs~0Yp$Xl&>`Hi`9r@!~| zV7|Mv{M8p9PnmIc>W3Ex?Q+-T=6VGH|qiS zE5ToXKYz|@DJtc>`@ESWLzgkiyWyJ9f~_nNW<3%c#Js{+GF|`b?mwSd7cl;v@9^6~ ze)F;W7pENAeKWK3bB2~o#-`g5^0SXDF6fvYyULWoS261uL)Ag$N$>L5t=hC*Gd^W= zZjQ>*VdwF!mfy)TtM(SxdATTqqszZv*>!|mv>Py4Fe_7~n->~n_^3*Q|YQ4fe7ep35e(C1czx$TJz21d+99B>FTs->LalSan ztNHwQpK7--ZT-AynM178cZo;WR7<8S<^h>M6_`-Hh~`6}$G0-)zRFm`6?@WZLH*V> z%u%O*m0mc!ZJJ?XxyPxzxLVmSJ1i|do^rg+OUz)e`ZD*WdlY}}J+}5|V*8l4cP1A^ zUr76KqfnB)+`!7EY~lks#xj|oiw)Gz?hA0Yed{Tnp~mmM;+?B$do(z9P(KXS-6!z<0h zI`@Ofm#mAEOdO(x3$<3}Qq@vuiK8F$<)5|=IE&3htHb=hy>!Qcym*VftU zUjFg+mVuz>p8MuS^0QQCXEq+Ze8JnhP+9n-Y`ITP{bLvZU?0Wmdk>g1c01+Q%u3N+ zIsNcqJ-L)6JK62_ZV{e*S4_gD<=Mr<{{tq~nyIKyTe53m@6*KRiBmtj`v+fQd#z^j ze7Em5b>3$ecD`h`O44Fr(E}qc7Pl`IR#n=5k$_X}9WJL-;4Ig)aXYI?Rr+ Vx64RQ2bMt$o~~?uF6*2UngAz@IzRvb delta 720 zcmV;>0x$j135o`g7Ya}W0{{R3#+CAtks&jG0-#AmK~#90?U-$j;~)%%8?7|IF*h)C zfz__G=RsPj_dmj78xl&>7I%hxto)`bv^cLHh(oJfE-JwoIUR*kgWL^zD|dt5%6&iR z={5?0yHoYu!?X8;b~l4l4ldAX3e$0*9W5s9v;+;8DWRo9W{{e)2OkR>Cc-X@TWKPlp@p0e4yU2K=(&E@sP}`WI}h%mb5W#DK6{0FH)zMB z?%_%o=tHfv%UvhXynDE+rt?IOQ`5A2@Ji3ShwRe??aG<%i2Jl?dKvMS?N?;b8r!ev zzx%^qZ-94ybV}%J+?(JHoe}!udfgjAuTw&w^F}o2tz^(! z$)LBAL2splK&M~kaf+j$2l=w%AYX%S6$kkmbgMYX*PvU)LB0mvDh~2B=vHx%uR*tp zgM1CTRn!Fk?$;kh>`(Ikp*Z2MBKGnt43R*O@%}XEN(SBN{LokpAVBH*)b|*Fe4tkq ziQu{Gm+uybXV5qYDh#`z7e|jd0p42pPzL0T)Xo!q4qeXF7`D(zlS806CO{-lWau<= zOzX^3rg3B^Pmw4IQ-jb8J?B9(fS@wGgZ4mn2^cV86F99dwe;rYI(a!#P$&_Bo9s;} zm~%aVE_raV>o&ZDX0*)5sK_;cE#6$yRThcFT!uUVp~@jiR-te5C=I)y3#?yO8n|5U zb3j4L)lW&DL!&@z47;J{Or^nGC#wrna&)XT=2l_&0@^RoH#Lp1o=
    + - + -
    best_movemoBestImprSelect< M > [private]
    first_timemoBestImprSelect< M > [private]
    Fitness typedefmoBestImprSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline]
    operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html index 7f21039cc..5a5e8a07d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html @@ -36,7 +36,9 @@

    Inheritance diagram for moBestImprSelect< M >:

    -moMoveSelect< M > +moMoveSelect< M > +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -149,7 +151,7 @@ template<class M> - +
    ) throw (EmptySelection) [inline] throw (EmptySelection) [inline, virtual]
    @@ -170,6 +172,8 @@ Procedure which saved the best move and fitness. +

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

    Definition at line 68 of file moBestImprSelect.h.

    @@ -178,7 +182,7 @@ References moBest

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

    moCoolSched Class Reference

    This class gives the description of a cooling schedule. +

    moCoolSched Class Reference

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

    #include <moCoolSched.h> @@ -36,7 +36,9 @@

    Inheritance diagram for moCoolSched:

    -moEasyCoolSched +eoUF< double &, bool > +eoFunctorBase +moEasyCoolSched @@ -50,7 +52,7 @@ It is only a description... An object that herits from this class is needed to b

    Definition at line 22 of file moCoolSched.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_cool_sched.png b/trunk/paradiseo-mo/docs/html/classmo_cool_sched.png index f41e6114cd4110aabd9084934b81e9510edfd15a..2cd469782a21b192699c39ec05ba96c48201f5b8 100644 GIT binary patch delta 761 zcmVbthcd(^J1cK4>g}^mS1y_?`oRedYF%f3;7;u*K z8*!~K;<}A>3?OwCbA86Ojo5O0f6}r7lgk9Y%sfEVmd*Q^e5b8I9Q2uMB$ZfepC!?p zLC;xgG@9CHfY=(%Cz4@?Rk5zOx~BBjcG!Qw9v?Tw-X4#eVmFSaVTKuIm|=z)CaLR( zz59Nq{dJg(Oq0=an2o?B53#O1Y>g$qXbTI&={gn$zbOW!l`^+MZsZ#=f5^tn5sSle zhv|Gn7@$KkCij===R4eJ9yc)=gliipjP@f&z8#ohswozxGUOGQw=j*&lEp1dG}p2@ zyUa?<)S#o5?e-a@eTKf%s(t3dBJ(n3G-Ylhi6(fp7R|G%HidQtquLAK;}6}iR;=r- zuIo+s>oJ?xxS(~k3^U9yf5Qwj%&-?=&@WBH)UW-9b;d@R;&A{j6Kc+3(=dkY=uSV2 zjUzLl((-fQH;@!KqvdgG#U@}*&zGNEToBHHE03)hAHTu|ZE7e#hiL_umsmW9jR{sc zZx@qj=2%ibgK-r3edePn?=#R}aVDCVlVOHcv97nergYzr2R5&9e?jYL8D^Mah8bp< zVK2a%9#8#ie28`5XLY|9EB2sJEXf`S&4ijGEH7fLK)(^?7$biCA9gLsZj-RKKp*I% zf5|`K$2x|P?Lon~P$8^afMR<}9rLG4pZVP;IW|LFL{aY2*v8~qWVeZK6iG3+l|*nk6+G#?tLa1Jc#C2+S%T;N=I0A rZN?SsOvAq0e~q7rJ+nZgyw!aIW>^EtIf8&L00000NkvXXu0mjfj>2aQ delta 390 zcmV;10eSwO2Cf4kiBL{Q4GJ0x0000DNk~Le0001X0000`1Oos706u)236UW)e*r{E zL_t(|ob8lLa>F1DhGCO6(hWp!(9YyMS^54)h#o*8HY9cyZl=f!>6i2wENnYCZZ5c^ z<|oTZD9PY>oEDVKkPV#9p-~{Z z*+z=q#acqNzJ)tjU$N$ftj@V*e=9v;WxjI0dCq#iV0RqMd9O|O6WDkDu|vBY-qd^S zayx~+EXyhEX>*?JWG6e>$)3jkjO;qBy6UZPVQ;{X5v07*qoM6N<$f`SdS_y7O^ diff --git a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html b/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html index d7fe5355d..73f1f2881 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html @@ -30,10 +30,10 @@

    moEasyCoolSched Member List

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

    - + -
    moEasyCoolSched(double __threshold, double __ratio)moEasyCoolSched [inline]
    operator()(double &__temp)moEasyCoolSched [inline]
    operator()(double &__temp)moEasyCoolSched [inline, virtual]
    ratiomoEasyCoolSched [private]
    thresholdmoEasyCoolSched [private]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html b/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html index 3ba86c0bb..1087ad9b2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html +++ b/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html @@ -36,7 +36,9 @@

    Inheritance diagram for moEasyCoolSched:

    -moCoolSched +moCoolSched +eoUF< double &, bool > +eoFunctorBase List of all members. @@ -115,7 +117,7 @@ Definition at line double &  - +
    __temp  )  [inline] [inline, virtual]
    @@ -132,6 +134,8 @@ Decrease the temperature and indicates if it is greater than the threshold.

    Returns:
    if the new temperature (current temperature * ratio) is greater than the threshold.
    +

    +Implements eoUF< double &, bool >.

    Definition at line 44 of file moEasyCoolSched.h.

    @@ -140,7 +144,7 @@ References ratio

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.png b/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.png index b88ae27f6c25f1078f439a37fd9df3289fd46246..6717391b70fbf9ea5293e4d5d1a18bf7e6535237 100644 GIT binary patch delta 745 zcmVw)8JXf40KpG=WdE4p4Js^FAi;v=xYhISYfNHP$<4MKov7 zW0n?;rp_54_D1uCVwhn~Z0Mz~tGxAf`vUCo@21$><8f2$#?ds)FvAQp%rL{G487UA z?>+6W!z42;vgNcIfyFlDwsp5>toWcUETz+JEG54s2BeL$wm~8D%@|ZUe{;riS{^W6 zZ%7F`6ghc3&A8qXvU%LZBnj6sP|Ef*MsXZiVX7&XmNH}y%v+d7X4%9oOtdhvxjN0p z$kd>tk?qbIlyio0(wcJ?!XoQ3>uAc_MiEVjYAc#&OKS=33P!CR-{XgFST8p8QaAJ> z{P~!zYh2IA?t4#b809q%c}PGvQp-6Eb2fRqbhaY3k@qwVnF2ixW*E=1ZwD`EoL+H`Q zJh*tcTV6iZ^eBa^?qegt^_lC$Uq%+;8?@<0oPx bFLnO`0__MBpddCZ00000NkvXXu0mjfoc>xm delta 382 zcmV-^0fGLG2BrfciBL{Q4GJ0x0000DNk~Le0001X0000`1Oos706u)236UW)e*rv6 zL_t(|ob8lL62c%1hRMct!VSP1=!IPM{zs4`fM5mt7^gath2&52K^kh!b-S61-)iT< zdhf_4*LtGpNl)&Op$_N_2GCcf*sY)HdsqcYq_i}1H%qQ?HVknXROyo zvR=h%fOQz#D%KUOE?rjUT(gDlf3Q4XzTY%wxnI&9J9A!ZgZ%||&o{Pfr+)fl>~uSX zJx$Xg>|t{r>|h5w*ufsg(snbrxheQ(7KqB7;Gr;FM|5)JiLLj=M*tyWGZy$4NK3pmZT|)8Zw)z<#{DEV~w_z^^BFqNO}hIRK#jpPiU~h z0FR(zpJpu{>vfUP4Kr-fx<-+^;xT&-s-tc->koyo@emm%Qa)@jv<* ccE>mN4)|%*r%9U=EdT%j07*qoM6N<$g8a6v!2kdN diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html index b60a8ddbf..cc3ec310e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html @@ -32,13 +32,16 @@ best_fitmoFirstImprSelect< M > [private] best_movemoFirstImprSelect< M > [private] Fitness typedefmoFirstImprSelect< M > + functor_category()eoBF< M &, M::EOType::Fitness &, void > [static] init(const Fitness &__fit)moFirstImprSelect< M > [inline, virtual] init_fitmoFirstImprSelect< M > [private] - operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline] + operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline, virtual] update(const M &__move, const typename M::EOType::Fitness &__fit)moFirstImprSelect< M > [inline] moMoveSelect::update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual] validmoFirstImprSelect< M > [private] -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html index 90ee4d380..48cd9f747 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html @@ -36,7 +36,9 @@

    Inheritance diagram for moFirstImprSelect< M >:

    -moMoveSelect< M > +moMoveSelect< M > +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -180,7 +182,7 @@ template<class M> - +
    ) throw (EmptySelection) [inline] throw (EmptySelection) [inline, virtual]
    @@ -201,6 +203,8 @@ Procedure which saved the best move and fitness. +

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

    Definition at line 76 of file moFirstImprSelect.h.

    @@ -209,7 +213,7 @@ References moFir

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png index c7295b0509209bfb7410b3493cbff09ddd350dfd..a2a1234c8817927ee34de29656b933c61a3cce65 100644 GIT binary patch delta 1032 zcmZo*SERN@z`zJ(G8|xG29lD87lck!G_Gep=;`7ZQZeW4 z?7*_e3Oufl=l^uO)o5cq<7UAAUH?^iI5?RL{odTrJNu zm|u54BSV8YL&plM$w^PwGiAtnZah_cbuy#My~;iQVdXl9PCCswbB5DFJ7aD(!=&pk zjxk1TQdOMjrZE51yofza4pOY?^(Pr}ECtqnE@imrF54)k!0*`AYT{X?#_)W1HP3>d z2X{~U_*6!q`n2qUrIrC_nG(MW>rP5>wa zUd~)oSNEr&;h`r7NE#U&XKefLVE9K}ih&`4(Ico^tGU{d6rwe;`qT*HXFagJL)S2u_*<8wIL7t4^tv+B0UM3?mfvmI}|+xsO! z%KK8ZRKucw6<43QtNcBCRbWNqQ@#ctuOicxW+lxLDXM1rx(qX)xE1pr;60F|9P7T| zMaU`*FV(!K%WBvs=+_4@UXb%B?EJ3 z2i=CNajY7(=VTr749#u7FnF_s6(3NE_^4RoY|TBR_JnnVD*KXoCs$iO*xayUmh(~h zLdBDNe^~`QN+?R2XcFqRF0JwV0>#MLtmjWBYnF7r&$i8Bsd$r|YI&>v>fwv$o6;g{ zm)5N2S7!JV((thV>EZn|_E;Y%xS3}GAwHT*jFyqkmb6oU$@k6+wODQVkW*fz9Jibonb=m8?PvyaHqK+Y|5=- z*IJya7gJ1(X31fX=ARH#pgOs5xkaAh4R(cZYC9L`tbHlxVw>_cYu%T9WI6LR}FghXC~q3^MEs4n7t0>p0YC1oV(JquL^awWc#QQWj5rFjeceCPV+M zmYSD*3i~ceG6b(On0PnPX0deZf@=b@EfZ$F{#wy7UCl~bVS<%$!;e+6hShT|8W_4@|S2|DeC`o#T@P_2m)426>E(2fOoll*B5lj-9qd7Iwn zgJhtdKsEm@0_aqeKK3=+bx^Fw7F~NNm}w8y8e2CwN*3~gT}5RjRFC>SszP9ukQ9=_P75YH^5LLJh#g`iw1!RZIf2}F@%h?W< zml;K-xS0@CDf$&gfi9^Wl@RC9g6qb67LHk3hHh0usf*W1d1#vAJ(V>bv>%G zqL5IRwQ|S%TCE+_1j%X8FGm5CI~Z*XROh+s$OHd{zlnN42I>*iaWAhgRXquAnRmbl P00000NkvXXu0mjfG!WNL diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html index cbf803b07..531069d24 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html @@ -29,12 +29,15 @@
  • Class Members

    • moGenSolContinue< EOT > Member List

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

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

    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html index 56036399e..b04c8aab2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html @@ -36,7 +36,9 @@

    Inheritance diagram for moGenSolContinue< EOT >:

    -moSolContinue< EOT > +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -115,7 +117,7 @@ template<class EOT> - +
    const EOT &  __sol  )  [inline] [inline, virtual]
    @@ -132,6 +134,8 @@ Increments the counter and returns TRUE if the current number of iteration is lo
    Returns:
    TRUE or FALSE according to the current generation number.
    +

    +Implements eoUF< const EOT &, bool >.

    Definition at line 44 of file moGenSolContinue.h.

    @@ -169,7 +173,7 @@ References moGenS

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png index 84c8334c7d9fedd73d390d7786a5397e223104bc..b40e349915ec015116a4058123385084528f5689 100644 GIT binary patch delta 864 zcmV-m1E2hg1cV16iBL{Q4GJ0x0000DNk~Le000230002M1Oos70EFxQ^pPPme*+px zL_t(|ob8%jj;k;Xg~`i(j=ckC1*3a6G*8|C5^iEUe~`3gI%$PuOH9EeALd{Q<|y00 zCGoZW4J*R9ALRl-b3`SJFLL|&RI+p&`W%;Hov|up3KC(;0H!oz;_?6+G7z%}Pf2p3h~f0zxYxp8V+Z_gDSQsvY=*Qe?Y_qnV+PM_a1`jYPA zj{6gRn|>hV=`lmn53DZ%{iGjW4dWX3J=|6A`4jPdX7J~^e{R>}-frKQ;$E#EjB8xu z8rQhSHLh_bR()4r?f(no?zxmajEOgvl5C~{n=kCXKy$7TX57j3Q8(frf0W_)h|B)R zo~y}Zov}}n*>vDSLuk3hzR6q&H7Pa@9=Sya2-N^ew#|?Wpc5#x?ormat+(2WEmy$8 z&7(r*G2_m<68dt51`A^Ux2X1BBYY zSzidM&#WI_h?&9sBKNdEfB9+{_p01g@A*~VC7f$8i#Y!3j2aIGLPg>7&Fx^Jn#=xmYz`$rAz4*v3=zKW})%Ad4*RY3{ zmKUMAC)wYkkX@h$T!g&BEU2v$>hd#ce4Ok6bzH(3H?OP;u;Z3ff0-+e6)z^M^|s(K zx1dJcNUIK8r$YlCap^vnt-lfXQN4v*7n;>m(Cgdu!+m|#N0Y^8R6Vr(NZWqM{rjLF zelv_~-1l%-z2{ebmwcXU{@GgY)%wA>#x<^SjcZ)v8dn0Agx~yPRGqb9e3dRf5ho_UHZvm+;$8vdB1fe;ks0a10}^@r+LUFriO(0*UKrtl^gT2 zxgpm>n(v*aT-RjJeC*RE7h0RBw77`7V9E;f5xAZl`b44@Z5YHneeb(gcqCS6YM{RK)fw qY|{_9e@FfB`(a$;zK6T$J^vq0?UF9hobA5=00002Z{tCiBL{Q4GJ0x0000DNk~Le0001}0000`1Oos70Dq(-^N}Gle*vIL zL_t(|ob8oMZp0uAhViCr|GokA2JMBqn)@H27z1HK2DMVsDv})q955e#NeQ19Ncc#n z%ezDW0vaJ@N(ty|Nv5OF?fgb;b}yl#JmtjHQSrbZv2{t)g#%PXof9)gb50kKM~P9l zBtZtKr19zlD57HXQ|^{nU5N?heQIL|)STXqRTU8F^&e;?P54dufI;bY?OurmPX0 zT3w-l@jQ;bKRp!U%JiUa|i{DIfsuUC^yCu8fx?t zbn;XS(1PPF&H-f_?Q%L)Ie(W^Qolh~aw>gl4N)4=63jK3L-kvqPSrnK9O}^1p;!E( ZzX9jhG(SfEGCcqQ002ovPDHLkV1jQe+Fbwu diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html index 4260899d6..e8d8db046 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html @@ -35,8 +35,8 @@ moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline] moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline] move_explmoHC< M > [private] - operator()(EOT &__sol)moHC< M > [inline] -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + operator()(EOT &__sol)moHC< M > [inline, virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c.html b/trunk/paradiseo-mo/docs/html/classmo_h_c.html index d5b44cd88..fdbf49d10 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c.html @@ -36,15 +36,19 @@

    Inheritance diagram for moHC< M >:

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

    Public Member Functions

     moHC (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
     moHC (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
     Full constructor.
     moHC (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)
     moHC (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)
     Light constructor.
    bool operator() (EOT &__sol)
     Complete exploration of the neighborhood.
    -eoEvalFunc< EOT > & full_eval
    full_eval
     A full evaluation function.
    @@ -113,7 +117,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -158,7 +162,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -198,7 +202,7 @@ template<class M> EOT &  __sol  )  - [inline] + [inline, virtual] @@ -215,6 +219,8 @@ The HC has to improve a current solution. As the
    Returns:
    TRUE.
    +

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

    Definition at line 82 of file moHC.h.

    @@ -223,7 +229,7 @@ References moHC< M >::fu

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

    Inheritance diagram for moHCMoveLoopExpl< M >:

    -moMoveLoopExpl< M > -moMoveExpl< M > +moMoveLoopExpl< M > +moMoveExpl< M > +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase List of all members. @@ -162,7 +164,7 @@ template<class M> - +
    ) [inline] [inline, virtual]
    @@ -179,6 +181,8 @@ The exploration starts from an old solution and provides a new solution.

    +

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

    Definition at line 59 of file moHCMoveLoopExpl.h.

    @@ -187,7 +191,7 @@ References moHC

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

    Inheritance diagram for moImprBestFitAspirCrit< M >:

    -moAspirCrit< M > +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -125,7 +127,7 @@ References moImprBestFitAspirCrit.h -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png index cfb21ada85b68fd3d2031a0700b35520c2da5509..76e0473f0a9fceeca4263f73d5ff9205790d6b34 100644 GIT binary patch delta 848 zcmV-W1F!s~1c?Wb7Ye`x0{{R3fF3T%ks&jG10P95K~#90?V4SZn=lN=(aSztx`8=C zr@c_0a{nXL`miy<5S(47VOMGg8zcWLgmxhR@$_em{hEHyL(IYd9UKv_V;4okK65H;0soTgB|Q(2Rqoo4tDUN4g2uE-fs{GKLWERgNwcv z=SnN1x#$$#(#=e3U4|;nL*+3lZYRNiQPh(LxFBM*u=~JS{>k9TN0XL{M>$b&+~#8! ztT`r|vjrQ;6A}w+&;<-+R&Y&urE4|G|&qUnJ@dNOw99vZ& z)>>T##|+MwJF4Q)R+K{xxf5Koc0zp)eBK;gB|Q( z2Rqoo4nDMDAKusd4dUQa;N=It{Ong5j$$>|y|c-tuIA-!ZbchvN-IZT;-FZbVld7z zvYJA=N@}t=*bl}?W!Dw&xRO0rXz7qts8B?DOU+$V?TD-GT(NBUnoZB*OBTH4szp8q z%Vw@E*bS1M26snH*0p_YCc-W`w#E8#tct8WG^+}&V+LC(l)E?$ zzO!Q;>_>s0G6%l`JnZ#9?1SYUz^=Ou2Vbx%9PD5RJJ`VvcCdpF4aZoR!kD{r@QcAv zT>!-5lllSJF|0fRgLK0(wh;Eg3nqZMLhT>}*6NJZVs$Z{0rU&)}T_rVu`{00#PEdq|W;jR5Egu5d9S3uovd1Ki0Ri-uAS_^+ZVbVJ!%u~r5DhhRB7)~cAaDx`s>DzuKdldB@%#kP*O)!ejGf2-dD{59s_SAa*o a{{I0ck%QKzt>cUU00002c!g$7Ya}W0{{R3op?Bkks&jG0lG;Ktwjb2EPs}tm7#p>V{hgCxQli0PlM|aiQSkztdnpLG#foAHFdwT<*DF?0$8s;2tD)N^RUbq#A%{!hK#|xI-(IoN25`{*vN0cj z%HmV2CGuskofgl*DS!rfcnjoFeU?F9&$7$SR$Q&WrE2=8sCkCb?}HGWGbc!{vv(MP|uS=eT1zF zw#5|!7{b9?60}~g#m3>&$ubeEr~|Kqi4Cn#hN2B_RhqXOA$LrfR9Z%Hmp~x41RB9U zJsFOJYm5+(B2I9LOr*{}z-0ms@;bNyX{?xCnmL&BR47jabPb&O7#vcQ#flqKc(r00 z!DkvH@1b#YMXJTQ#*)U-74`$A#?ciey22gCu82Oipmjyt#k`N_-MnZw{a614_%YVO e&j9cB`Tqh;VLP3v0^kV%0000
    -
    num_itermoItRandNextMove< M > [private]
    operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
    rand_movemoItRandNextMove< M > [private]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html index c08c309f0..86ba124d8 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html @@ -36,7 +36,9 @@

    Inheritance diagram for moItRandNextMove< M >:

    -moNextMove< M > +moNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -167,7 +169,7 @@ References moItR

    The documentation for this class was generated from the following file:     -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png index 574beda2c5be0329aa0b7d4884736a2bf472f24c..a90754a6bfa755ce53f560818167cb485e13b994 100644 GIT binary patch delta 790 zcmV+x1L^$#1J4GK7Ye`x0{{R3;RXzgks&jG0_90WK~#90?V3@NmGG_x8zK%CF)E6s6^o5U@i80XsC zq~6!y-hba1_xApNW8BR%>o~_b&T)=&oZ~)&Tl~3r?{DL8j^kB19Q6{~O%(+9x{jS( zyzkhq%+aibweW#eZHOaTNnhZqAyIaJaRyhG{RKz3YiXbwif42TBI^us8avFIXIuv4 z*fqQcmlTY5Sx<@ybZE5bj@Nm&+rg?HnkY5(lPrDg-DT{a;0CeFnFX*Fmx7~$E4QC! zcGw!*M>V{8oF$yy`Y>*)IqpWd#S`P=Y5PlXUPpO>x0L2M$2rb%j&q#j?toi={JD7V zZ{u%|I~M$9yFuTsr4MjmaVY&BcPZ^~$iDDmTDK~22h@-tZ}|8KF4<}|;MhokL|lxi zWrB=RX?JO5KajM`(rG*2>!`59VEXvzEP^u0(M3tU+16=JJ9GgOeoAZu$ z?MOK+??cf-mx-Mglb**;Yh)#Vvj|jEO1sHy#&zvq{F6EEf50uC7#C05UxM>G$_u=u zG{-s4agKAG;~aMf9IR|{iz^4=xJ9_I#Q@Osw|YMYk@T&Vo^YEHgbge%U72SUokl9S zz-|OczaTh%eUeJ*#3;skgw4cGj&tlJWhJwk(fr;?W;t6WrKx*lHsdbdyVslJ95;zuJ2CzNi0mI@ Ux||L900000NkvXXu0mh|f@CX(XaE2J delta 451 zcmV;!0X+WC2LA()7Ya}W0{{R3{9qc$ks&jG0hLKaK~#90?UhMx!!Qg*#ZA_vZs44t zXfM=N?tg@m|67VY1#T*!X(7t6OiFy_Aj9dSr@W>2YeyNl-nfj5kCWe~&5nKR0nS=n zhQ7w_T35Inu~_!maR$ZcIQbRBzJqh$9A1IL9G5@%G#jonhE`&aqnjE`1e14g2&&+J zR=fjTq-{nVN|0gm+%r?8b;Emrt9pYAS6krDMK@(;!&(v-YONi{iQ1vF*V5T+Q*EiM z_s-6^mHfqzY~cO_uJe!aoLo-s`yJfv^M!Gj+wFyMFW%XK8@PcRxPcqEfqMpLJw=oD zOk&_V;UuY;E%a2^RbW}m(z?N=#vsXmTAV*M?<#v1R^TMU5cAo9i{s;4Tv3H8aXjf5 z+hW)QoQ7wFhUf%gDQ-#?OTzckkY)_6#1|-6{Y8 diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html index e7f98a1bd..8a9e6e12d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html @@ -31,8 +31,12 @@

    moLSCheckPoint< M > Member List

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

    + -
    add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline]
    funcmoLSCheckPoint< M > [private]
    functor_category()eoBF< A1, A2, R > [static]
    operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + eoBF::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html index df35cb8b7..944a0c06c 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html @@ -28,23 +28,29 @@
  • Class Hierarchy
  • Class Members
    • -

    moLSCheckPoint< M > Class Template Reference

    Class which allows a checkpointing system. +

    moLSCheckPoint< M > Class Template Reference

    Class which allows a checkpointing system. More...

    #include <moLSCheckPoint.h>

    +

    Inheritance diagram for moLSCheckPoint< M >: +

    + +eoBF< A1, A2, R > +eoFunctorBase + List of all members. - + @@ -114,7 +120,7 @@ template<class M> - + @@ -140,7 +146,7 @@ References moLSChe

    The documentation for this class was generated from the following file:     -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_move-members.html index d1d041503..dd75eb245 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move-members.html @@ -30,7 +30,11 @@

    moMove< EOT > Member List

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


    Public Member Functions

    void operator() (const M &__move, const typename M::EOType &__sol)
     Function which launches the checkpointing.
    void add (eoBF< const M &, const typename M::EOType &, void > &__f)
    void add (eoBF< const M &, const typename M::EOType &, void > &__f)
     Procedure which add a new function to the function vector.

    Private Attributes

    -std::vector< eoBF< const M &,
    +std::vector< eoBF< const M &,
    const typename M::EOType &,
    void > * >     		func
    void moLSCheckPoint< M >::add (eoBF< const M &, const typename M::EOType &, void > & eoBF< const M &, const typename M::EOType &, void > &  __f  )  [inline]
    -
    EOType typedefmoMove< EOT >
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + functor_category()eoUF< EOT &, void > [static] + operator()(EOT &)=0eoUF< EOT &, void > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< EOT &, void > [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move.html b/trunk/paradiseo-mo/docs/html/classmo_move.html index a77988312..1c00dd8fb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move.html @@ -28,11 +28,17 @@
  • Class Hierarchy
  • Class Members
    • -

    moMove< EOT > Class Template Reference

    Definition of a move. +

    moMove< EOT > Class Template Reference

    Definition of a move. More...

    #include <moMove.h>

    +

    Inheritance diagram for moMove< EOT >: +

    + +eoUF< EOT &, void > +eoFunctorBase + List of all members. @@ -53,7 +59,7 @@ A move transforms a solution to another close solution. It describes how a solut

    Definition at line 23 of file moMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html index 636b62740..e10130540 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moMoveExpl< M > Class Template Reference

    Description of a move (moMove) explorer. +

    moMoveExpl< M > Class Template Reference

    Description of a move (moMove) explorer. More...

    #include <moMoveExpl.h> @@ -36,9 +36,11 @@

    Inheritance diagram for moMoveExpl< M >:

    -moMoveLoopExpl< M > -moHCMoveLoopExpl< M > -moTSMoveLoopExpl< M > +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase +moMoveLoopExpl< M > +moHCMoveLoopExpl< M > +moTSMoveLoopExpl< M >

    Public Types

    @@ -55,7 +57,7 @@ Only a description...See moMove

    Definition at line 21 of file moMoveExpl.h.

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

    moMoveIncrEval< M > Class Template Reference

    (generally) Efficient evaluation function based a move and a solution. +

    moMoveIncrEval< M > Class Template Reference

    (generally) Efficient evaluation function based a move and a solution. More...

    #include <moMoveIncrEval.h>

    +

    Inheritance diagram for moMoveIncrEval< M >: +

    + +eoBF< A1, A2, R > +eoFunctorBase +
    @@ -48,7 +54,7 @@ From a move and a solution, it computes a new fitness that could be associated t

    Definition at line 24 of file moMoveIncrEval.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_init.html b/trunk/paradiseo-mo/docs/html/classmo_move_init.html index 40997a658..4622d5514 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_init.html @@ -28,11 +28,17 @@
  • Class Hierarchy
  • Class Members
    • -

    moMoveInit< M > Class Template Reference

    Move (moMove) initializer. +

    moMoveInit< M > Class Template Reference

    Move (moMove) initializer. More...

    #include <moMoveInit.h>

    +

    Inheritance diagram for moMoveInit< M >: +

    + +eoBF< A1, A2, R > +eoFunctorBase +
    @@ -48,7 +54,7 @@ Class which allows to initiase a move. Only a description... An object that heri

    Definition at line 22 of file moMoveInit.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html index 56e86e13f..d1b77b7d1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html @@ -36,9 +36,11 @@

    Inheritance diagram for moMoveLoopExpl< M >:

    -moMoveExpl< M > -moHCMoveLoopExpl< M > -moTSMoveLoopExpl< M > +moMoveExpl< M > +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase +moHCMoveLoopExpl< M > +moTSMoveLoopExpl< M > @@ -55,7 +57,7 @@ Only a description... moHCM

    Definition at line 21 of file moMoveLoopExpl.h.

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

    moMoveSelect< M > Member List

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

    + + -
    Fitness typedefmoMoveSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
    operator()(M &, M::EOType::Fitness &)=0eoBF< M &, M::EOType::Fitness &, void > [pure virtual]
    update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select.html b/trunk/paradiseo-mo/docs/html/classmo_move_select.html index ee2bde27f..be68b498f 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_select.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moMoveSelect< M > Class Template Reference

    Class that describes a move selector (moMove). +

    moMoveSelect< M > Class Template Reference

    Class that describes a move selector (moMove). More...

    #include <moMoveSelect.h> @@ -36,9 +36,11 @@

    Inheritance diagram for moMoveSelect< M >:

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

    moNextMove< M > Class Template Reference

    Class which allows to generate a new move (moMove). +

    moNextMove< M > Class Template Reference

    Class which allows to generate a new move (moMove). More...

    #include <moNextMove.h> @@ -36,7 +36,9 @@

    Inheritance diagram for moNextMove< M >:

    -moItRandNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase +moItRandNextMove< M >
    @@ -53,7 +55,7 @@ Useful for the explorer (for moTS or <

    Definition at line 22 of file moNextMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.png b/trunk/paradiseo-mo/docs/html/classmo_next_move.png index ee1f90bbc464ccc6979fc685054b6842e06e6e3f..6bc1397f22d7ee6a2de7f793dd13a2b197dc9f39 100644 GIT binary patch delta 804 zcmV+<1Ka$D1l>mf_Y3)w#rp@1kn< zI0dNh8eW6T3dTCsMoAI1$8$K41w`NBB)vi&7EpGSFtHcKf?F5kJKhF-x5(drf<`vLT0@$vTVxftEC1q;%yIt%Zt{h3tlayi!sk(5 z;7z4D&T)=&oZ}qlxI5s+o~QjDee8DcXN=z!hmw(E>)R9e*sM!2I#$}@>=S!R{xGTGjlZ0~{MwaKh_wi92RmNxqPLs`)aJmvKPxcf{K59#=UPCt+=I zWC}F66YC6)jHEOuUSFh%J+gAh_)b>mbiU(|mB>m&^}OTAQnX4)F`39J?%=$8y*SQs igSh7xpB!Bn{{ka08Cr@DUqlN40000J28INX7Ya}W0{{R3{9qc$ks&jG0h~!hK~#90?UhSz#2^fYVKZy&8^8%h zt<>{$mHQu|`2RyfUL)GFNGnW~#E$*N4`$+|rvw*VM;W-@xZoCZ@cHBq9_Q8zoYc4g zeUCe}?r_0!vCU&CXFH+J=p=#2+Ll!)&p*TjW=CtT)wN`ReUy9;G(4wC0_+N(WKcWE2>bl zRfK`&W=me+)FLf4WEYW^;-pmZDDu5Dq!~jiu>}Wr#-Mj=ROB`42@XjW9C-&^LSa=D z-VpheZkDr%O6j-8rR*ba;Vd|gb&Io9WP`iNuEJT8QCW?$Xy7of(mSkU?=Z48GFeV^ z-glU+O{0y`)Zi7r4HfdBvi07*qoM6N<$g25}@ AWB>pF diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html index 7fe21bb2e..d37520070 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html @@ -29,9 +29,13 @@
  • Class Members

    • moNoAspirCrit< M > Member List

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

    + -
    functor_category()eoBF< A1, A2, R > [static]
    init()moNoAspirCrit< M > [inline, private, virtual]
    operator()(const M &__move, const typename M::EOType::Fitness &__sol)moNoAspirCrit< M > [inline, private]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html index 8989a3684..06c3e1ba4 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html @@ -36,7 +36,9 @@

    Inheritance diagram for moNoAspirCrit< M >:

    -moAspirCrit< M > +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -131,7 +133,7 @@ Definition at line 4

    The documentation for this class was generated from the following file:     -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png index f8412d8ed8acf7254dedb1e46f342db73d89bb3f..ce623c0e31ee2f3b098693c633cba85684bc3020 100644 GIT binary patch delta 724 zcmV;_0xSLA1C9oe7Ye`x0{{R3(TW|aks&jG0;EYqK~#90?U`MY+b{^nt(QIvZh%kF zX)m--x&IL=KuDi7k&W@s2x&9wv@0kav*;K=Lq{5-`^xdG`~4 zLJDeg=m|Ot&W5^5A9C2w2~s2ME4r)$a%PWbWqe!}bZ@$G~stc4St-~=Z)!3konHy=r0`9qDa#Jx&K7A5)0iAthg z0ueQ0MAc#m8wjFbW`w;V>?edGsf+-BIteVX`h08&Fe5;gg0N2sRLfN!V+4RUhfJ56 zVslrQkHuLIdp8Tn$<`USI@7#e4zoJEBXo7JwE$?uXd$2x^5yAjo?5F<$KN0>5W1Vj z-$5StpY>l8TyK66!S$vSoZti}IKc^xx!!y*p?rOpFZBc}^04|&dTJWe2UuHw(+F6^ z&5=O-819}iA;lr<8B$yt2;LJAY6lOw`NnNI)mGZ+RPjZcB;iPCdw^KFgi4S)z}^rl zVkAfh5Jv)7Sk`=o7zmU_-YN$ptaG4z2)U1`lE2m=Q&)9R{ZDl*bU#S**TVY#=*ga( zx5p>;Xu@T4f)QMAei6a-rW2fh-~=Z)!3mAQO^aK+nWGaXgdl(FuCDY3Q4VAEg#{tz zE1?ExP-wX+Y=fQ<7$1Pgz@rdSTm(K>Tp9wb2@#kPg%Ir(QdoKmQ3+9I0h*yuL#%`? zDj|>grLK@`A#m6lf+7xtpakBlA&vydm5ecz`Ai8RFUu+iBg}H(sb@kzse`VC60{DP zdaMJl#kMu0t%dFfKCrd0yvF@-v`gFd@q|m}1S8!3wEqLil(yv&hfJgZ0000RqlU;G5&-!1SJw0H4B_7Q0l%q1~vT-#&`Nz#$pOxA;*OEMp>u1uJMJy?+Mwz z5Q2yq3Eb&7QjIs*D9P!lW(_O7HQdKaL7@IYmRGO8eXNaek8G63}jq+*~77#B#I+yG5L zeG0M)RRyd

    moRandImprSelect< M > Member List

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

    + - + -
    Fitness typedefmoRandImprSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
    init_fitmoRandImprSelect< M > [private]
    operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline]
    operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline, virtual]
    update(const M &__move, const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
    vect_better_fitmoRandImprSelect< M > [private]
    vect_better_movesmoRandImprSelect< M > [private]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html index 4d98bce56..619dd7c26 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html @@ -36,7 +36,9 @@

    Inheritance diagram for moRandImprSelect< M >:

    -moMoveSelect< M > +moMoveSelect< M > +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -184,7 +186,7 @@ template<class M> - +
    ) throw (EmptySelection) [inline] throw (EmptySelection) [inline, virtual]
    @@ -206,6 +208,8 @@ One the saved move is randomly chosen.

    +

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

    Definition at line 77 of file moRandImprSelect.h.

    @@ -214,7 +218,7 @@ References moRand

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

    moRandMove< M > Class Template Reference

    Random move generator. +

    moRandMove< M > Class Template Reference

    Random move generator. More...

    #include <moRandMove.h>

    +

    Inheritance diagram for moRandMove< M >: +

    + +eoUF< M &, void > +eoFunctorBase +
    @@ -48,7 +54,7 @@ Only a description... An object that herits from this class needs to be designed

    Definition at line 21 of file moRandMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html index 6a3fcbfb2..4148227ec 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html @@ -38,8 +38,8 @@ init_tempmoSA< M > [private] moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolSched &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline] move_randmoSA< M > [private] - operator()(EOT &__sol)moSA< M > [inline] -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + operator()(EOT &__sol)moSA< M > [inline, virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.html b/trunk/paradiseo-mo/docs/html/classmo_s_a.html index b91e80d9e..6669b12ea 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a.html @@ -36,12 +36,16 @@

    Inheritance diagram for moSA< M >:

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

    Public Member Functions

     moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolSched &__cool_sched, eoEvalFunc< EOT > &__full_eval)
     moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolSched &__cool_sched, eoEvalFunc< EOT > &__full_eval)
     SA constructor.
    bool operator() (EOT &__sol)
     The cooling schedule.
    -eoEvalFunc< EOT > & full_eval
    full_eval
     A full evaluation function.
    @@ -132,7 +136,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -176,7 +180,7 @@ template<class M> EOT &  __sol  )  - [inline] + [inline, virtual] @@ -193,6 +197,8 @@ As a moTS or a
    Returns:
    TRUE.
    +

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

    Definition at line 82 of file moSA.h.

    @@ -201,7 +207,7 @@ References moSA< M >::co

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.png b/trunk/paradiseo-mo/docs/html/classmo_s_a.png index 59c20157af06fab2bc77bf29f8e564f00a1a2deb..e14866c803c7c4f0523a036fb3d13d1120177e24 100644 GIT binary patch literal 1521 zcmcIkeKgYx7@m9$jf+UiF41*Ek!#G)XYjG;_iU81`rVaazN7^i3lU0N3Nk*RCK zRn2^*D589fX~~pk*=P=C?8ff8=bn4cJ?Gv(?>X=DywCgm_nh~ z*SX1P5J-`LbUz$;v3!vn+RV1vp4*=^=NKt;{j3Bm=6-p$RXV&*(u*uA^KMRC)re80 zzxXk`YIx}e{hgIa8A%;}#8L8a$-z={B%A>A+6#?_mg8=i(j;OjqGKM+d@y%$h`M%N z-<7e?o6(DPz;#{bL>uA=ZO!{|kdyfi>fA(waD=(wSLOiE!N9e0qKU?;jkeXMmhgS8JSj_Jv)=*1P7tP3d+>bdsE}{`Gt;Gwpz)sItuirq10siMlYMl@s2W~qx&Yan9k>Zz^^<=cJJ>*mW0R@I{_3{HDl@dR7cv54q z=^YIjW>~MF)tB85S)}Gogoe49 zEsWs}{6aX5kDx^o{J?rE^uz6CTLfJ1#U>ErDE{W=((5&%wXmR9IgG($gI_;w?fX>Y z+&Qs|KE@(Vz#bQ4BhhY&kAd|p@%(&CHzG`NCx5S%8H}B^HF7Sr{AR~*A`gn9m)iAR zd&b*yb<xD~A?s$-5E)mF$Ev1|ZNDb&;k-`=(G z#-=EkY`sm(-z&|>6*E1?C2J8ie)7vWtzc4x3N|_0Qxa}ANopUm9PSH}lxPz3v8Mcm zmgW0{NMl1y{PGvMvKanx>{Ktk%D&!f zerLLw>n6MGx9DTV%H*=F8)SWc zKB=6;U`M>z=`NA|XAsf@3(f-}iBL{Q4GJ0x0000DNk~Le0001u0000`1Oos70M^j!XOST@e*t7k zL_t(|obA68xr&37^Il*A??$A z`4Me8T@Hq0)kwb{0OZG0I5}~MDu=tEGk9uDw03wn@wDp?Kbfz<%=}hN&4h(6|e7GSgPv;E> zAVlO)vmboqSh;O&R{2Vo!$WyI7^|JzjsqKRKne)sos%PY7ailGBSYjrrjeW`bnHk@ z;Ph!+c-|f8$dNi*>1sa7>CGoQS|1JWs}HZ2?4Ri5&|CYbr%mU-I)mOjKT0+On3w54 QUjP6A07*qoM6N<$g4-v)+W-In diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html index 190c93951..2379c2ec2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html @@ -29,8 +29,12 @@
  • Class Members

    • moSolContinue< EOT > Member List

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

    + -
    functor_category()eoUF< const EOT &, bool > [static]
    init()=0moSolContinue< EOT > [pure virtual]

    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html index b6eee03ed..cf2ffaf7e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moSolContinue< EOT > Class Template Reference

    Class that describes a stop criterion for a solution-based heuristic. +

    moSolContinue< EOT > Class Template Reference

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

    #include <moSolContinue.h> @@ -36,7 +36,9 @@

    Inheritance diagram for moSolContinue< EOT >:

    -moGenSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase +moGenSolContinue< EOT > List of all members. @@ -51,7 +53,7 @@ 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 (eoUF). +It allows to add an initialisation procedure to an object that is a unary function (eoUF).

    @@ -83,7 +85,7 @@ Implemented in moSolContinue.h -

    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png index ff1f2edde45f1ab6750d0ab5e313aa1b9e214aa9..345d1b66d6bf7bd456e48737ef14bf095b031c61 100644 GIT binary patch delta 877 zcmV-z1Csoe1d#_JiBL{Q4GJ0x0000DNk~Le000230002M1Oos70EFxQ^pPPme*-5; zL_t(|ob8)kZsR}*fITn!Y`6h)g4Omykt*f>N7w=8-(x3kI*BYn)z)E{&jh17#jt!$ zk-y77KSPZBQ7!;fuPAHrMQ*#FvX-`{&v7aE8N5QFAQ7?#kkyFH6$7z3#bsF7ow!J< z;WL5wt1oHK^9NiIpVKLni!r`If9p?k!`9m0maB1K&#AetPx44!ysA7>8W_-1qk=zP^cXl@FK#yc^$mH6=GU`JizC zU-CD_7krG*UOv1adj;kff4QgYldp<#ugaZupP%))vx!{)$6U9llGj`@9N8^uvOQ9D=0}aM;sK6txJLd8R7;zu@o4K;1<3bzXDj$yH%U7H8SN$OEFMy9*-_n~f3F6*uCyVyn#_!cRQk8ZZ8cpNQo|*7B=rl$rZbF(YR}cQxEHsaV>_{H7}{f_tvc zg6fzf9dQ9Db)R){fE{ig-8|&_)DbrB&TF||r(dz*YFk>vL!~ahRX%Lv%N=Mum6@8( za!VPcSx!u&oLJ=pv|VXUKK#BI*SPQDo^CCB?mqt?C$f!r7&{c500000NkvXXu0mjf Dyppy* delta 494 zcmVAuWfcPZu)kO}} zK*_a7A3)(18-M9+@;MdnkY0RRe@PK3q=(`Vns(+bJ1A9GhI%SJZ8OCwv~muifHBAN zk7V6;o)KIirc2Ik%GdtFL+GdIosu{tcm2(IMj5(H% zBPbWfDKzBj2k4Ng3Q&sUM6J#SWi#n|+Nj_4G`2GiG07#}Q@ar9B3gqvH?vW{+|xn* k*|wkyIvslb6Mfx&0oJ53X+-3Zr2qf`07*qoM6N<$g3J!w(f|Me diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html index d2b0f222f..c19567788 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html @@ -38,8 +38,8 @@
    - -
    moTS(moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
    move_explmoTS< M > [private]
    mutexmoTS< M > [private, static]
    operator()(EOT &__sol)moTS< M > [inline]
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + operator()(EOT &__sol)moTS< M > [inline, virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s.html b/trunk/paradiseo-mo/docs/html/classmo_t_s.html index 14d2ee406..e8bed1dbd 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s.html @@ -36,15 +36,19 @@

    Inheritance diagram for moTS< M >:

    -moAlgo< M::EOType > +moAlgo< M::EOType > +eoMonOp< M::EOType > +eoOp< EOType > +eoUF< M::EOType &, bool > +eoFunctorBase List of all members. - + - + @@ -69,7 +73,7 @@ typedef EOT::Fitness  +eoEvalFunc< EOT > &  @@ -138,7 +142,7 @@ template<class M> - + @@ -193,7 +197,7 @@ template<class M> - + @@ -236,7 +240,7 @@ template<class M> - +

    Public Member Functions

     moTS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
     moTS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
     Constructor of a moTS specifying all the boxes.
     moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
     moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
     Constructor with less parameters.
    bool operator() (EOT &__sol)
     Stop criterion.
    -eoEvalFunc< EOT > & full_eval
    full_eval
     Full evaluation function.

    Static Private Attributes

    eoEvalFunc< EOT > & eoEvalFunc< EOT > &  __full_eval 
    eoEvalFunc< EOT > & eoEvalFunc< EOT > &  __full_eval 
    EOT &  __sol  )  [inline] [inline, virtual]
    @@ -253,6 +257,8 @@ Algorithm of the tabu search. As a moSA
    Returns:
    TRUE.
    +

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

    Definition at line 104 of file moTS.h.

    @@ -261,7 +267,7 @@ References moTS< M >::co

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

    Inheritance diagram for moTSMoveLoopExpl< M >:

    -moMoveLoopExpl< M > -moMoveExpl< M > +moMoveLoopExpl< M > +moMoveExpl< M > +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase List of all members. @@ -180,7 +182,7 @@ template<class M> - +
    ) [inline] [inline, virtual]
    @@ -197,6 +199,8 @@ The exploration continues while the chosen move is not in the tabu list or the a +

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

    Definition at line 69 of file moTSMoveLoopExpl.h.

    @@ -205,7 +209,7 @@ References moTS

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png index c9608b2deabb5215c09073c147bd24719dee17fe..717f30a1788ac8ef51945255e8a0eb8afaa89080 100644 GIT binary patch literal 1577 zcmcgsTTqe-6h`xwiq@!GS}m(PvuKQEq~&@kGTU@BHIv^3Hcd?h6-o%@l3mnr)=M%| z;+mG)u2%klVv15;P*V#P@*4VXg03E8s$9bCl&qkO|4V^Zy;}{(=Ku$C!(anjV5}c8i$9) zrc?oSShj+73LBULIyL_Zsqh`l zPe|xv^_4Se^5%fZMqbU{^X8l$Stp$Pt|R&FqYU! zCzYk_vT8;pcRWkZv~TAdOeSO6Pk{snpuXFV|BJwfMGjZ&PH-o5nAs)@j9^X)v?Wnf z!yR!GZ&gPUwy0b){9i~Sp~&V=W7zmfoyv3#XSghSYESmEo91QA=L0)aJows{TzbEx zOV*UvegRHNM6`X_PTU-?fA*|LO)B>9p~tqqrzX?#!|Hdu^++@(>_pE z+Q+oLD{A8S5CT?6bJb*6IC*s(ePqmAgA7aJW?x9O9~XB{C*?RvfI4g#x9x=A<2ARu zgk_-W-ut`>dbUc9o#C;XQ QbblSR delta 621 zcmV-z0+Riy43h;RiBL{Q4GJ0x0000DNk~Le0001@0001p1Oos70G8`5c#$D9e*!5< zL_t(|ob8xPa>F1DhS4T#!404{XfM=N?tg?LA#BXUAv1K6ctoa=2-0Ve>T&X$pVh;B zhqdENiT_G;@|TCTRy;q5ctni(zKq{}KZqC+or@XPNqltZ#fDJM*{6xt6Vu1sAWjey z$g%X6NF0&K=X>;_OQbq_Co>lce`1Xs61_Ol`beW(A<9`fBDBaUVhH)vk}u25?2w|KV4_XZ94LG#QX2t6L0tX z+Y>*c*Gg2P5|yY#B`WcC#P#1uKjC}05<@HF9DiF*$UY5mEc6^_Ly=}9f1U_EWPJSb z@26y+jd&vT5?2w|KV8><19%-#^`1q@)j%aGQHe@aq7s#ODWY9H z3@$zkC~-Y8HVVNae^g%Re|S-9XHMSNx0vG|fmXo83>Xu!3{Tf6XfaTgya7 zwnUymN{$xNZFS^lqMViExAWITtcj@?6%paE$4u<*5mRbP=2@qXL$p%X(V*$nQF;y1 zVs0`mMq@1&y^eLPdYy@#|Hp>|c6XF_LE_X!mAHnu{OS4!jpr#8)>X>@00000NkvXX Hu0mjfvmqXA diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html index 3cb0b3877..a3afa24cb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html @@ -31,9 +31,13 @@

    moTabuList< M > Member List

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

    + + -
    add(const M &__move, const EOT &__sol)=0moTabuList< M > [pure virtual]
    EOT typedefmoTabuList< M >
    functor_category()eoBF< A1, A2, R > [static]
    init()=0moTabuList< M > [pure virtual]
    operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    update()=0moTabuList< M > [pure virtual]

    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html index 26d20e4a3..6ee4f08b0 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html @@ -28,11 +28,17 @@
  • Class Hierarchy
  • Class Members
    • -

    moTabuList< M > Class Template Reference

    Class describing a tabu list that a moTS uses. +

    moTabuList< M > Class Template Reference

    Class describing a tabu list that a moTS uses. More...

    #include <moTabuList.h>

    +

    Inheritance diagram for moTabuList< M >: +

    + +eoBF< A1, A2, R > +eoFunctorBase + List of all members. @@ -150,7 +156,7 @@ Can be useful if the data structure needs to be allocated before being used.

    The documentation for this class was generated from the following file: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/files.html b/trunk/paradiseo-mo/docs/html/files.html index e353ccc3c..943d06717 100644 --- a/trunk/paradiseo-mo/docs/html/files.html +++ b/trunk/paradiseo-mo/docs/html/files.html @@ -52,7 +52,7 @@

    Public Types

    moTS.h [code]
    moTSMoveLoopExpl.h [code]
    -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions.html b/trunk/paradiseo-mo/docs/html/functions.html index 606a3c7c6..b360b1bc2 100644 --- a/trunk/paradiseo-mo/docs/html/functions.html +++ b/trunk/paradiseo-mo/docs/html/functions.html @@ -228,7 +228,7 @@ Here is a list of all documented class members with links to the class documenta
  • vect_better_moves : moRandImprSelect< M > -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_func.html b/trunk/paradiseo-mo/docs/html/functions_func.html index 7be116379..9e93c86e6 100644 --- a/trunk/paradiseo-mo/docs/html/functions_func.html +++ b/trunk/paradiseo-mo/docs/html/functions_func.html @@ -112,7 +112,7 @@ , moMoveSelect< M > , moFirstImprSelect< M > -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_type.html b/trunk/paradiseo-mo/docs/html/functions_type.html index 5c85ef0de..8ee94fe72 100644 --- a/trunk/paradiseo-mo/docs/html/functions_type.html +++ b/trunk/paradiseo-mo/docs/html/functions_type.html @@ -61,7 +61,7 @@ , moHC< M > , moFirstImprSelect< M > -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_vars.html b/trunk/paradiseo-mo/docs/html/functions_vars.html index ff1fa97f3..93b9dc4a7 100644 --- a/trunk/paradiseo-mo/docs/html/functions_vars.html +++ b/trunk/paradiseo-mo/docs/html/functions_vars.html @@ -145,7 +145,7 @@
  • vect_better_moves : moRandImprSelect< M > -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/hierarchy.html b/trunk/paradiseo-mo/docs/html/hierarchy.html index 7ef8ab3ea..235bf01f3 100644 --- a/trunk/paradiseo-mo/docs/html/hierarchy.html +++ b/trunk/paradiseo-mo/docs/html/hierarchy.html @@ -30,24 +30,26 @@

    PARADISEO-MO Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically: +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/index_8h-source.html b/trunk/paradiseo-mo/docs/html/index_8h-source.html index 51cb5ea80..11f0b8c29 100644 --- a/trunk/paradiseo-mo/docs/html/index_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/index_8h-source.html @@ -27,7 +27,7 @@ 00024 // c-file-style: "Stroustrup" 00025 // fill-column: 80 00026 // End: -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/installdox b/trunk/paradiseo-mo/docs/html/installdox index 9b89fe025..1628445b3 100755 --- a/trunk/paradiseo-mo/docs/html/installdox +++ b/trunk/paradiseo-mo/docs/html/installdox @@ -1,6 +1,6 @@ #!/usr/bin/perl -%subst = ( ); +%subst = ( "eo.doxytag", ""); $quiet = 0; if (open(F,"search.cfg")) diff --git a/trunk/paradiseo-mo/docs/html/main.html b/trunk/paradiseo-mo/docs/html/main.html index 974a7731e..855b70a2d 100644 --- a/trunk/paradiseo-mo/docs/html/main.html +++ b/trunk/paradiseo-mo/docs/html/main.html @@ -24,15 +24,15 @@

    Welcome to PARADISEO-Moving Objects

    0.1

    -Introduction

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

    -Tutorial

    +tutorial

    -Installation

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

    -Overall Design

    -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +design +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_8h-source.html index 04c0212a3..517aa803d 100644 --- a/trunk/paradiseo-mo/docs/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_8h-source.html @@ -64,7 +64,7 @@ 00041 #include "moTSMoveLoopExpl.h" 00042 00043 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html index 379264d68..0456ff46f 100644 --- a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html @@ -38,13 +38,13 @@ 00015 #include <eoOp.h> 00016 00018 -00021 template < class EOT > class moAlgo:public eoMonOp < EOT > +00021 template < class EOT > class moAlgo:public eoMonOp < EOT > 00022 { 00023 00024 }; 00025 00026 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html index 41bb10b3a..ee0cc11e7 100644 --- a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename +00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename 00023 M::EOType::Fitness &, 00024 bool > 00025 { @@ -51,7 +51,7 @@ 00035 }; 00036 00037 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html index 21772cdb2..1cc9a9497 100644 --- a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html @@ -92,7 +92,7 @@ 00091 }; 00092 00093 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html index eb2ebef3c..3dc11878d 100644 --- a/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html @@ -38,13 +38,13 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 class moCoolSched:public eoUF < double &, bool > +00022 class moCoolSched:public eoUF < double &, bool > 00023 { 00024 00025 }; 00026 00027 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html index a3af83175..598c04180 100644 --- a/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html @@ -65,7 +65,7 @@ 00058 }; 00059 00060 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html index 95c3432ed..8fec42e58 100644 --- a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html @@ -99,7 +99,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html index d0fcf7e33..aa3e12294 100644 --- a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html @@ -71,7 +71,7 @@ 00067 }; 00068 00069 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html index 009c50d35..bedbdc2c5 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html @@ -125,7 +125,7 @@ 00131 }; 00132 00133 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html index 74d08f703..ab5904d28 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html @@ -108,7 +108,7 @@ 00106 }; 00107 00108 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html index 8b1b0f228..4c7989a39 100644 --- a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -89,7 +89,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html index 8bf90e74a..54a1efb64 100644 --- a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html @@ -85,7 +85,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html index e4febc472..af13bcad3 100644 --- a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename +00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename 00022 M::EOType &, void > 00023 { 00024 @@ -64,7 +64,7 @@ 00054 00055 private: 00056 -00058 std::vector < eoBF < const +00058 std::vector < eoBF < const 00059 M &, const 00060 typename 00061 M::EOType &, void >*> @@ -73,7 +73,7 @@ 00064 }; 00065 00066 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html index 3c5a44c18..a44817a94 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00023 template < class EOT > class moMove:public eoUF < EOT &, void > +00023 template < class EOT > class moMove:public eoUF < EOT &, void > 00024 { 00025 00026 public: @@ -47,7 +47,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html index 043ca125d..f97760789 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moMoveExpl:public eoBF < const typename +00021 template < class M > class moMoveExpl:public eoBF < const typename 00022 M::EOType &, 00023 typename 00024 M::EOType &, void > @@ -47,7 +47,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html index 06986ab63..70ddf932e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename +00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename 00025 M::EOType &, 00026 typename 00027 M::EOType::Fitness > @@ -47,7 +47,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html index 93b27ebc9..8e6165ef3 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html @@ -38,14 +38,14 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moMoveInit:public eoBF < M &, const typename +00022 template < class M > class moMoveInit:public eoBF < M &, const typename 00023 M::EOType &, void > 00024 { 00025 00026 }; 00027 00028 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html index 05bf6ff99..bb5fc5222 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html index 0a3c07353..5ecde3ab0 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00027 -00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, +00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, 00033 void > 00034 { 00035 public: @@ -65,7 +65,7 @@ 00063 }; 00064 00065 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html index f2d3fa60e..c07b9bcaf 100644 --- a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moNextMove:public eoBF < M &, const typename +00022 template < class M > class moNextMove:public eoBF < M &, const typename 00023 M::EOType &, 00024 bool > 00025 { @@ -46,7 +46,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html index b9bf544ff..38731a6dd 100644 --- a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html @@ -56,7 +56,7 @@ 00046 }; 00047 00048 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html index e0a0665b3..422c80aa7 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html @@ -96,7 +96,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html index 4c4721c52..f3393c03d 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html @@ -38,13 +38,13 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moRandMove:public eoUF < M &, void > +00021 template < class M > class moRandMove:public eoUF < M &, void > 00022 { 00023 00024 }; 00025 00026 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html index f0f1f832f..2cea3d49b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html @@ -147,7 +147,7 @@ 00151 }; 00152 00153 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html index 0a2380417..222230668 100644 --- a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool > +00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool > 00023 { 00024 00025 public: @@ -47,7 +47,7 @@ 00031 }; 00032 00033 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html index 85122f488..93c498677 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html @@ -167,7 +167,7 @@ 00182 template < class EOT > bool moTS < EOT >::first_time = true; 00183 00184 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html index 61ac78d03..89756df53 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html @@ -127,7 +127,7 @@ 00130 }; 00131 00132 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html index 38e46fe1a..84796410e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moTabuList:public eoBF < const M &, const typename +00022 template < class M > class moTabuList:public eoBF < const M &, const typename 00023 M::EOType &, 00024 bool > 00025 { @@ -64,7 +64,7 @@ 00058 }; 00059 00060 #endif -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/search.php b/trunk/paradiseo-mo/docs/html/search.php index bd102b581..0589134d5 100644 --- a/trunk/paradiseo-mo/docs/html/search.php +++ b/trunk/paradiseo-mo/docs/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
    Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by  +
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/tree.html b/trunk/paradiseo-mo/docs/html/tree.html index 8b6c88146..4f9e90ea7 100644 --- a/trunk/paradiseo-mo/docs/html/tree.html +++ b/trunk/paradiseo-mo/docs/html/tree.html @@ -98,54 +98,96 @@

    o+Class Hierarchy

    |o*EmptySelection

    -

    |o*moAlgo< EOT >

    -

    |o+moAlgo< M::EOType >

    +

    |o+eoFunctorBase [external]

    -

    |o+moAspirCrit< M >

    - -

    |o+moCoolSched

    - -

    |o*moLSCheckPoint< M >

    -

    |o*moMove< EOT >

    -

    |o+moMoveExpl< M >

    - -

    |o*moMoveIncrEval< M >

    -

    |o*moMoveInit< M >

    -

    |o+moMoveSelect< M >

    -

    o*Class Members

    -

    \+File List

    -
    +

    \+File List

    +

     o*index.h

     o*mo.h

     o*moAlgo.h

    diff --git a/trunk/paradiseo-mo/docs/latex/classmo_algo.tex b/trunk/paradiseo-mo/docs/latex/classmo_algo.tex index ad07def4d..bfd2994a6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_algo.tex @@ -5,6 +5,12 @@ Description of an algorithm of the paradiseo-mo library. {\tt \#include $<$mo\-Algo.h$>$} +Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{classmo_algo} +\end{center} +\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps index fbf0b26ef..7a0252d70 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 109.29 +%%BoundingBox: 0 0 500 218.579 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.575 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 2 def +/rows 4 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,6 +174,8 @@ 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 @@ -188,11 +190,21 @@ 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/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex index ffec16f05..646d32397 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex @@ -8,7 +8,7 @@ Description of the conditions in which a tabu move could be accepted. Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_aspir_crit} +\includegraphics[height=4cm]{classmo_aspir_crit} \end{center} \end{figure} \subsection*{Public Member Functions} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps index f9c367972..e1504ce28 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 259.74 +%%BoundingBox: 0 0 500 303.03 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.925 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex index a7b05435f..baf716c2f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_best_impr_select} +\includegraphics[height=4cm]{classmo_best_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -77,7 +77,7 @@ Definition at line 47 of file mo\-Best\-Impr\-Select.h. References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -94,6 +94,8 @@ Procedure which saved the best move and fitness. \end{Desc} +Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. + Definition at line 68 of file mo\-Best\-Impr\-Select.h. References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps b/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps index dc8336154..881e79dfc 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 317.46 +%%BoundingBox: 0 0 500 503.145 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.575 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.99375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,6 +174,8 @@ boxfont setfont 1 boundaspect scale (moCoolSched) cw +(eoUF< double &, bool >) cw +(eoFunctorBase) cw (moEasyCoolSched) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -187,10 +189,20 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moCoolSched) 0 1 box + (eoUF< double &, bool >) 0 2 box + (eoFunctorBase) 0 3 box (moEasyCoolSched) 0 0 box % ----- relations ----- +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in solid 1 0 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex b/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex index cfccf4669..419ecef30 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex @@ -8,7 +8,7 @@ This class gives the description of a cooling schedule. Inheritance diagram for mo\-Cool\-Sched::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_cool_sched} +\includegraphics[height=4cm]{classmo_cool_sched} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.eps b/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.eps index 0cff15334..debf9710c 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 317.46 +%%BoundingBox: 0 0 500 503.145 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.575 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.99375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (moEasyCoolSched) cw (moCoolSched) cw +(eoUF< double &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moEasyCoolSched) 0 0 box (moCoolSched) 0 1 box + (eoUF< double &, bool >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.tex b/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.tex index ceb3b8927..b4d16cfe1 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_easy_cool_sched.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Cool\-Sched}{p.}{classmo_cool_sched}. Inheritance diagram for mo\-Easy\-Cool\-Sched::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_easy_cool_sched} +\includegraphics[height=4cm]{classmo_easy_cool_sched} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -58,7 +58,7 @@ Definition at line 31 of file mo\-Easy\-Cool\-Sched.h. \subsection{Member Function Documentation} \index{moEasyCoolSched@{mo\-Easy\-Cool\-Sched}!operator()@{operator()}} \index{operator()@{operator()}!moEasyCoolSched@{mo\-Easy\-Cool\-Sched}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Easy\-Cool\-Sched::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_easy_cool_sched_ca08df878417ef1124e6933a9c2d7a0b} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Easy\-Cool\-Sched::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_easy_cool_sched_ca08df878417ef1124e6933a9c2d7a0b} Function which proceeds to the cooling. @@ -74,6 +74,8 @@ Decrease 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 eo\-UF$<$ double \&, bool $>$}. + Definition at line 44 of file mo\-Easy\-Cool\-Sched.h. References ratio, and threshold. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps index 04ffcb96d..7057473a9 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 258.065 +%%BoundingBox: 0 0 500 303.03 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.9375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex index c202586d4..e28acfa68 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex @@ -8,7 +8,7 @@ One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_first_impr_select} +\includegraphics[height=4cm]{classmo_first_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -90,7 +90,7 @@ Definition at line 52 of file mo\-First\-Impr\-Select.h. References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -107,6 +107,8 @@ Procedure which saved the best move and fitness. \end{Desc} +Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. + Definition at line 76 of file mo\-First\-Impr\-Select.h. References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps index c9e65107d..c73c60ba3 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 227.273 +%%BoundingBox: 0 0 500 441.989 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex index 5f4ac8050..4b0194020 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex @@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic. Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_gen_sol_continue} +\includegraphics[height=4cm]{classmo_gen_sol_continue} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -62,7 +62,7 @@ Definition at line 30 of file mo\-Gen\-Sol\-Continue.h. \subsection{Member Function Documentation} \index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}} \index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} Function that activates the stop criterion. @@ -78,6 +78,8 @@ 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 eo\-UF$<$ const EOT \&, bool $>$}. + Definition at line 44 of file mo\-Gen\-Sol\-Continue.h. References mo\-Gen\-Sol\-Continue$<$ EOT $>$::max\-Num\-Gen, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps b/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps index 648f11f20..184d2041a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 268.456 +%%BoundingBox: 0 0 500 271.739 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def -/cols 1 def +/rows 5 def +/cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,10 @@ boxfont setfont 1 boundaspect scale (moHC< M >) cw (moAlgo< M::EOType >) cw +(eoMonOp< M::EOType >) cw +(eoOp< EOType >) cw +(eoUF< M::EOType &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moHC< M >) 0 0 box - (moAlgo< M::EOType >) 0 1 box + (moHC< M >) 0.5 0 box + (moAlgo< M::EOType >) 0.5 1 box + (eoMonOp< M::EOType >) 0.5 2 box + (eoOp< EOType >) 0 3 box + (eoUF< M::EOType &, bool >) 1 3 box + (eoFunctorBase) 1 4 box % ----- relations ----- solid -0 0 0 out +0 0.5 0 out solid -1 0 1 in +1 0.5 1 in +solid +0 0.5 1 out +solid +1 0.5 2 in +solid +0 0.5 2 out +solid +0 1 3 conn +solid +1 0 3 in +solid +1 1 3 in +solid +0 1 3 out +solid +1 1 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex index 917388faa..dc5b26818 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex @@ -8,15 +8,15 @@ Hill Climbing (HC). Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_h_c} +\includegraphics[height=5cm]{classmo_h_c} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize} @@ -35,7 +35,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd {\bf mo\-Move\-Expl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} +{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -54,7 +54,7 @@ Definition at line 26 of file mo\-HC.h. \subsection{Constructor \& Destructor Documentation} \index{moHC@{mo\-HC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} Full constructor. @@ -70,7 +70,7 @@ All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl Definition at line 53 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} Light constructor. @@ -89,7 +89,7 @@ Definition at line 67 of file mo\-HC.h. \subsection{Member Function Documentation} \index{moHC@{mo\-HC}!operator()@{operator()}} \index{operator()@{operator()}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-HC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-HC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} Function which launches the HC. @@ -105,6 +105,8 @@ The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_ \item[Returns:]TRUE. \end{Desc} +Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. + Definition at line 82 of file mo\-HC.h. References mo\-HC$<$ M $>$::full\_\-eval, and mo\-HC$<$ M $>$::move\_\-expl. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps index 1383bbf1b..1240e010d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 346.821 +%%BoundingBox: 0 0 500 327.869 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.44167 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 3 def +/rows 5 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,6 +176,8 @@ 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 @@ -190,6 +192,8 @@ 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 ----- @@ -201,3 +205,11 @@ solid 0 0 1 out solid 1 0 2 in +solid +0 0 2 out +solid +1 0 3 in +solid +0 0 3 out +solid +1 0 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex index fbcfeea7c..e404ab915 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex @@ -8,7 +8,7 @@ Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3cm]{classmo_h_c_move_loop_expl} +\includegraphics[height=5cm]{classmo_h_c_move_loop_expl} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -75,7 +75,7 @@ Definition at line 43 of file mo\-HCMove\-Loop\-Expl.h. \subsection{Member Function Documentation} \index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}} \index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,6 +89,8 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} +Implements {\bf eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. + Definition at line 59 of file mo\-HCMove\-Loop\-Expl.h. References mo\-HCMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-select, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps index 41cee35a0..a00a3c3cb 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 218.579 +%%BoundingBox: 0 0 500 437.158 %%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 1.14375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex index 5303c7f37..33da06ec9 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_impr_best_fit_aspir_crit} +\includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps index bc4ea56dc..5f2df0014 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 245.399 +%%BoundingBox: 0 0 500 490.798 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex index ff90d301e..b9a7dc563 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_it_rand_next_move} +\includegraphics[height=4cm]{classmo_it_rand_next_move} \end{center} \end{figure} \subsection*{Public Member Functions} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex b/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex index 44cc5d177..968b56892 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex @@ -5,17 +5,23 @@ Class which allows a checkpointing system. {\tt \#include $<$mo\-LSCheck\-Point.h$>$} +Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=3cm]{classmo_l_s_check_point} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) \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 $>$ \&\_\-\_\-f) +void {\bf add} ({\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} +std::vector$<$ {\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} \begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize} @@ -52,7 +58,7 @@ Definition at line 34 of file mo\-LSCheck\-Point.h. References mo\-LSCheck\-Point$<$ M $>$::func.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}} \index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::add (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::add ({\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} Procedure which add a new function to the function vector. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_move.tex index 0460f6faf..873616a4c 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move.tex @@ -5,6 +5,12 @@ Definition of a move. {\tt \#include $<$mo\-Move.h$>$} +Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=3cm]{classmo_move} +\end{center} +\end{figure} \subsection*{Public Types} \begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps index 708dd0b50..18fb8889f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 173.41 +%%BoundingBox: 0 0 500 163.934 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 3 def +/rows 5 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,6 +174,8 @@ 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 @@ -189,12 +191,22 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveExpl< M >) 0.5 2 box + (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box + (eoFunctorBase) 0.5 4 box (moMoveLoopExpl< M >) 0.5 1 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box % ----- relations ----- +solid +0 0.5 2 out +solid +1 0.5 3 in +solid +0 0.5 3 out +solid +1 0.5 4 in solid 1 0.5 1.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex index 614132a6c..5d0b1e66b 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex @@ -8,7 +8,7 @@ Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3cm]{classmo_move_expl} +\includegraphics[height=4.59016cm]{classmo_move_expl} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex index 6b4bd7289..91421ef4b 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex @@ -5,6 +5,12 @@ {\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$} +Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=3cm]{classmo_move_incr_eval} +\end{center} +\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex index 556b323ee..353911436 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex @@ -5,6 +5,12 @@ Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. {\tt \#include $<$mo\-Move\-Init.h$>$} +Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=3cm]{classmo_move_init} +\end{center} +\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps index 76326be37..c6a78b5b1 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 173.41 +%%BoundingBox: 0 0 500 163.934 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 3 def +/rows 5 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -190,6 +192,8 @@ 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 @@ -200,6 +204,14 @@ solid solid 1 0.5 2 in solid +0 0.5 2 out +solid +1 0.5 3 in +solid +0 0.5 3 out +solid +1 0.5 4 in +solid 1 0.5 0.25 out solid 0 1 1 conn diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex index 8bbfd3542..1a6c5b997 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex @@ -8,7 +8,7 @@ Class which describes an iterative explorer. Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3cm]{classmo_move_loop_expl} +\includegraphics[height=4.59016cm]{classmo_move_loop_expl} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps index 86a37c002..b61e2bf9f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 83.8574 +%%BoundingBox: 0 0 500 101.01 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 5.9625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.95 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 3 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,6 +174,8 @@ 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 @@ -189,12 +191,22 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveSelect< M >) 1 1 box + (eoBF< M &, M::EOType::Fitness &, void >) 1 2 box + (eoFunctorBase) 1 3 box (moBestImprSelect< M >) 0 0 box (moFirstImprSelect< M >) 1 0 box (moRandImprSelect< M >) 2 0 box % ----- relations ----- +solid +0 1 1 out +solid +1 1 2 in +solid +0 1 2 out +solid +1 1 3 in solid 1 1 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex index 390b93989..2ed02f91e 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex @@ -8,7 +8,7 @@ Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_move_select} +\includegraphics[height=2.82828cm]{classmo_move_select} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps b/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps index d9586a593..08b997f12 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 245.399 +%%BoundingBox: 0 0 500 490.798 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,6 +174,8 @@ 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 @@ -187,10 +189,20 @@ 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/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex index e51cd5566..7da58dd8d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex @@ -8,7 +8,7 @@ Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_next_move} +\includegraphics[height=4cm]{classmo_next_move} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps index 4a1de4c86..f5d50a373 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 291.971 +%%BoundingBox: 0 0 500 583.942 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.7125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex index 2c5a3b5e1..53fcf3593 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex @@ -8,7 +8,7 @@ One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_ Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_no_aspir_crit} +\includegraphics[height=4cm]{classmo_no_aspir_crit} \end{center} \end{figure} \subsection*{Private Member Functions} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps index 74d2fc0f6..fe55210a4 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 251.572 +%%BoundingBox: 0 0 500 303.03 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.9875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ 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 @@ -188,6 +190,8 @@ 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 ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex index feaa35f47..297d4d381 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\- Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_rand_impr_select} +\includegraphics[height=4cm]{classmo_rand_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -96,7 +96,7 @@ Definition at line 56 of file mo\-Rand\-Impr\-Select.h. References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -115,6 +115,8 @@ One the saved move is randomly chosen. \end{Desc} +Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. + Definition at line 77 of file mo\-Rand\-Impr\-Select.h. References mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex index ff3370a8d..a35b6919a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex @@ -5,6 +5,12 @@ Random move generator. {\tt \#include $<$mo\-Rand\-Move.h$>$} +Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=3cm]{classmo_rand_move} +\end{center} +\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps b/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps index 90945c761..efa0100f9 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 268.456 +%%BoundingBox: 0 0 500 271.739 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def -/cols 1 def +/rows 5 def +/cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,10 @@ boxfont setfont 1 boundaspect scale (moSA< M >) cw (moAlgo< M::EOType >) cw +(eoMonOp< M::EOType >) cw +(eoOp< EOType >) cw +(eoUF< M::EOType &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moSA< M >) 0 0 box - (moAlgo< M::EOType >) 0 1 box + (moSA< M >) 0.5 0 box + (moAlgo< M::EOType >) 0.5 1 box + (eoMonOp< M::EOType >) 0.5 2 box + (eoOp< EOType >) 0 3 box + (eoUF< M::EOType &, bool >) 1 3 box + (eoFunctorBase) 1 4 box % ----- relations ----- solid -0 0 0 out +0 0.5 0 out solid -1 0 1 in +1 0.5 1 in +solid +0 0.5 1 out +solid +1 0.5 2 in +solid +0 0.5 2 out +solid +0 1 3 conn +solid +1 0 3 in +solid +1 1 3 in +solid +0 1 3 out +solid +1 1 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex b/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex index 0a99f4db8..07cb399d6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex @@ -8,13 +8,13 @@ Simulated Annealing (SA). Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_s_a} +\includegraphics[height=5cm]{classmo_s_a} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf mo\-Cool\-Sched} \&\_\-\_\-cool\_\-sched, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf mo\-Cool\-Sched} \&\_\-\_\-cool\_\-sched, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} @@ -45,7 +45,7 @@ double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} {\bf mo\-Cool\-Sched} \& {\bf cool\_\-sched}\label{classmo_s_a_c7aaf7424aa1b9f889d2ba9c959e5a1d} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} +{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -64,7 +64,7 @@ Definition at line 32 of file mo\-SA.h. \subsection{Constructor \& Destructor Documentation} \index{moSA@{mo\-SA}!moSA@{moSA}} \index{moSA@{moSA}!moSA@{mo\-SA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-SA}$<$ M $>$::{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf mo\-Cool\-Sched} \& {\em \_\-\_\-cool\_\-sched}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_ef9ffb0d95c599e0a06c78db5f2f4b12} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-SA}$<$ M $>$::{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf mo\-Cool\-Sched} \& {\em \_\-\_\-cool\_\-sched}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_ef9ffb0d95c599e0a06c78db5f2f4b12} SA constructor. @@ -83,7 +83,7 @@ Definition at line 60 of file mo\-SA.h. \subsection{Member Function Documentation} \index{moSA@{mo\-SA}!operator()@{operator()}} \index{operator()@{operator()}!moSA@{mo\-SA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-SA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-SA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} function that launches the SA algorithm. @@ -99,6 +99,8 @@ As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, t \item[Returns:]TRUE. \end{Desc} +Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. + Definition at line 82 of file mo\-SA.h. References mo\-SA$<$ M $>$::cont, mo\-SA$<$ M $>$::cool\_\-sched, mo\-SA$<$ M $>$::full\_\-eval, mo\-SA$<$ M $>$::incr\_\-eval, mo\-SA$<$ M $>$::init\_\-temp, and mo\-SA$<$ M $>$::move\_\-rand. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps index 08a227b1a..c2a7fb9ca 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 227.273 +%%BoundingBox: 0 0 500 441.989 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,6 +174,8 @@ boxfont setfont 1 boundaspect scale (moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw (moGenSolContinue< EOT >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -187,10 +189,20 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box (moGenSolContinue< 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/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex index 9039a615f..457ef3ba7 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex @@ -8,7 +8,7 @@ Class that describes a stop criterion for a solution-based heuristic. Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_sol_continue} +\includegraphics[height=4cm]{classmo_sol_continue} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -23,7 +23,7 @@ virtual void {\bf init} ()=0 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 (eo\-UF). +It allows to add an initialisation procedure to an object that is a unary function ({\bf eo\-UF}). diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps b/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps index 7f23b6aef..a62652ad5 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 268.456 +%%BoundingBox: 0 0 500 271.739 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def -/cols 1 def +/rows 5 def +/cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,10 @@ boxfont setfont 1 boundaspect scale (moTS< M >) cw (moAlgo< M::EOType >) cw +(eoMonOp< M::EOType >) cw +(eoOp< EOType >) cw +(eoUF< M::EOType &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moTS< M >) 0 0 box - (moAlgo< M::EOType >) 0 1 box + (moTS< M >) 0.5 0 box + (moAlgo< M::EOType >) 0.5 1 box + (eoMonOp< M::EOType >) 0.5 2 box + (eoOp< EOType >) 0 3 box + (eoUF< M::EOType &, bool >) 1 3 box + (eoFunctorBase) 1 4 box % ----- relations ----- solid -0 0 0 out +0 0.5 0 out solid -1 0 1 in +1 0.5 1 in +solid +0 0.5 1 out +solid +1 0.5 2 in +solid +0 0.5 2 out +solid +0 1 3 conn +solid +1 0 3 in +solid +1 1 3 in +solid +0 1 3 out +solid +1 1 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex index 8cf3ec796..08c652ad2 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex @@ -8,15 +8,15 @@ Tabu Search (TS). Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_t_s} +\includegraphics[height=5cm]{classmo_t_s} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} @@ -38,7 +38,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f8 {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} +{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection*{Static Private Attributes} @@ -66,7 +66,7 @@ Definition at line 30 of file mo\-TS.h. \subsection{Constructor \& Destructor Documentation} \index{moTS@{mo\-TS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. @@ -84,7 +84,7 @@ Definition at line 59 of file mo\-TS.h. References mo\-TS$<$ M $>$::first\_\-time, and mo\-TS$<$ M $>$::mutex.\index{moTS@{mo\-TS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -105,7 +105,7 @@ References mo\-TS$<$ M $>$::first\_\-time, and mo\-TS$<$ M $>$::mutex. \subsection{Member Function Documentation} \index{moTS@{mo\-TS}!operator()@{operator()}} \index{operator()@{operator()}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-TS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-TS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} Function which launchs the Tabu Search. @@ -121,6 +121,8 @@ Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyr \item[Returns:]TRUE. \end{Desc} +Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. + Definition at line 104 of file mo\-TS.h. References mo\-TS$<$ M $>$::cont, mo\-TS$<$ M $>$::full\_\-eval, mo\-TS$<$ M $>$::move\_\-expl, and mo\-TS$<$ M $>$::mutex. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps index d8324527a..fd31fc02a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 352.941 +%%BoundingBox: 0 0 500 327.869 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.41667 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 3 def +/rows 5 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,6 +176,8 @@ 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 @@ -190,6 +192,8 @@ 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 ----- @@ -201,3 +205,11 @@ solid 0 0 1 out solid 1 0 2 in +solid +0 0 2 out +solid +1 0 3 in +solid +0 0 3 out +solid +1 0 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex index 5f7327560..40aeadccd 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex @@ -8,7 +8,7 @@ Explorer for a Tabu Search algorithm. Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3cm]{classmo_t_s_move_loop_expl} +\includegraphics[height=5cm]{classmo_t_s_move_loop_expl} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -83,7 +83,7 @@ References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, and mo\-TSMove\-Loop\ \subsection{Member Function Documentation} \index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}} \index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,6 +97,8 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} +Implements {\bf eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. + Definition at line 69 of file mo\-TSMove\-Loop\-Expl.h. References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, mo\-TSMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-select, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex index 5341527b7..7968975e6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex @@ -5,6 +5,12 @@ Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. {\tt \#include $<$mo\-Tabu\-List.h$>$} +Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=3cm]{classmo_tabu_list} +\end{center} +\end{figure} \subsection*{Public Types} \begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/docs/latex/doxygen.sty b/trunk/paradiseo-mo/docs/latex/doxygen.sty index 630d4b0e0..20a334e06 100644 --- a/trunk/paradiseo-mo/docs/latex/doxygen.sty +++ b/trunk/paradiseo-mo/docs/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Dec 20 17:33:55 2006 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/docs/latex/hierarchy.tex b/trunk/paradiseo-mo/docs/latex/hierarchy.tex index e9cef1278..4c6ee27b0 100644 --- a/trunk/paradiseo-mo/docs/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/docs/latex/hierarchy.tex @@ -1,24 +1,23 @@ \section{PARADISEO-MO Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} \item \contentsline{section}{Empty\-Selection}{\pageref{class_empty_selection}}{} -\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} -\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} -\begin{CompactList} -\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} -\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} -\end{CompactList} +\item eo\-Functor\-Base{\tt [external]}\begin{CompactList} +\item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \begin{CompactList} \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}{mo\-Cool\-Sched}{\pageref{classmo_cool_sched}}{} -\begin{CompactList} -\item \contentsline{section}{mo\-Easy\-Cool\-Sched}{\pageref{classmo_easy_cool_sched}}{} -\end{CompactList} \item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} -\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} +\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} +\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{} +\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\end{CompactList} +\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\end{CompactList} +\item eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{} \begin{CompactList} \item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} @@ -27,22 +26,49 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \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}}{} +\end{CompactList} +\item eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{mo\-Move\-Select$<$ M $>$}{\pageref{classmo_move_select}}{} \begin{CompactList} \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} -\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{} -\begin{CompactList} -\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} \end{CompactList} -\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} +\item eo\-UF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} \item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} \end{CompactList} -\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\end{CompactList} +\item eo\-UF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Cool\-Sched}{\pageref{classmo_cool_sched}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-Easy\-Cool\-Sched}{\pageref{classmo_easy_cool_sched}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} +\end{CompactList} +\item eo\-UF$<$ EOType \&, bool $>${\tt [external]}\item eo\-UF$<$ M \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} +\end{CompactList} +\item eo\-UF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} +\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} +\end{CompactList} +\end{CompactList} +\end{CompactList} +\end{CompactList} +\item eo\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\end{CompactList} \end{CompactList} diff --git a/trunk/paradiseo-mo/docs/latex/main.tex b/trunk/paradiseo-mo/docs/latex/main.tex index 3ce1b6114..8dba03e9c 100644 --- a/trunk/paradiseo-mo/docs/latex/main.tex +++ b/trunk/paradiseo-mo/docs/latex/main.tex @@ -1,5 +1,5 @@ -\section{Introduction}\label{main_intro} -MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par - It contains classes for almost any kind of one solution based heuristics.\section{Tutorial}\label{main_tutorial} -\section{Installation}\label{main_install} -The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{Overall Design}\label{main_design} +\section{intro}\label{main_intro} +MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par + It contains classes for almost any kind of one solution based heuristics.\section{tutorial}\label{main_tutorial} +\section{install}\label{main_install} +The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design} diff --git a/trunk/paradiseo-mo/docs/latex/refman.tex b/trunk/paradiseo-mo/docs/latex/refman.tex index 64d3b471f..8d5e2a2b2 100644 --- a/trunk/paradiseo-mo/docs/latex/refman.tex +++ b/trunk/paradiseo-mo/docs/latex/refman.tex @@ -19,7 +19,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.5.1}\\ \vspace*{0.5cm} -{\small Wed Dec 20 17:33:55 2006}\\ +{\small Thu Dec 21 10:49:58 2006}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 index 0d13ec111..4e5763df0 100644 --- a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 +++ b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 @@ -1,4 +1,4 @@ -.TH "EmptySelection" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 index d11f714b3..772463721 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 @@ -1,4 +1,4 @@ -.TH "moAlgo" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moAlgo \- Description of an algorithm of the paradiseo-mo library. .PP \fC#include \fP .PP +Inherits \fBeoMonOp< EOT >\fP. +.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 index b8e219eae..028e7c5a5 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moAspirCrit" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ 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" diff --git a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 index cad6f3bab..61aa205ae 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moBestImprSelect" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -88,7 +88,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 47 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. -.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" +.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -105,6 +105,8 @@ Procedure which saved the best move and fitness. .RE .PP +.PP +Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 68 of file moBestImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 b/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 index 82b9d4e6b..360c8af81 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 @@ -1,4 +1,4 @@ -.TH "moCoolSched" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolSched" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moCoolSched \- This class gives the description of a cooling schedule. .PP \fC#include \fP .PP +Inherits \fBeoUF< double &, bool >\fP. +.PP Inherited by \fBmoEasyCoolSched\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 b/trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 index c5bbbe23c..a31c5a84d 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 @@ -1,4 +1,4 @@ -.TH "moEasyCoolSched" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moEasyCoolSched" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -61,7 +61,7 @@ Simple constructor. Definition at line 31 of file moEasyCoolSched.h. .SH "Member Function Documentation" .PP -.SS "bool moEasyCoolSched::operator() (double & __temp)\fC [inline]\fP" +.SS "bool moEasyCoolSched::operator() (double & __temp)\fC [inline, virtual]\fP" .PP Function which proceeds to the cooling. .PP @@ -78,6 +78,8 @@ if the new temperature (current temperature * ratio) is greater than the thresho .RE .PP +.PP +Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 44 of file moEasyCoolSched.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 index e321f7d78..216c52e83 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moFirstImprSelect" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -101,7 +101,7 @@ TRUE if the move does not improve the fitness. Definition at line 52 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. -.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" +.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -118,6 +118,8 @@ Procedure which saved the best move and fitness. .RE .PP +.PP +Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 76 of file moFirstImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 index c941eab2d..2540dd451 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moGenSolContinue" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -65,7 +65,7 @@ Simple constructor. Definition at line 30 of file moGenSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" +.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" .PP Function that activates the stop criterion. .PP @@ -82,6 +82,8 @@ TRUE or FALSE according to the current generation number. .RE .PP +.PP +Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 44 of file moGenSolContinue.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moHC.3 b/trunk/paradiseo-mo/docs/man/man3/moHC.3 index d0088155f..1d817d764 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHC.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHC.3 @@ -1,4 +1,4 @@ -.TH "moHC" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, eoEvalFunc< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" .br .RI "\fIFull constructor. \fP" .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, eoEvalFunc< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" .br .RI "\fILight constructor. \fP" .ti -1c @@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIComplete exploration of the neighborhood. \fP" .ti -1c -.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -63,7 +63,7 @@ Class which describes the algorithm for a hill climbing. Definition at line 26 of file moHC.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Full constructor. .PP @@ -85,7 +85,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP. .PP Definition at line 53 of file moHC.h. -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Light constructor. .PP @@ -103,7 +103,7 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM Definition at line 67 of file moHC.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" +.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP Function which launches the HC. .PP @@ -120,6 +120,8 @@ TRUE. .RE .PP +.PP +Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moHC.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 index e70a55425..64b83c7cc 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moHCMoveLoopExpl" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -87,7 +87,7 @@ All the boxes have to be specified. Definition at line 43 of file moHCMoveLoopExpl.h. .SH "Member Function Documentation" .PP -.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" +.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" .PP Procedure which launches the explorer. .PP @@ -101,6 +101,8 @@ The exploration starts from an old solution and provides a new solution. .RE .PP +.PP +Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 59 of file moHCMoveLoopExpl.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 index 99f7806fa..33ef6d607 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moImprBestFitAspirCrit" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 index 2f654811c..c68b251d9 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 @@ -1,4 +1,4 @@ -.TH "moItRandNextMove" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 index 1db8c1be2..0237d254f 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 @@ -1,4 +1,4 @@ -.TH "moLSCheckPoint" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ 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 @@ -18,7 +20,7 @@ moLSCheckPoint \- Class which allows a checkpointing system. .br .RI "\fIFunction which launches the checkpointing. \fP" .ti -1c -.RI "void \fBadd\fP (eoBF< const M &, const typename M::EOType &, void > &__f)" +.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)" .br .RI "\fIProcedure which add a new function to the function vector. \fP" .in -1c @@ -26,7 +28,7 @@ moLSCheckPoint \- Class which allows a checkpointing system. .in +1c .ti -1c -.RI "std::vector< eoBF< const M &, const typename M::EOType &, void > * > \fBfunc\fP" +.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunc\fP" .br .RI "\fIvector of function \fP" .in -1c @@ -59,7 +61,7 @@ Each saved function is used on the current move and the current solution. Definition at line 34 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::func. -.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" +.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" .PP Procedure which add a new function to the function vector. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moMove.3 b/trunk/paradiseo-mo/docs/man/man3/moMove.3 index 323f284a9..41ac67dc7 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMove.3 @@ -1,4 +1,4 @@ -.TH "moMove" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moMove \- Definition of a move. .PP \fC#include \fP .PP +Inherits \fBeoUF< EOT &, void >\fP. +.PP .SS "Public Types" .in +1c diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 index 379b9ba61..2b0bde497 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveExpl" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moMoveExpl \- Description of a move (\fBmoMove\fP) explorer. .PP \fC#include \fP .PP +Inherits \fBeoBF< const M::EOType &, M::EOType &, void >\fP. +.PP Inherited by \fBmoMoveLoopExpl< M >\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 index 23d4f75ac..f3185451c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 @@ -1,4 +1,4 @@ -.TH "moMoveIncrEval" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ 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 diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 index 295524785..59a19f5cf 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 @@ -1,4 +1,4 @@ -.TH "moMoveInit" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ 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 diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 index 44e39abcb..eb1908a8a 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveLoopExpl" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 index 1debc2dc1..568b14c14 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 @@ -1,4 +1,4 @@ -.TH "moMoveSelect" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moMoveSelect \- Class that describes a move selector (\fBmoMove\fP). .PP \fC#include \fP .PP +Inherits \fBeoBF< M &, M::EOType::Fitness &, void >\fP. +.PP Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .PP .SS "Public Types" diff --git a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 index a1d355465..b3d0b7c37 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 @@ -1,4 +1,4 @@ -.TH "moNextMove" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ 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" diff --git a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 index a514273a8..f0c8ab561 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moNoAspirCrit" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 index 276dc0b09..f76568465 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moRandImprSelect" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -106,7 +106,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 56 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. -.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" +.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" .PP The move selection. .PP @@ -125,6 +125,8 @@ One the saved move is randomly chosen. .RE .PP +.PP +Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 77 of file moRandImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 index d688fb844..1e08a422c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 @@ -1,4 +1,4 @@ -.TH "moRandMove" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moRandMove \- Random move generator. .PP \fC#include \fP .PP +Inherits \fBeoUF< M &, void >\fP. +.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSA.3 b/trunk/paradiseo-mo/docs/man/man3/moSA.3 index d671a323b..c44f363d7 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSA.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSA.3 @@ -1,4 +1,4 @@ -.TH "moSA" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolSched\fP &__cool_sched, eoEvalFunc< \fBEOT\fP > &__full_eval)" +.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolSched\fP &__cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" .br .RI "\fISA constructor. \fP" .ti -1c @@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIThe cooling schedule. \fP" .ti -1c -.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm. Definition at line 32 of file moSA.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolSched\fP & __cool_sched, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolSched\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP SA constructor. .PP @@ -101,7 +101,7 @@ All the boxes used by a SA need to be given. Definition at line 60 of file moSA.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" +.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP function that launches the SA algorithm. .PP @@ -118,6 +118,8 @@ TRUE. .RE .PP +.PP +Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moSA.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 index 3ce825039..dfeadddd6 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSolContinue" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ 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 \fBmoGenSolContinue< EOT >\fP. .PP .SS "Public Member Functions" @@ -26,7 +28,7 @@ Inherited by \fBmoGenSolContinue< EOT >\fP. .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 (eoUF). +It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). .PP Definition at line 22 of file moSolContinue.h. .SH "Member Function Documentation" diff --git a/trunk/paradiseo-mo/docs/man/man3/moTS.3 b/trunk/paradiseo-mo/docs/man/man3/moTS.3 index 3cb362a84..726cedc54 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTS.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTS.3 @@ -1,4 +1,4 @@ -.TH "moTS" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP" .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor with less parameters. \fP" .ti -1c @@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIStop criterion. \fP" .ti -1c -.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIFull evaluation function. \fP" .in -1c @@ -79,7 +79,7 @@ Generic algorithm that describes a tabu search. Definition at line 30 of file moTS.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor of a \fBmoTS\fP specifying all the boxes. .PP @@ -107,7 +107,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. Definition at line 59 of file moTS.h. .PP References moTS< M >::first_time, and moTS< M >::mutex. -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor with less parameters. .PP @@ -129,7 +129,7 @@ Definition at line 81 of file moTS.h. References moTS< M >::first_time, and moTS< M >::mutex. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" +.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP Function which launchs the Tabu Search. .PP @@ -146,6 +146,8 @@ TRUE. .RE .PP +.PP +Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 104 of file moTS.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 index 860cf2ba7..456766151 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moTSMoveLoopExpl" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -99,7 +99,7 @@ Definition at line 49 of file moTSMoveLoopExpl.h. References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list. .SH "Member Function Documentation" .PP -.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" +.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" .PP Procedure which lauches the exploration. .PP @@ -113,6 +113,8 @@ The exploration continues while the chosen move is not in the tabu list or the a .RE .PP +.PP +Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 69 of file moTSMoveLoopExpl.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 index d8338e3e5..96a8cf631 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 @@ -1,4 +1,4 @@ -.TH "moTabuList" 3 "20 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP. +.PP .SS "Public Types" .in +1c diff --git a/trunk/paradiseo-mo/docs/mo.doxytag b/trunk/paradiseo-mo/docs/mo.doxytag index f7c6666c2..599248289 100644 --- a/trunk/paradiseo-mo/docs/mo.doxytag +++ b/trunk/paradiseo-mo/docs/mo.doxytag @@ -17,11 +17,13 @@ moAlgo classmo_algo.html EOT + eoMonOp< EOT > moAspirCrit classmo_aspir_crit.html M + eoBF virtual void init @@ -88,6 +90,7 @@ moCoolSched classmo_cool_sched.html + eoUF< double &, bool > moEasyCoolSched @@ -442,6 +445,7 @@ moLSCheckPoint classmo_l_s_check_point.html M + eoBF void operator() @@ -468,6 +472,7 @@ moMove classmo_move.html EOT + eoUF< EOT &, void > EOT EOType @@ -480,16 +485,19 @@ moMoveExpl classmo_move_expl.html M + eoBF< const M::EOType &, M::EOType &, void > moMoveIncrEval classmo_move_incr_eval.html M + eoBF moMoveInit classmo_move_init.html M + eoBF moMoveLoopExpl @@ -501,6 +509,7 @@ moMoveSelect classmo_move_select.html M + eoBF< M &, M::EOType::Fitness &, void > M::EOType::Fitness Fitness @@ -527,6 +536,7 @@ moNextMove classmo_next_move.html M + eoBF moNoAspirCrit @@ -607,6 +617,7 @@ moRandMove classmo_rand_move.html M + eoUF< M &, void > moSA @@ -688,6 +699,7 @@ moSolContinue classmo_sol_continue.html EOT + eoUF< const EOT &, bool > virtual void init @@ -700,6 +712,7 @@ moTabuList classmo_tabu_list.html M + eoBF M::EOType EOT