diff --git a/trunk/paradiseo-mo/docs/Doxyfile b/trunk/paradiseo-mo/docs/Doxyfile index e6b9c50e7..d5074bb99 100644 --- a/trunk/paradiseo-mo/docs/Doxyfile +++ b/trunk/paradiseo-mo/docs/Doxyfile @@ -198,8 +198,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -#TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html -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 3d9d4e265..4f986ce67 100644 --- a/trunk/paradiseo-mo/docs/html/annotated.html +++ b/trunk/paradiseo-mo/docs/html/annotated.html @@ -61,7 +61,7 @@ moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/class_empty_selection.html b/trunk/paradiseo-mo/docs/html/class_empty_selection.html index af2b15a8a..4d0b4ac35 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classes.html b/trunk/paradiseo-mo/docs/html/classes.html index 972d1fa2e..2cca984d0 100644 --- a/trunk/paradiseo-mo/docs/html/classes.html +++ b/trunk/paradiseo-mo/docs/html/classes.html @@ -45,7 +45,7 @@
  G  
moMoveInit   moTabuList   moGenSolContinue   moMoveLoopExpl   moTS   
  H  
moMoveSelect   moTSMoveLoopExpl   

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

-

Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_algo.html b/trunk/paradiseo-mo/docs/html/classmo_algo.html index 1fd08e748..162435bcf 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html index d6ce19778..9d44d1f84 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html index 79e0f44b6..0d88cf387 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 b959606a7..e6cefe1bf 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html index 791770d8e..7cf97d2e4 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html @@ -33,10 +33,13 @@
    + - + -
    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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html index 6b62afb7d..67b8e7193 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. @@ -52,7 +54,7 @@ void  - + @@ -109,7 +111,7 @@ template<class M>

    -Function that indicates if the current move has not improved the fitness. +Function that indicates if the current move has not improved the fitness.

    If the given fitness enables an improvment, the move (moMove) and the fitness linked to this move are saved.

    Parameters:
    @@ -149,7 +151,7 @@ template<class M>
    - +
     Procedure which initialise the exploration.
    bool update (const M &__move, const Fitness &__fit)
     Function that indicates if the current move has not improved the fitness.
     Function that indicates if the current move has not improved the fitness.
    void operator() (M &__move, Fitness &__fit) throw (EmptySelection)
     Procedure which saved the best move and fitness.
    ) 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 5b868e9d7..e803a39a4 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.png and b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html index 1002c3d81..4b5b092f5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moCoolingSchedule Class Reference

    This class gives the description of a cooling schedule. +

    moCoolingSchedule Class Reference

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

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

    Inheritance diagram for moCoolingSchedule:

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

    Definition at line 22 of file moCoolingSchedule.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.png b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.png index 078143b2d..f60c26373 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.png and b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html index cdc83ab6f..0a0397114 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html @@ -30,10 +30,10 @@

    moExponentialCoolingSchedule Member List

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

    - + -
    moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
    operator()(double &__temp)moExponentialCoolingSchedule [inline]
    operator()(double &__temp)moExponentialCoolingSchedule [inline, virtual]
    ratiomoExponentialCoolingSchedule [private]
    thresholdmoExponentialCoolingSchedule [private]
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html index 396bd86aa..4664ffb80 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html @@ -36,7 +36,9 @@

    Inheritance diagram for moExponentialCoolingSchedule:

    -moCoolingSchedule +moCoolingSchedule +eoUF< double &, bool > +eoFunctorBase List of all members. @@ -46,7 +48,7 @@ - + @@ -115,14 +117,14 @@ Definition at line double &  - +
     Simple constructor.
    bool operator() (double &__temp)
     Function which proceeds to the cooling.
     Function which proceeds to the cooling.

    Private Attributes

    double threshold
    __temp  )  [inline] [inline, virtual]

    -Function which proceeds to the cooling. +Function which proceeds to the cooling.

    It decreases the temperature and indicates if it is greater than the threshold.

    Parameters:
    @@ -132,6 +134,8 @@ It decreases 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 41 of file moExponentialCoolingSchedule.h.

    @@ -140,7 +144,7 @@ References moExponentialCoolingSchedule.h -

    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png index f00c024dc..02c711475 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png and b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png differ 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 812e03fc2..8124b935c 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html index bb300fdf5..f05db8262 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. @@ -51,7 +53,7 @@ typedef M::EOType::Fitness  - + @@ -142,7 +144,7 @@ template<class M>

    -Function that indicates if the current move has not improved the fitness. +Function that indicates if the current move has not improved the fitness.

    If the given fitness enables an improvment, the move (moMove) should be applied to the current solution.

    Parameters:
    @@ -180,7 +182,7 @@ template<class M>
    - +
     Procedure which initialise the exploration.
    bool update (const M &__move, const typename M::EOType::Fitness &__fit)
     Function that indicates if the current move has not improved the fitness.
     Function that indicates if the current move has not improved the fitness.
    void operator() (M &__move, Fitness &__fit) throw (EmptySelection)
     Procedure which saved the best move and fitness.
    ) 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 c7295b050..a2a1234c8 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png and b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png differ 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 f185c60e5..7410abf53 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html index 4ba4f2a21..89934d275 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. @@ -46,7 +48,7 @@ - + @@ -115,14 +117,14 @@ template<class EOT> - +
     Simple constructor.
    bool operator() (const EOT &__sol)
     Function that activates the stop criterion.
     Function that activates the stop criterion.
    void init ()
     Procedure which allows to initialise the generation counter.
    const EOT &  __sol  )  [inline] [inline, virtual]

    -Function that activates the stop criterion. +Function that activates the stop criterion.

    Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations.

    Parameters:
    @@ -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.

    @@ -147,6 +151,7 @@ template<class EOT>

    void moGenSolContinue< EOT >::init ( + void   )  [inline, virtual] @@ -169,7 +174,7 @@ References moGenS

    The documentation for this class was generated from the following file:     -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 84c8334c7..b40e34991 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png and b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png differ 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 0f59ef021..e10bb80fb 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moHC< M > [inline, virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c.html b/trunk/paradiseo-mo/docs/html/classmo_h_c.html index 9d0da7ad1..ddef4b6f1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c.html @@ -36,20 +36,24 @@

    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)
     Function which launches the HC.
     Function which launches the HC.

    Private Types

    typedef M::EOType EOT
     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,14 +202,14 @@ template<class M> EOT &  __sol  )  - [inline] + [inline, virtual]

    -Function which launches the HC. +Function which launches the HC.

    The HC has to improve a current solution. As the moSA and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.

    Parameters:
    @@ -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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 1d7aa7716..6a4aadb1e 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_h_c.png and b/trunk/paradiseo-mo/docs/html/classmo_h_c.png differ 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 9bb528dd2..d522d354a 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline, virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html index 093bba6ec..0c2f6ec26 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 8c51e26c5..8c76fd46e 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html index d9c570122..73b7bde15 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html @@ -32,10 +32,14 @@ best_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 Thu Apr 19 15:16:09 2007 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 Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html index 1b36d86d7..f0c9db3eb 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. @@ -56,7 +58,7 @@ void  - + @@ -106,7 +108,7 @@ template<class M>

    -Function that indicates if the fit is better that the already saved fit. +Function that indicates if the fit is better that the already saved fit.

    The first time, the function only saved the current move and fitness.

    Parameters:
    @@ -125,7 +127,7 @@ References moImprBestFitAspirCrit.h -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 cfb21ada8..76e0473f0 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html index 8f5c45f84..8a3289685 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html @@ -35,7 +35,7 @@
    -
     Initialisation procedure.
    bool operator() (const M &__move, const Fitness &__fit)
     Function that indicates if the fit is better that the already saved fit.
     Function that indicates if the fit is better that the already saved fit.

    Private Attributes

    Fitness best_fit
    num_itermoItRandNextMove< M > [private]
    operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
    rand_movemoItRandNextMove< M > [private]
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html index 9c15af121..5d1355565 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. @@ -107,7 +109,7 @@ template<class M>

    The constructor.

    -Parameters only for initialising the attributes.

    +Parameters only for initialising the attributes.

    Parameters:
    @@ -167,7 +169,7 @@ References moItR

    The documentation for this class was generated from the following file:     -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 574beda2c..a90754a6b 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png and b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png differ 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 87670ad9c..90189ca3c 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.

    __rand_move the random move generator.
    + -
    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 Thu Apr 19 15:16:09 2007 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 Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html index 58c18ac26..67be9244d 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. - - + + @@ -89,7 +95,7 @@ template<class M>

    -Function which launches the checkpointing. +Function which launches the checkpointing.

    Each saved function is used on the current move and the current solution.

    Parameters:
    @@ -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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html index a4fe87de1..54719b331 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html @@ -30,10 +30,10 @@

    moLinearCoolingSchedule Member List

    This is the complete list of members for moLinearCoolingSchedule, 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)
     Function which launches the checkpointing.
    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]
    - + -
    moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
    operator()(double &__temp)moLinearCoolingSchedule [inline]
    operator()(double &__temp)moLinearCoolingSchedule [inline, virtual]
    quantitymoLinearCoolingSchedule [private]
    thresholdmoLinearCoolingSchedule [private]
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html index 867554352..5af7e479e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html @@ -36,7 +36,9 @@

    Inheritance diagram for moLinearCoolingSchedule:

    -moCoolingSchedule +moCoolingSchedule +eoUF< double &, bool > +eoFunctorBase List of all members. @@ -46,7 +48,7 @@ - + @@ -115,14 +117,14 @@ Definition at line double &  - +
     Simple constructor.
    bool operator() (double &__temp)
     Function which proceeds to the cooling.
     Function which proceeds to the cooling.

    Private Attributes

    double threshold
    __temp  )  [inline] [inline, virtual]

    -Function which proceeds to the cooling. +Function which proceeds to the cooling.

    It decreases the temperature and indicates if it is greater than the threshold.

    Parameters:
    @@ -132,6 +134,8 @@ It decreases the temperature and indicates if it is greater than the threshold.<
    Returns:
    if the new temperature (current temperature - quantity) is greater than the threshold.
    +

    +Implements eoUF< double &, bool >.

    Definition at line 41 of file moLinearCoolingSchedule.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png index 3821b70aa..51f125753 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png and b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_move-members.html index 1904ddd8c..30a72036d 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.

    -
    EOType typedefmoMove< EOT >

    Generated on Thu Apr 19 15:16:09 2007 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 Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move.html b/trunk/paradiseo-mo/docs/html/classmo_move.html index 7f2fa1741..d8a9845f8 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html index 31944ca09..755d207e3 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 1b27438a7..66c1602bb 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_move_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_move_expl.png differ 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 ebe225de8..70fec459a 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_init.html b/trunk/paradiseo-mo/docs/html/classmo_move_init.html index ff8c41798..5d9c6ea65 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html index 772bfd140..27b008acd 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 3fc99c0f6..82d725cec 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.png differ 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 95964a41e..5444fc453 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select.html b/trunk/paradiseo-mo/docs/html/classmo_move_select.html index a0f27df4b..a45d719d1 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. @@ -53,7 +55,7 @@ typedef M::EOType::Fitness  - +
     Procedure which initialises all that the move selector needs including the initial fitness.
    virtual bool update (const M &__move, const Fitness &__fit)=0
     Function which updates the best solutions.
     Function which updates the best solutions.

    Detailed Description

    template<class M>
    @@ -126,7 +128,7 @@ template<class M>

    -Function which updates the best solutions. +Function which updates the best solutions.

    Parameters:
    @@ -142,7 +144,7 @@ Implemented in moMoveSelect.h -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 0781eef97..10bda515a 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_move_select.png and b/trunk/paradiseo-mo/docs/html/classmo_move_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_next_move.html index bae4e229a..7e27c95b3 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 ee1f90bbc..6bc1397f2 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_next_move.png and b/trunk/paradiseo-mo/docs/html/classmo_next_move.png differ 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 16410d523..803fbe4e5 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 Thu Apr 19 15:16:09 2007 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 Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html index bf887053e..16e13bd91 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html @@ -36,14 +36,16 @@

    Inheritance diagram for moNoAspirCrit< M >:

    -moAspirCrit< M > +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. - + @@ -87,7 +89,7 @@ template<class M>

    -Function which describes the aspiration criterion behaviour. +Function which describes the aspiration criterion behaviour.

    Does nothing.

    Parameters:
    @@ -111,6 +113,7 @@ template<class M>
    + @@ -131,7 +134,7 @@ Definition at line 4

    The documentation for this class was generated from the following file:     -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 f8412d8ed..ce623c0e3 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html index 2c45a69fd..7fbfd6070 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html @@ -30,13 +30,16 @@

    moRandImprSelect< M > Member List

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


    Private Member Functions

    bool operator() (const M &__move, const typename M::EOType::Fitness &__sol)
     Function which describes the aspiration criterion behaviour.
     Function which describes the aspiration criterion behaviour.
    void init ()
     Procedure which initialises all that needs a moNoAspirCrit.
    void moNoAspirCrit< M >::init (void   )  [inline, private, virtual]
    + - + -
    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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html index f52a9e4f1..0119f6440 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. @@ -51,7 +53,7 @@ typedef M::EOType::Fitness  - + @@ -144,7 +146,7 @@ template<class M>

    -Function that updates the fitness and move vectors. +Function that updates the fitness and move vectors.

    if a move give a better fitness than the initial fitness, it is saved and the fitness too.

    Parameters:
    @@ -184,7 +186,7 @@ template<class M>
    - +
     Procedure which all that needs a moRandImprSelect.
    bool update (const M &__move, const Fitness &__fit)
     Function that updates the fitness and move vectors.
     Function that updates the fitness and move vectors.
    void operator() (M &__move, Fitness &__fit) throw (EmptySelection)
     The move selection.
    ) throw (EmptySelection) [inline] throw (EmptySelection) [inline, virtual]
    @@ -206,15 +208,17 @@ One the saved move is randomly chosen.

    +

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

    Definition at line 77 of file moRandImprSelect.h.

    -References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.

    The documentation for this class was generated from the following file: -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 6931c3dfd..b935a8e2f 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.png and b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html index fe79979b5..0001d3ce0 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html index 1ce5da82a..b8cb492e0 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, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline] move_randmoSA< M > [private] - operator()(EOT &__sol)moSA< M > [inline] -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moSA< M > [inline, virtual] +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.html b/trunk/paradiseo-mo/docs/html/classmo_s_a.html index 90f261313..df81fad13 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, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)
     moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__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,15 +197,17 @@ As a moTS or a
    Returns:
    TRUE.
    +

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

    Definition at line 82 of file moSA.h.

    -References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand. +References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform().

    The documentation for this class was generated from the following file: -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 59c20157a..e14866c80 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_s_a.png and b/trunk/paradiseo-mo/docs/html/classmo_s_a.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html index 94d730aca..f0601b8a2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html @@ -32,13 +32,18 @@ add(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual] currentSizemoSimpleMoveTabuList< M > [private] EOT typedefmoSimpleMoveTabuList< M > + functor_category()eoBF< A1, A2, R > [static] init()moSimpleMoveTabuList< M > [inline, virtual] maxSizemoSimpleMoveTabuList< M > [private] moSimpleMoveTabuList(unsigned __size)moSimpleMoveTabuList< M > [inline] operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline] + moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + removeMove(const M &__move)moSimpleMoveTabuList< M > [inline, private] tabuListmoSimpleMoveTabuList< M > [private] update()moSimpleMoveTabuList< M > [inline, virtual] -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html index edfc7f292..2b8d467c4 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html @@ -36,7 +36,9 @@

    Inheritance diagram for moSimpleMoveTabuList< M >:

    -moTabuList< M > +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -52,7 +54,7 @@ typedef M::EOType  - + @@ -62,6 +64,10 @@ typedef M::EOType  + + + + @@ -113,7 +119,7 @@ template<class M>

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

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

    Private Member Functions

    void removeMove (const M &__move)
     Procedure that removes a given move from the tabu list (if it is into, else do nothing).

    Private Attributes

    unsigned maxSize
    @@ -126,7 +132,7 @@ Function that indicates if, in a given state, the _move is tabu or not.

    Definition at line 46 of file moSimpleMoveTabuList.h.

    -References moSimpleMoveTabuList< M >::tabuList. +References moSimpleMoveTabuList< M >::tabuList.

    @@ -172,7 +178,7 @@ Implements 60 of file moSimpleMoveTabuList.h.

    -References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, and moSimpleMoveTabuList< M >::tabuList. +References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, moSimpleMoveTabuList< M >::removeMove(), and moSimpleMoveTabuList< M >::tabuList.

    @@ -199,7 +205,7 @@ Generally, a counter associated to each saved move is decreased by one.

    Implements moTabuList< M >.

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

    @@ -226,12 +232,47 @@ Can be useful if the data structure needs to be allocated before being used.

    Implements moTabuList< M >.

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

    + +

    +
    +
    +template<class M>
    +
    + + + + + + + + +
    void moSimpleMoveTabuList< M >::removeMove (const M &  __move  )  [inline, private]
    + +
    + +

    +Procedure that removes a given move from the tabu list (if it is into, else do nothing). +

    +

    Parameters:
    + + +
    __move A given moMove.
    +
    + +

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

    +References moSimpleMoveTabuList< M >::tabuList. +

    +Referenced by moSimpleMoveTabuList< M >::add().

    The documentation for this class was generated from the following file: -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png index e98058587..f4a038c83 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png and b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html index 79eb23ed9..d52a1656c 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html @@ -32,13 +32,18 @@ add(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual] currentSizemoSimpleSolutionTabuList< M > [private] EOT typedefmoSimpleSolutionTabuList< M > + functor_category()eoBF< A1, A2, R > [static] init()moSimpleSolutionTabuList< M > [inline, virtual] maxSizemoSimpleSolutionTabuList< M > [private] moSimpleSolutionTabuList(unsigned __size)moSimpleSolutionTabuList< M > [inline] operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline] + moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + removeSolution(const EOT &__sol)moSimpleSolutionTabuList< M > [inline, private] tabuListmoSimpleSolutionTabuList< M > [private] update()moSimpleSolutionTabuList< M > [inline, virtual] -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html index e6a1d1062..8fedac5fd 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html @@ -36,7 +36,9 @@

    Inheritance diagram for moSimpleSolutionTabuList< M >:

    -moTabuList< M > +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -51,7 +53,7 @@ typedef M::EOType  - + @@ -61,6 +63,10 @@ typedef M::EOType  + + + + @@ -114,7 +120,7 @@ Constructor.

    Definition at line 34 of file moSimpleSolutionTabuList.h.

    -References moSimpleSolutionTabuList< M >::currentSize. +References moSimpleSolutionTabuList< M >::currentSize.

    Member Function Documentation

    @@ -146,7 +152,7 @@ template<class M>

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

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

    Private Member Functions

    void removeSolution (const EOT &__sol)
     Procedure that removes a given solution from the tabu list (if it is into, else does nothing).

    Private Attributes

    unsigned maxSize
    @@ -159,7 +165,7 @@ Function that indicates if, in a given state, the _move is tabu or not.

    Definition at line 45 of file moSimpleSolutionTabuList.h.

    -References moSimpleSolutionTabuList< M >::tabuList. +References moSimpleSolutionTabuList< M >::tabuList.

    @@ -205,7 +211,7 @@ Implements 64 of file moSimpleSolutionTabuList.h.

    -References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, and moSimpleSolutionTabuList< M >::tabuList. +References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, moSimpleSolutionTabuList< M >::removeSolution(), and moSimpleSolutionTabuList< M >::tabuList.

    @@ -232,7 +238,7 @@ Generally, a counter associated to each saved move is decreased by one.

    Implements moTabuList< M >.

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

    @@ -259,12 +265,47 @@ Can be useful if the data structure needs to be allocated before being used.

    Implements moTabuList< M >.

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

    + +

    +
    +
    +template<class M>
    +
    + + + + + + + + +
    void moSimpleSolutionTabuList< M >::removeSolution (const EOT &  __sol  )  [inline, private]
    + +
    + +

    +Procedure that removes a given solution from the tabu list (if it is into, else does nothing). +

    +

    Parameters:
    + + +
    __sol A given solution.
    +
    + +

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

    +References moSimpleSolutionTabuList< M >::tabuList. +

    +Referenced by moSimpleSolutionTabuList< M >::add().

    The documentation for this class was generated from the following file: -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png index f08f987a9..38d26e329 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png and b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html index abfad4fa9..9ec02a172 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html index 2de742e30..fc3540ce8 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 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 ff1f2edde..345d1b66d 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png and b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png differ 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 74f277cba..fe4d2619d 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + operator()(EOT &__sol)moTS< M > [inline, virtual] +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s.html b/trunk/paradiseo-mo/docs/html/classmo_t_s.html index 776ae6137..4f4d4d37d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s.html @@ -36,20 +36,24 @@

    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,14 +240,14 @@ 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)
     Function which launchs the Tabu Search.
     Function which launchs the Tabu Search.

    Private Types

    typedef M::EOType EOT
     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]

    -Function which launchs the Tabu Search. +Function which launchs the Tabu Search.

    Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.

    Parameters:
    @@ -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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 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 5d6c7b304..8932f0e2f 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_t_s.png and b/trunk/paradiseo-mo/docs/html/classmo_t_s.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html index b4b27b548..33b31b7bb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html @@ -37,9 +37,9 @@ move_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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html index 95cf11620..517fee31c 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 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 c9608b2de..717f30a17 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png differ 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 d131657cd..0cf2f44dd 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html index 2f25e5c22..a6b6a975d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html @@ -28,7 +28,7 @@
  • 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> @@ -36,8 +36,10 @@

    Inheritance diagram for moTabuList< M >:

    -moSimpleMoveTabuList< M > -moSimpleSolutionTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > List of all members. @@ -162,7 +164,7 @@ Implemented in moTabuList.h -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png index 7e8228b7f..b4c545581 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png and b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/files.html b/trunk/paradiseo-mo/docs/html/files.html index 381cca56a..dde27cf5a 100644 --- a/trunk/paradiseo-mo/docs/html/files.html +++ b/trunk/paradiseo-mo/docs/html/files.html @@ -55,7 +55,7 @@
    moTS.h [code]
    moTSMoveLoopExpl.h [code]
    -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions.html b/trunk/paradiseo-mo/docs/html/functions.html index 9eeb31096..7c2103ef6 100644 --- a/trunk/paradiseo-mo/docs/html/functions.html +++ b/trunk/paradiseo-mo/docs/html/functions.html @@ -231,6 +231,10 @@ Here is a list of all documented class members with links to the class documenta : moItRandNextMove< M >
  • ratio : moExponentialCoolingSchedule +
  • removeMove() +: moSimpleMoveTabuList< M > +
  • removeSolution() +: moSimpleSolutionTabuList< M >

    - t -

    • tabu_list @@ -260,7 +264,7 @@ Here is a list of all documented class members with links to the class documenta
    • vect_better_moves : moRandImprSelect< M >
    -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 326476ec2..ec66281e7 100644 --- a/trunk/paradiseo-mo/docs/html/functions_func.html +++ b/trunk/paradiseo-mo/docs/html/functions_func.html @@ -42,6 +42,7 @@
  • i
  • m
  • o
    • +
  • r
  • u
    • @@ -117,6 +118,12 @@ , moFirstImprSelect< M > , moExponentialCoolingSchedule +

    - r -

    - u -

    -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_type.html b/trunk/paradiseo-mo/docs/html/functions_type.html index a2573a45d..659e217cc 100644 --- a/trunk/paradiseo-mo/docs/html/functions_type.html +++ b/trunk/paradiseo-mo/docs/html/functions_type.html @@ -63,7 +63,7 @@ , moHC< M > , moFirstImprSelect< M > -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_vars.html b/trunk/paradiseo-mo/docs/html/functions_vars.html index 991d47e0a..e4f73f2de 100644 --- a/trunk/paradiseo-mo/docs/html/functions_vars.html +++ b/trunk/paradiseo-mo/docs/html/functions_vars.html @@ -160,7 +160,7 @@
  • vect_better_moves : moRandImprSelect< M > -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/hierarchy.html b/trunk/paradiseo-mo/docs/html/hierarchy.html index df61f5453..d4fd3981f 100644 --- a/trunk/paradiseo-mo/docs/html/hierarchy.html +++ b/trunk/paradiseo-mo/docs/html/hierarchy.html @@ -30,25 +30,30 @@

    PARADISEO-MO Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically: +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/index_8h-source.html b/trunk/paradiseo-mo/docs/html/index_8h-source.html index aa650f048..5e799eaa0 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 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 31698a63d..acfd00d3c 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +design +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_8h-source.html index 3f6e620e1..9ca42170f 100644 --- a/trunk/paradiseo-mo/docs/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_8h-source.html @@ -35,36 +35,39 @@ 00012 #ifndef __mo_h 00013 #define __mo_h 00014 -00015 #include "moAspirCrit.h" -00016 #include "moAlgo.h" +00015 #include "moAlgo.h" +00016 #include "moAspirCrit.h" 00017 #include "moBestImprSelect.h" -00018 #include "moCoolSched.h" -00019 #include "moEasyCoolSched.h" +00018 #include "moCoolingSchedule.h" +00019 #include "moExponentialCoolingSchedule.h" 00020 #include "moFirstImprSelect.h" 00021 #include "moGenSolContinue.h" 00022 #include "moHC.h" 00023 #include "moHCMoveLoopExpl.h" 00024 #include "moImprBestFitAspirCrit.h" 00025 #include "moItRandNextMove.h" -00026 #include "moLSCheckPoint.h" -00027 #include "moMoveExpl.h" -00028 #include "moMove.h" -00029 #include "moMoveIncrEval.h" -00030 #include "moMoveInit.h" -00031 #include "moMoveLoopExpl.h" -00032 #include "moMoveSelect.h" -00033 #include "moNextMove.h" -00034 #include "moNoAspirCrit.h" -00035 #include "moRandImprSelect.h" -00036 #include "moRandMove.h" -00037 #include "moSA.h" -00038 #include "moSolContinue.h" -00039 #include "moTabuList.h" -00040 #include "moTS.h" -00041 #include "moTSMoveLoopExpl.h" -00042 -00043 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +00026 #include "moLinearCoolingSchedule.h" +00027 #include "moLSCheckPoint.h" +00028 #include "moMoveExpl.h" +00029 #include "moMove.h" +00030 #include "moMoveIncrEval.h" +00031 #include "moMoveInit.h" +00032 #include "moMoveLoopExpl.h" +00033 #include "moMoveSelect.h" +00034 #include "moNextMove.h" +00035 #include "moNoAspirCrit.h" +00036 #include "moRandImprSelect.h" +00037 #include "moRandMove.h" +00038 #include "moSA.h" +00039 #include "moSimpleMoveTabuList.h" +00040 #include "moSimpleSolutionTabuList.h" +00041 #include "moSolContinue.h" +00042 #include "moTabuList.h" +00043 #include "moTS.h" +00044 #include "moTSMoveLoopExpl.h" +00045 +00046 #endif +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html index 6651e47a2..c8a3fc157 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html index d8504731a..b3b1cb582 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html index 995fafad2..5b27a1099 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html index e6732e15b..279591ef8 100644 --- a/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html @@ -38,13 +38,13 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 class moCoolingSchedule:public eoUF < double &, bool > +00022 class moCoolingSchedule:public eoUF < double &, bool > 00023 { 00024 00025 }; 00026 00027 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html index defe4f237..f78d4f350 100644 --- a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html @@ -60,7 +60,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html index a7b637e28..9a867300c 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html index 2e46db086..06e8ee739 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html index 4a85c6f7f..322f0da06 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html index 07297528c..7e90abafc 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html index 9f88fca73..6f6304005 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html index f54b45fe3..b094e288e 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html index f4d1eeba4..eedcc930f 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html index 7a0b84483..02a1bfe71 100644 --- a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html @@ -60,7 +60,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html index b6e4f058e..d7eaedaf3 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html index e5e92eb9c..36b985a6e 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html index bf1b4bf5b..d797ba859 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html index 9ef2b285a..1f17c308c 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html index 6292f7869..273932fd2 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html index 16c6a81c9..15ae61c8a 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html index a693e74d1..657fc0a55 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html index 5e51c2384..733fb7441 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html index ddf21bb47..c54817b3b 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 @@ -77,7 +77,7 @@ 00080 if (!vect_better_fit.empty ()) 00081 { 00082 -00083 unsigned n = rng.random (vect_better_fit.size ()); +00083 unsigned n = rng.random (vect_better_fit.size ()); 00084 00085 __move = vect_better_moves[n]; 00086 __fit = vect_better_fit[n]; @@ -96,7 +96,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html index 54232b174..3a50c9659 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html index 765e2ab0a..104a0b0cd 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 @@ -107,7 +107,7 @@ 00105 00106 Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness (); 00107 -00108 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) +00108 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) 00109 { 00110 00111 __sol.fitness (incr_eval (move, __sol)); @@ -147,7 +147,7 @@ 00151 }; 00152 00153 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html index 05923a3b2..69e61de1c 100644 --- a/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html @@ -74,41 +74,66 @@ 00059 void 00060 add (const M & __move, const EOT & __sol) 00061 { -00062 tabuList.push_back(__move); -00063 -00064 if(currentSize==maxSize) -00065 { -00066 tabuList.erase(tabuList.begin()); +00062 if(currentSize!=0) +00063 { +00064 // Useful in the case of a move has been kept thanks to the moAspirCrit. +00065 // In this case, the move can already be in the tabuList. +00066 removeMove(__move); 00067 } -00068 else -00069 { -00070 currentSize++; -00071 } -00072 } -00073 -00074 void -00075 update () -00076 { -00077 //nothing to do -00078 } -00079 -00080 void -00081 init () -00082 { -00083 //nothing to do -00084 } -00085 -00086 private: -00087 -00089 unsigned maxSize; -00090 -00092 unsigned currentSize; -00093 -00095 std::list<M> tabuList; -00096 }; -00097 -00098 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +00068 +00069 tabuList.push_back(__move); +00070 +00071 if(currentSize==maxSize) +00072 { +00073 tabuList.erase(tabuList.begin()); +00074 } +00075 else +00076 { +00077 currentSize++; +00078 } +00079 } +00080 +00081 void +00082 update () +00083 { +00084 //nothing to do +00085 } +00086 +00087 void +00088 init () +00089 { +00090 //nothing to do +00091 } +00092 +00093 private: +00094 +00096 +00099 void +00100 removeMove(const M & __move) +00101 { +00102 typename std::list<M>::iterator it; +00103 +00104 it=tabuList.begin(); +00105 while(it!=tabuList.end()&&(!((*it)==__move))) +00106 { +00107 it++; +00108 } +00109 +00110 if(it!=tabuList.end()) +00111 { +00112 tabuList.erase(it); +00113 } +00114 } +00115 +00117 unsigned maxSize; +00118 +00120 unsigned currentSize; +00121 +00123 std::list<M> tabuList; +00124 }; +00125 +00126 #endif +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html index 0dc4f5207..3328eeb7e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html @@ -80,42 +80,67 @@ 00067 EOT _sol=(EOT) _sol; 00068 00069 _move(_sol); -00070 -00071 tabuList.push_back(_sol); -00072 -00073 if(currentSize==maxSize) -00074 { -00075 tabuList.erase(tabuList.begin()); +00070 +00071 if(currentSize!=0) +00072 { +00073 // Useful in the case of a solution has been kept thanks to the moAspirCrit. +00074 // In this case, the solution can already be in the tabuList. +00075 removeSolution(_sol); 00076 } -00077 else -00078 { -00079 currentSize++; -00080 } -00081 } -00082 -00083 void -00084 update () -00085 { -00086 //nothing to do -00087 } -00088 -00089 void -00090 init () -00091 { -00092 //nothing to do -00093 } -00094 -00095 private: -00096 -00098 unsigned maxSize; -00099 -00101 unsigned currentSize; -00102 -00104 std::list<EOT> tabuList; -00105 }; -00106 -00107 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +00077 +00078 tabuList.push_back(_sol); +00079 +00080 if(currentSize==maxSize) +00081 { +00082 tabuList.erase(tabuList.begin()); +00083 } +00084 else +00085 { +00086 currentSize++; +00087 } +00088 } +00089 +00090 void +00091 update () +00092 { +00093 //nothing to do +00094 } +00095 +00096 void +00097 init () +00098 { +00099 //nothing to do +00100 } +00101 +00102 private: +00103 +00105 +00108 void +00109 removeSolution(const EOT & __sol) +00110 { +00111 typename std::list<EOT>::iterator it; +00112 +00113 it=tabuList.begin(); +00114 while(it!=tabuList.end()&&(!((*it)==__sol))) +00115 { +00116 it++; +00117 } +00118 +00119 if(it!=tabuList.end()) +00120 { +00121 tabuList.erase(it); +00122 } +00123 } +00124 +00126 unsigned maxSize; +00127 +00129 unsigned currentSize; +00130 +00132 std::list<EOT> tabuList; +00133 }; +00134 +00135 #endif +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html index f2442ad3d..6203edb9e 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html index 7310ef501..4c6b02bb3 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html index c874cc334..cd1a10fa4 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html index 9cb2c2ebe..585e039c6 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 { @@ -60,7 +60,7 @@ 00054 }; 00055 00056 #endif -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/search.idx b/trunk/paradiseo-mo/docs/html/search.idx index 788a702c0..b65f7a5f9 100644 Binary files a/trunk/paradiseo-mo/docs/html/search.idx and b/trunk/paradiseo-mo/docs/html/search.idx differ diff --git a/trunk/paradiseo-mo/docs/html/search.php b/trunk/paradiseo-mo/docs/html/search.php index e0ab16375..3aeb45527 100644 --- a/trunk/paradiseo-mo/docs/html/search.php +++ b/trunk/paradiseo-mo/docs/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
    Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by  +
    Generated on Fri Apr 20 11:23:38 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/tree.html b/trunk/paradiseo-mo/docs/html/tree.html index f8a0d5b87..8ff0fff2f 100644 --- a/trunk/paradiseo-mo/docs/html/tree.html +++ b/trunk/paradiseo-mo/docs/html/tree.html @@ -101,59 +101,101 @@

    o+Class Hierarchy

    |o*EmptySelection

    -

    |o*moAlgo< EOT >

    -

    |o+moAlgo< M::EOType >

    +

    |o+eoFunctorBase [external]

    -

    |o+moAspirCrit< M >

    - -

    |o+moCoolingSchedule

    - -

    |o*moLSCheckPoint< M >

    -

    |o*moMove< EOT >

    -

    |o+moMoveExpl< M >

    -
    -

    ||\+moMoveLoopExpl< M >

    - -

    |o*moMoveIncrEval< M >

    -

    |o*moMoveInit< M >

    -

    |o+moMoveSelect< M >

    - -

    |o+moNextMove< M >

    - -

    |o*moRandMove< M >

    -

    |o+moSolContinue< EOT >

    - -

    |\+moTabuList< 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..cf0664a23 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} @@ -24,7 +24,7 @@ void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_sele \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -58,7 +58,7 @@ Definition at line 22 of file mo\-Best\-Impr\-Select.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} -Function that indicates if the current move has not improved the fitness. +{\bf Function} that indicates if the current move has not improved the fitness. If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) and the fitness linked to this move are saved. @@ -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_cooling_schedule.eps b/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.eps index a1d0c2d59..099ff0bb2 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 101.523 +%%BoundingBox: 0 0 500 203.046 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.925 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 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 (moCoolingSchedule) cw +(eoUF< double &, bool >) cw +(eoFunctorBase) cw (moExponentialCoolingSchedule) cw (moLinearCoolingSchedule) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -188,11 +190,21 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moCoolingSchedule) 0.5 1 box + (eoUF< double &, bool >) 0.5 2 box + (eoFunctorBase) 0.5 3 box (moExponentialCoolingSchedule) 0 0 box (moLinearCoolingSchedule) 1 0 box % ----- relations ----- +solid +0 0.5 1 out +solid +1 0.5 2 in +solid +0 0.5 2 out +solid +1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex index d0d7d7b80..65e4977be 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex @@ -8,7 +8,7 @@ This class gives the description of a cooling schedule. Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_cooling_schedule} +\includegraphics[height=4cm]{classmo_cooling_schedule} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps index 9a4b2773b..92ecef949 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 203.046 +%%BoundingBox: 0 0 500 406.091 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.23125 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 (moExponentialCoolingSchedule) cw (moCoolingSchedule) cw +(eoUF< double &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moExponentialCoolingSchedule) 0 0 box (moCoolingSchedule) 0 1 box + (eoUF< double &, bool >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex index 3a4a742b0..3be041c23 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_exponential_cooling_schedule} +\includegraphics[height=4cm]{classmo_exponential_cooling_schedule} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -17,7 +17,7 @@ Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] {\bf mo\-Exponential\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool {\bf operator()} (double \&\_\-\_\-temp) -\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -58,10 +58,10 @@ Definition at line 31 of file mo\-Exponential\-Cooling\-Schedule.h. \subsection{Member Function Documentation} \index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}} \index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} -Function which proceeds to the cooling. +{\bf Function} which proceeds to the cooling. It decreases the temperature and indicates if it is greater than the threshold. @@ -74,6 +74,8 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} +Implements {\bf eo\-UF$<$ double \&, bool $>$}. + Definition at line 41 of file mo\-Exponential\-Cooling\-Schedule.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..a8db13d4d 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} @@ -23,7 +23,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_first_impr_select_64763ce virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item bool {\bf update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -73,7 +73,7 @@ References mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-S \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} -Function that indicates if the current move has not improved the fitness. +{\bf Function} that indicates if the current move has not improved the fitness. If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) should be applied to the current solution. @@ -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..d406d7b3a 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} @@ -17,7 +17,7 @@ Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] {\bf mo\-Gen\-Sol\-Continue} (unsigned \_\-\_\-max\-Num\-Gen) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) -\begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} that activates the stop criterion. \item\end{CompactList}\item void {\bf init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -62,10 +62,10 @@ 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. +{\bf Function} that activates the stop criterion. Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations. @@ -78,11 +78,13 @@ 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}} \index{init@{init}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init (void)\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} Procedure which allows to initialise the generation counter. 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..8263cc15c 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex @@ -8,18 +8,18 @@ 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} +\begin{CompactList}\small\item\em {\bf Function} which launches the HC. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item @@ -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,10 +89,10 @@ 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. +{\bf Function} which launches the HC. The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. @@ -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..d5cc8a9f1 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} @@ -27,7 +27,7 @@ void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9 \begin{CompactList}\small\item\em Initialisation procedure. \item\end{CompactList}\item bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Function that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em {\bf Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -56,7 +56,7 @@ Definition at line 22 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Impr\-Best\-Fit\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} -Function that indicates if the fit is better that the already saved fit. +{\bf Function} that indicates if the fit is better that the already saved fit. The first time, the function only saved the current move and fitness. 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..b3346119d 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} @@ -57,7 +57,7 @@ Definition at line 22 of file mo\-It\-Rand\-Next\-Move.h. The constructor. -Parameters only for initialising the attributes. +{\bf Parameters} only for initialising the attributes. \begin{Desc} \item[Parameters:] 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..c75dd117b 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) +\begin{CompactList}\small\item\em {\bf Function} which launches the checkpointing. \item\end{CompactList}\item +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} @@ -37,7 +43,7 @@ Definition at line 21 of file mo\-LSCheck\-Point.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} -Function which launches the checkpointing. +{\bf Function} which launches the checkpointing. Each saved function is used on the current move and the current solution. @@ -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_linear_cooling_schedule.eps b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.eps index 35d64af4d..3e62629a9 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 238.095 +%%BoundingBox: 0 0 500 476.19 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.1 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.05 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 (moLinearCoolingSchedule) cw (moCoolingSchedule) cw +(eoUF< double &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moLinearCoolingSchedule) 0 0 box (moCoolingSchedule) 0 1 box + (eoUF< double &, bool >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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_linear_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex index 8e525ba4b..b9a04a3a5 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_linear_cooling_schedule} +\includegraphics[height=4cm]{classmo_linear_cooling_schedule} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -17,7 +17,7 @@ Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] {\bf mo\-Linear\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool {\bf operator()} (double \&\_\-\_\-temp) -\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -58,10 +58,10 @@ Definition at line 31 of file mo\-Linear\-Cooling\-Schedule.h. \subsection{Member Function Documentation} \index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}} \index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} -Function which proceeds to the cooling. +{\bf Function} which proceeds to the cooling. It decreases the temperature and indicates if it is greater than the threshold. @@ -74,6 +74,8 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} +Implements {\bf eo\-UF$<$ double \&, bool $>$}. + Definition at line 41 of file mo\-Linear\-Cooling\-Schedule.h. References quantity, and threshold. 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..d0c3deb66 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} @@ -23,7 +23,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_move_select_8148ccc0e6fbd virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)=0 \begin{CompactList}\small\item\em Procedure which initialises all that the move selector needs including the initial fitness. \item\end{CompactList}\item virtual bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)=0 -\begin{CompactList}\small\item\em Function which updates the best solutions. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em {\bf Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} @@ -59,7 +59,7 @@ Implemented in {\bf mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{}{p.}{classmo_best \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} -Function which updates the best solutions. +{\bf Function} which updates the best solutions. \begin{Desc} \item[Parameters:] 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..1478e8bf4 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex @@ -8,14 +8,14 @@ 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} \begin{CompactItemize} \item bool {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) -\begin{CompactList}\small\item\em Function which describes the aspiration criterion behaviour. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item void {\bf init} () \begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize} @@ -37,7 +37,7 @@ Definition at line 21 of file mo\-No\-Aspir\-Crit.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-No\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} -Function which describes the aspiration criterion behaviour. +{\bf Function} which describes the aspiration criterion behaviour. Does nothing. @@ -52,7 +52,7 @@ Does nothing. Definition at line 32 of file mo\-No\-Aspir\-Crit.h.\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!init@{init}} \index{init@{init}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-No\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-No\-Aspir\-Crit}$<$ M $>$::init (void)\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. 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..c39674044 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} @@ -23,7 +23,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Function that updates the fitness and move vectors. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} that updates the fitness and move vectors. \item\end{CompactList}\item void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -77,7 +77,7 @@ References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$ \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} -Function that updates the fitness and move vectors. +{\bf Function} that updates the fitness and move vectors. if a move give a better fitness than the initial fitness, it is saved and the fitness too. @@ -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,9 +115,11 @@ 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. +References eo\-Rng::random(), mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves. The documentation for this class was generated from the following file:\begin{CompactItemize} \item 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 4d26fe051..1a0bc79f2 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\-Cooling\-Schedule} \&\_\-\_\-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\-Cooling\-Schedule} \&\_\-\_\-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\-Cooling\-Schedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} \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\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} +\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\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} 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,9 +99,11 @@ 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. +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, mo\-SA$<$ M $>$::move\_\-rand, and eo\-Rng::uniform(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps index 624cb75de..b0dcef476 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 213.904 +%%BoundingBox: 0 0 500 427.807 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.3375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.16875 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 (moSimpleMoveTabuList< M >) cw (moTabuList< M >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleMoveTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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_simple_move_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex index 53b07034f..36c5924ed 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex @@ -8,7 +8,7 @@ Class describing a move tabu list with a limited memory. Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_simple_move_tabu_list} +\includegraphics[height=4cm]{classmo_simple_move_tabu_list} \end{center} \end{figure} \subsection*{Public Types} @@ -24,13 +24,18 @@ typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item void {\bf update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item void {\bf init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Member Functions} +\begin{CompactItemize} +\item +void {\bf remove\-Move} (const M \&\_\-\_\-move) +\begin{CompactList}\small\item\em Procedure that removes a given move from the tabu list (if it is into, else do nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -60,7 +65,7 @@ Definition at line 22 of file mo\-Simple\-Move\-Tabu\-List.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} -Function that indicates if, in a given state, the \_\-move is tabu or not. +{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] @@ -93,7 +98,7 @@ Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d7 Definition at line 60 of file mo\-Simple\-Move\-Tabu\-List.h. -References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}} +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::remove\-Move(), and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}} \index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} @@ -104,7 +109,7 @@ Generally, a counter associated to each saved move is decreased by one. Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 75 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}} +Definition at line 82 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}} \index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} @@ -115,7 +120,25 @@ Can be useful if the data structure needs to be allocated before being used. Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 81 of file mo\-Simple\-Move\-Tabu\-List.h. +Definition at line 88 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!removeMove@{removeMove}} +\index{removeMove@{removeMove}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::remove\-Move (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} + + +Procedure that removes a given move from the tabu list (if it is into, else do nothing). + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \end{description} +\end{Desc} + + +Definition at line 100 of file mo\-Simple\-Move\-Tabu\-List.h. + +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List. + +Referenced by mo\-Simple\-Move\-Tabu\-List$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps index e46012fd0..06f8e8fc5 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 200 +%%BoundingBox: 0 0 500 400 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.25 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 (moSimpleSolutionTabuList< M >) cw (moTabuList< M >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleSolutionTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex index 1849bfca9..37404764d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex @@ -8,7 +8,7 @@ Class describing a solution tabu list with limited length. Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_simple_solution_tabu_list} +\includegraphics[height=4cm]{classmo_simple_solution_tabu_list} \end{center} \end{figure} \subsection*{Public Types} @@ -23,13 +23,18 @@ typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b {\bf mo\-Simple\-Solution\-Tabu\-List} (unsigned \_\-\_\-size) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item void {\bf update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item void {\bf init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Member Functions} +\begin{CompactItemize} +\item +void {\bf remove\-Solution} (const {\bf EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Procedure that removes a given solution from the tabu list (if it is into, else does nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -78,7 +83,7 @@ References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} -Function that indicates if, in a given state, the \_\-move is tabu or not. +{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] @@ -111,7 +116,7 @@ Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d7 Definition at line 64 of file mo\-Simple\-Solution\-Tabu\-List.h. -References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}} +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::remove\-Solution(), and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}} \index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} @@ -122,7 +127,7 @@ Generally, a counter associated to each saved move is decreased by one. Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 84 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}} +Definition at line 91 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}} \index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} @@ -133,7 +138,25 @@ Can be useful if the data structure needs to be allocated before being used. Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 90 of file mo\-Simple\-Solution\-Tabu\-List.h. +Definition at line 97 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!removeSolution@{removeSolution}} +\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::remove\-Solution (const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} + + +Procedure that removes a given solution from the tabu list (if it is into, else does nothing). + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-sol}]A given solution. \end{description} +\end{Desc} + + +Definition at line 109 of file mo\-Simple\-Solution\-Tabu\-List.h. + +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List. + +Referenced by mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item 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..b0e7000d8 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex @@ -8,18 +8,18 @@ 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} +\begin{CompactList}\small\item\em {\bf Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item @@ -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,10 +105,10 @@ 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. +{\bf Function} which launchs the Tabu Search. Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm. @@ -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.eps b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps index 63ca07c99..43c125a8a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 100 +%%BoundingBox: 0 0 500 200 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 5 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 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 (moTabuList< M >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw (moSimpleMoveTabuList< M >) cw (moSimpleSolutionTabuList< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -188,11 +190,21 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moTabuList< M >) 0.5 1 box + (eoBF< A1, A2, R >) 0.5 2 box + (eoFunctorBase) 0.5 3 box (moSimpleMoveTabuList< M >) 0 0 box (moSimpleSolutionTabuList< M >) 1 0 box % ----- relations ----- +solid +0 0.5 1 out +solid +1 0.5 2 in +solid +0 0.5 2 out +solid +1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex index e0ec56b3b..f7ba606a0 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex @@ -8,7 +8,7 @@ Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_tabu_list} +\includegraphics[height=4cm]{classmo_tabu_list} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-mo/docs/latex/doxygen.sty b/trunk/paradiseo-mo/docs/latex/doxygen.sty index d6b71a45a..6fe24b0b7 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 Thu Apr 19 15:16:09 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Apr 19 15:16:09 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Apr 20 11:23:37 2007 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/docs/latex/hierarchy.tex b/trunk/paradiseo-mo/docs/latex/hierarchy.tex index c8f8136cd..ae3028808 100644 --- a/trunk/paradiseo-mo/docs/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/docs/latex/hierarchy.tex @@ -1,25 +1,27 @@ \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\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} -\begin{CompactList} -\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{} -\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{} -\end{CompactList} \item \contentsline{section}{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}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} +\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} +\end{CompactList} +\end{CompactList} +\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}}{} @@ -28,26 +30,50 @@ 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\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} -\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} +\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{} +\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{} \end{CompactList} \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 13c6527e1..db4985d43 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 Thu Apr 19 15:16:09 2007}\\ +{\small Fri Apr 20 11:23:37 2007}\\ \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 425dad60c..ffe814407 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 index bd02fa2e6..27a2463a3 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "20 Apr 2007" "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 81caf0090..5d57129d0 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "20 Apr 2007" "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 42292f557..757e4df99 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)" .br -.RI "\fIFunction that indicates if the current move has not improved the fitness. \fP" +.RI "\fI\fBFunction\fP that indicates if the current move has not improved the fitness. \fP" .ti -1c .RI "void \fBoperator()\fP (M &__move, \fBFitness\fP &__fit) throw (EmptySelection)" .br @@ -65,7 +65,7 @@ Definition at line 22 of file moBestImprSelect.h. .PP .SS "template bool \fBmoBestImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" .PP -Function that indicates if the current move has not improved the fitness. +\fBFunction\fP that indicates if the current move has not improved the fitness. .PP If the given fitness enables an improvment, the move (\fBmoMove\fP) and the fitness linked to this move are saved. .PP @@ -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/moCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 index c9f040442..1b1fc4979 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moCoolingSchedule" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moCoolingSchedule \- This class gives the description of a cooling schedule. .PP \fC#include \fP .PP +Inherits \fBeoUF< double &, bool >\fP. +.PP Inherited by \fBmoExponentialCoolingSchedule\fP, and \fBmoLinearCoolingSchedule\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 index e11f01b41..1d1e59755 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moExponentialCoolingSchedule" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "bool \fBoperator()\fP (double &__temp)" .br -.RI "\fIFunction which proceeds to the cooling. \fP" +.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP" .in -1c .SS "Private Attributes" @@ -61,9 +61,9 @@ Simple constructor. Definition at line 31 of file moExponentialCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" +.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" .PP -Function which proceeds to the cooling. +\fBFunction\fP which proceeds to the cooling. .PP It decreases the temperature and indicates if it is greater than the threshold. .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 41 of file moExponentialCoolingSchedule.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 index 962cd5d28..967b96845 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &__move, const typename M::EOType::Fitness &__fit)" .br -.RI "\fIFunction that indicates if the current move has not improved the fitness. \fP" +.RI "\fI\fBFunction\fP that indicates if the current move has not improved the fitness. \fP" .ti -1c .RI "void \fBoperator()\fP (M &__move, \fBFitness\fP &__fit) throw (EmptySelection)" .br @@ -80,7 +80,7 @@ Definition at line 35 of file moFirstImprSelect.h. References moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. .SS "template bool \fBmoFirstImprSelect\fP< M >::update (const M & __move, const typename M::EOType::Fitness & __fit)\fC [inline]\fP" .PP -Function that indicates if the current move has not improved the fitness. +\fBFunction\fP that indicates if the current move has not improved the fitness. .PP If the given fitness enables an improvment, the move (\fBmoMove\fP) should be applied to the current solution. .PP @@ -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 a3cc4f1e0..b480a41bb 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,7 +22,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &__sol)" .br -.RI "\fIFunction that activates the stop criterion. \fP" +.RI "\fI\fBFunction\fP that activates the stop criterion. \fP" .ti -1c .RI "void \fBinit\fP ()" .br @@ -65,9 +65,9 @@ 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. +\fBFunction\fP that activates the stop criterion. .PP Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations. .PP @@ -82,11 +82,13 @@ 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 References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. -.SS "template void \fBmoGenSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" +.SS "template void \fBmoGenSolContinue\fP< EOT >::init (void)\fC [inline, virtual]\fP" .PP Procedure which allows to initialise the generation counter. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moHC.3 b/trunk/paradiseo-mo/docs/man/man3/moHC.3 index 400cbdef3..ec77ebb48 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_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 .RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)" .br -.RI "\fIFunction which launches the HC. \fP" +.RI "\fI\fBFunction\fP which launches the HC. \fP" .in -1c .SS "Private Types" @@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIComplete exploration of the neighborhood. \fP" .ti -1c -.RI "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,9 +103,9 @@ 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. +\fBFunction\fP which launches the HC. .PP The HC has to improve a current solution. As the \fBmoSA\fP and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. .PP @@ -120,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 93a825d79..3ab4f5643 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "20 Apr 2007" "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 1719c1ab1..cd482e932 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -34,7 +34,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const \fBFitness\fP &__fit)" .br -.RI "\fIFunction that indicates if the fit is better that the already saved fit. \fP" +.RI "\fI\fBFunction\fP that indicates if the fit is better that the already saved fit. \fP" .in -1c .SS "Private Attributes" @@ -61,7 +61,7 @@ Definition at line 22 of file moImprBestFitAspirCrit.h. .PP .SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline]\fP" .PP -Function that indicates if the fit is better that the already saved fit. +\fBFunction\fP that indicates if the fit is better that the already saved fit. .PP The first time, the function only saved the current move and fitness. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 index 99e4b23cd..ec2d24444 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -63,7 +63,7 @@ Definition at line 22 of file moItRandNextMove.h. .PP The constructor. .PP -Parameters only for initialising the attributes. +\fBParameters\fP only for initialising the attributes. .PP \fBParameters:\fP .RS 4 diff --git a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 index 29859a6da..23a8c5681 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,15 +10,17 @@ moLSCheckPoint \- Class which allows a checkpointing system. .PP \fC#include \fP .PP +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP. +.PP .SS "Public Member Functions" .in +1c .ti -1c .RI "void \fBoperator()\fP (const M &__move, const typename M::EOType &__sol)" .br -.RI "\fIFunction which launches the checkpointing. \fP" +.RI "\fI\fBFunction\fP 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 @@ -43,7 +45,7 @@ Definition at line 21 of file moLSCheckPoint.h. .PP .SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & __move, const typename M::EOType & __sol)\fC [inline]\fP" .PP -Function which launches the checkpointing. +\fBFunction\fP which launches the checkpointing. .PP Each saved function is used on the current move and the current solution. .PP @@ -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/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 index b15a3269c..e38303b65 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moLinearCoolingSchedule" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "bool \fBoperator()\fP (double &__temp)" .br -.RI "\fIFunction which proceeds to the cooling. \fP" +.RI "\fI\fBFunction\fP which proceeds to the cooling. \fP" .in -1c .SS "Private Attributes" @@ -61,9 +61,9 @@ Simple constructor. Definition at line 31 of file moLinearCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" +.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" .PP -Function which proceeds to the cooling. +\fBFunction\fP which proceeds to the cooling. .PP It decreases the temperature and indicates if it is greater than the threshold. .PP @@ -78,6 +78,8 @@ if the new temperature (current temperature - quantity) is greater than the thre .RE .PP +.PP +Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 41 of file moLinearCoolingSchedule.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moMove.3 b/trunk/paradiseo-mo/docs/man/man3/moMove.3 index babea4fea..970566676 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "20 Apr 2007" "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 27037b4c3..2660b9cb7 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "20 Apr 2007" "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 b3dc54091..82e8328c6 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "20 Apr 2007" "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 003697d59..b261b9942 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "20 Apr 2007" "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 e0e2e2f59..2c3b093de 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 index 871b8410c..c49c7525c 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "20 Apr 2007" "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" @@ -30,7 +32,7 @@ Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBm .ti -1c .RI "virtual bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)=0" .br -.RI "\fIFunction which updates the best solutions. \fP" +.RI "\fI\fBFunction\fP which updates the best solutions. \fP" .in -1c .SH "Detailed Description" .PP @@ -59,7 +61,7 @@ In order to know the fitness of the solution, for which the neighborhood will be Implemented in \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .SS "template virtual bool \fBmoMoveSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [pure virtual]\fP" .PP -Function which updates the best solutions. +\fBFunction\fP which updates the best solutions. .PP \fBParameters:\fP .RS 4 diff --git a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 index aa303f013..949c2b840 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "20 Apr 2007" "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 aded95899..ce4fd890f 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -18,7 +18,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const typename M::EOType::Fitness &__sol)" .br -.RI "\fIFunction which describes the aspiration criterion behaviour. \fP" +.RI "\fI\fBFunction\fP which describes the aspiration criterion behaviour. \fP" .ti -1c .RI "void \fBinit\fP ()" .br @@ -37,7 +37,7 @@ Definition at line 21 of file moNoAspirCrit.h. .PP .SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & __move, const typename M::EOType::Fitness & __sol)\fC [inline, private]\fP" .PP -Function which describes the aspiration criterion behaviour. +\fBFunction\fP which describes the aspiration criterion behaviour. .PP Does nothing. .PP @@ -56,7 +56,7 @@ FALSE. .PP Definition at line 32 of file moNoAspirCrit.h. -.SS "template void \fBmoNoAspirCrit\fP< M >::init ()\fC [inline, private, virtual]\fP" +.SS "template void \fBmoNoAspirCrit\fP< M >::init (void)\fC [inline, private, virtual]\fP" .PP Procedure which initialises all that needs a \fBmoNoAspirCrit\fP. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 index f2f4d58ea..83d93578f 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &__move, const \fBFitness\fP &__fit)" .br -.RI "\fIFunction that updates the fitness and move vectors. \fP" +.RI "\fI\fBFunction\fP that updates the fitness and move vectors. \fP" .ti -1c .RI "void \fBoperator()\fP (M &__move, \fBFitness\fP &__fit) throw (EmptySelection)" .br @@ -83,7 +83,7 @@ Definition at line 40 of file moRandImprSelect.h. References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SS "template bool \fBmoRandImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" .PP -Function that updates the fitness and move vectors. +\fBFunction\fP that updates the fitness and move vectors. .PP if a move give a better fitness than the initial fitness, it is saved and the fitness too. .PP @@ -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,10 +125,12 @@ 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 -References moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 index 9c0e9cf19..5dd8ff7c7 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "20 Apr 2007" "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 6994caeb0..5dcdcce28 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "20 Apr 2007" "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, \fBmoCoolingSchedule\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, \fBmoCoolingSchedule\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, \fBmoCoolingSchedule\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, \fBmoCoolingSchedule\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,10 +118,12 @@ TRUE. .RE .PP +.PP +Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moSA.h. .PP -References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, and moSA< M >::move_rand. +References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform(). .SH "Author" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 index 807b514e1..dc65b1219 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleMoveTabuList" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)" .br -.RI "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP" +.RI "\fI\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. \fP" .ti -1c .RI "void \fBadd\fP (const M &__move, const \fBEOT\fP &__sol)" .br @@ -44,6 +44,14 @@ Inherits \fBmoTabuList< M >< M >\fP. .br .RI "\fIProcedure which initialises the tabu list. \fP" .in -1c +.SS "Private Member Functions" + +.in +1c +.ti -1c +.RI "void \fBremoveMove\fP (const M &__move)" +.br +.RI "\fIProcedure that removes a given move from the tabu list (if it is into, else do nothing). \fP" +.in -1c .SS "Private Attributes" .in +1c @@ -71,7 +79,7 @@ Definition at line 22 of file moSimpleMoveTabuList.h. .PP .SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP -Function that indicates if, in a given state, the _move is tabu or not. +\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. .PP \fBParameters:\fP .RS 4 @@ -109,7 +117,7 @@ Implements \fBmoTabuList< M >\fP. .PP Definition at line 60 of file moSimpleMoveTabuList.h. .PP -References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, and moSimpleMoveTabuList< M >::tabuList. +References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, moSimpleMoveTabuList< M >::removeMove(), and moSimpleMoveTabuList< M >::tabuList. .SS "template void \fBmoSimpleMoveTabuList\fP< M >::update ()\fC [inline, virtual]\fP" .PP Procedure that updates the tabu list content. @@ -118,7 +126,7 @@ Generally, a counter associated to each saved move is decreased by one. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 75 of file moSimpleMoveTabuList.h. +Definition at line 82 of file moSimpleMoveTabuList.h. .SS "template void \fBmoSimpleMoveTabuList\fP< M >::init ()\fC [inline, virtual]\fP" .PP Procedure which initialises the tabu list. @@ -127,7 +135,23 @@ Can be useful if the data structure needs to be allocated before being used. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 81 of file moSimpleMoveTabuList.h. +Definition at line 88 of file moSimpleMoveTabuList.h. +.SS "template void \fBmoSimpleMoveTabuList\fP< M >::removeMove (const M & __move)\fC [inline, private]\fP" +.PP +Procedure that removes a given move from the tabu list (if it is into, else do nothing). +.PP +\fBParameters:\fP +.RS 4 +\fI__move\fP A given \fBmoMove\fP. +.RE +.PP + +.PP +Definition at line 100 of file moSimpleMoveTabuList.h. +.PP +References moSimpleMoveTabuList< M >::tabuList. +.PP +Referenced by moSimpleMoveTabuList< M >::add(). .SH "Author" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 index 4e9b78d3b..c14103c46 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleSolutionTabuList" 3 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &__move, const \fBEOT\fP &__sol)" .br -.RI "\fIFunction that indicates if, in a given state, the _move is tabu or not. \fP" +.RI "\fI\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. \fP" .ti -1c .RI "void \fBadd\fP (const M &__move, const \fBEOT\fP &__sol)" .br @@ -44,6 +44,14 @@ Inherits \fBmoTabuList< M >< M >\fP. .br .RI "\fIProcedure which initialises the tabu list. \fP" .in -1c +.SS "Private Member Functions" + +.in +1c +.ti -1c +.RI "void \fBremoveSolution\fP (const \fBEOT\fP &__sol)" +.br +.RI "\fIProcedure that removes a given solution from the tabu list (if it is into, else does nothing). \fP" +.in -1c .SS "Private Attributes" .in +1c @@ -87,7 +95,7 @@ References moSimpleSolutionTabuList< M >::currentSize. .PP .SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP -Function that indicates if, in a given state, the _move is tabu or not. +\fBFunction\fP that indicates if, in a given state, the _move is tabu or not. .PP \fBParameters:\fP .RS 4 @@ -125,7 +133,7 @@ Implements \fBmoTabuList< M >\fP. .PP Definition at line 64 of file moSimpleSolutionTabuList.h. .PP -References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, and moSimpleSolutionTabuList< M >::tabuList. +References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, moSimpleSolutionTabuList< M >::removeSolution(), and moSimpleSolutionTabuList< M >::tabuList. .SS "template void \fBmoSimpleSolutionTabuList\fP< M >::update ()\fC [inline, virtual]\fP" .PP Procedure that updates the tabu list content. @@ -134,7 +142,7 @@ Generally, a counter associated to each saved move is decreased by one. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 84 of file moSimpleSolutionTabuList.h. +Definition at line 91 of file moSimpleSolutionTabuList.h. .SS "template void \fBmoSimpleSolutionTabuList\fP< M >::init ()\fC [inline, virtual]\fP" .PP Procedure which initialises the tabu list. @@ -143,7 +151,23 @@ Can be useful if the data structure needs to be allocated before being used. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 90 of file moSimpleSolutionTabuList.h. +Definition at line 97 of file moSimpleSolutionTabuList.h. +.SS "template void \fBmoSimpleSolutionTabuList\fP< M >::removeSolution (const \fBEOT\fP & __sol)\fC [inline, private]\fP" +.PP +Procedure that removes a given solution from the tabu list (if it is into, else does nothing). +.PP +\fBParameters:\fP +.RS 4 +\fI__sol\fP A given solution. +.RE +.PP + +.PP +Definition at line 109 of file moSimpleSolutionTabuList.h. +.PP +References moSimpleSolutionTabuList< M >::tabuList. +.PP +Referenced by moSimpleSolutionTabuList< M >::add(). .SH "Author" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 index be05e37f8..976689baa 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "20 Apr 2007" "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 f27b8548b..543def5e0 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_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 .RI "bool \fBoperator()\fP (\fBEOT\fP &__sol)" .br -.RI "\fIFunction which launchs the Tabu Search. \fP" +.RI "\fI\fBFunction\fP which launchs the Tabu Search. \fP" .in -1c .SS "Private Types" @@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIStop criterion. \fP" .ti -1c -.RI "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,9 +129,9 @@ 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. +\fBFunction\fP which launchs the Tabu Search. .PP Algorithm of the tabu search. As a \fBmoSA\fP or a \fBmoHC\fP, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm. .PP @@ -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 913fc5746..dd6cf6a76 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "20 Apr 2007" "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 554e495e1..101d7dfcf 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 "19 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "20 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,6 +10,8 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP. +.PP Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .PP .SS "Public Types" diff --git a/trunk/paradiseo-mo/docs/mo.doxytag b/trunk/paradiseo-mo/docs/mo.doxytag index 24e55592e..fc6510293 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 @@ moCoolingSchedule classmo_cooling_schedule.html + eoUF< double &, bool > moExponentialCoolingSchedule @@ -475,6 +478,7 @@ moLSCheckPoint classmo_l_s_check_point.html M + eoBF void operator() @@ -501,6 +505,7 @@ moMove classmo_move.html EOT + eoUF< EOT &, void > EOT EOType @@ -513,16 +518,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 @@ -534,6 +542,7 @@ moMoveSelect classmo_move_select.html M + eoBF< M &, M::EOType::Fitness &, void > M::EOType::Fitness Fitness @@ -560,6 +569,7 @@ moNextMove classmo_next_move.html M + eoBF moNoAspirCrit @@ -640,6 +650,7 @@ moRandMove classmo_rand_move.html M + eoUF< M &, void > moSA @@ -764,6 +775,13 @@ b91ae9971be30769757d1ad92c6009dc () + + void + removeMove + classmo_simple_move_tabu_list.html + a3fa2bd19e09f1541878fa28e867d20f + (const M &__move) + unsigned maxSize @@ -833,6 +851,13 @@ d5645c39fec71a6110a2cbccbb08b816 () + + void + removeSolution + classmo_simple_solution_tabu_list.html + 7847a48f33c15e31298f3e715d754560 + (const EOT &__sol) + unsigned maxSize @@ -859,6 +884,7 @@ moSolContinue classmo_sol_continue.html EOT + eoUF< const EOT &, bool > virtual void init @@ -871,6 +897,7 @@ moTabuList classmo_tabu_list.html M + eoBF M::EOType EOT diff --git a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h index f0e501782..ab4fae339 100755 --- a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h +++ b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h @@ -36,7 +36,7 @@ public: currentSize=0; } - //! Function that indicates if, in a given state, the _move is tabu or not. + //! Function that indicates if, in a given state, the _move is tabu or not. /*! \param __move A given moMove. \param __sol A solution. @@ -59,6 +59,13 @@ public: void add (const M & __move, const EOT & __sol) { + if(currentSize!=0) + { + // Useful in the case of a move has been kept thanks to the moAspirCrit. + // In this case, the move can already be in the tabuList. + removeMove(__move); + } + tabuList.push_back(__move); if(currentSize==maxSize) @@ -85,6 +92,27 @@ public: private: + //! Procedure that removes a given move from the tabu list (if it is into, else do nothing). + /*! + \param __move A given moMove. + */ + void + removeMove(const M & __move) + { + typename std::list::iterator it; + + it=tabuList.begin(); + while(it!=tabuList.end()&&(!((*it)==__move))) + { + it++; + } + + if(it!=tabuList.end()) + { + tabuList.erase(it); + } + } + //! The maximum size of the tabu list. unsigned maxSize; diff --git a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h index 6bf44b969..09d6fdb5b 100755 --- a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h +++ b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h @@ -67,6 +67,13 @@ public: EOT _sol=(EOT) _sol; _move(_sol); + + if(currentSize!=0) + { + // Useful in the case of a solution has been kept thanks to the moAspirCrit. + // In this case, the solution can already be in the tabuList. + removeSolution(_sol); + } tabuList.push_back(_sol); @@ -93,6 +100,27 @@ public: } private: + + //! Procedure that removes a given solution from the tabu list (if it is into, else does nothing). + /*! + \param __sol A given solution. + */ + void + removeSolution(const EOT & __sol) + { + typename std::list::iterator it; + + it=tabuList.begin(); + while(it!=tabuList.end()&&(!((*it)==__sol))) + { + it++; + } + + if(it!=tabuList.end()) + { + tabuList.erase(it); + } + } //! The maximum size of the tabu list. unsigned maxSize; diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing index c23dd60aa..eaf598020 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing and b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search index 56a8acfc0..410bd3ee3 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search and b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing index f561655f9..5591b46e0 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing and b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing differ diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a index 016ff850f..a0e860cf1 100644 Binary files a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a and b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a differ