diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/annotated.html b/tags/dummy-tag/paradiseo-mo/doc/html/annotated.html index 079415462..7521d6667 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/annotated.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/annotated.html @@ -66,7 +66,7 @@ moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classes.html b/tags/dummy-tag/paradiseo-mo/doc/html/classes.html index 7f496134b..ff03ffe9c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classes.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classes.html @@ -45,7 +45,7 @@ moMoveLoopExpl   moTS   moGenSolContinue   moMoveSelect   moTSMoveLoopExpl   
  H  
  N  

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

-

Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo-members.html index f9656a631..7435fb7a8 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
-
+
-
+

moAlgo< EOT > Member List

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

- - + - - + - - -
binaryeoOp< EOType >
className() consteoMonOp< EOT > [virtual]
className() const eoMonOp< EOT > [virtual]
eoMonOp()eoMonOp< EOT >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
functor_category()eoUF< EOT &, bool > [static]
generaleoOp< EOType >
getType() consteoOp< EOType >
getType() const eoOp< EOType >
operator()(EOT &)=0eoUF< EOT &, bool > [pure virtual]
OpType enum nameeoOp< EOType >
quadraticeoOp< EOType >
unaryeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< EOT &, bool > [virtual]

Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
+doxygen 1.4.7
diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo.html index f6b8bbd79..b3cb4684b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_algo.html @@ -28,12 +28,20 @@
  • 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 + +List of all members.

    Detailed Description

    @@ -48,7 +56,7 @@ Description of an algorithm of the paradiseo-mo library.

    Definition at line 46 of file moAlgo.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html index 24ef6b340..e62d71f9e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit-members.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html index 8a34aa24a..67bf3ff85 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png index ab38bee30..e6cefe1bf 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_aspir_crit.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html index 03fddfd51..99bb51653 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select-members.html @@ -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 &_fitness)moBestImprSelect< M > [inline, virtual]
    operator()(M &_move, Fitness &_fitness)moBestImprSelect< M > [inline]
    operator()(M &_move, Fitness &_fitness)moBestImprSelect< M > [inline, virtual]
    update(const M &_move, const Fitness &_fitness)moBestImprSelect< M > [inline, virtual]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html index 02b0aad4b..ded6624ae 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.html @@ -36,7 +36,9 @@

    Inheritance diagram for moBestImprSelect< M >:

    -moMoveSelect< M > +moMoveSelect< M > +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -51,7 +53,7 @@ typedef M::EOType::Fitness  - + @@ -143,7 +145,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:
    @@ -183,7 +185,7 @@ template<class M>
    - +
     Procedure which initialise the exploration.
    bool update (const M &_move, const Fitness &_fitness)
     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 &_fitness)
     Procedure which saved the best move and fitness.
    ) [inline] [inline, virtual]
    @@ -199,6 +201,8 @@ Procedure which saved the best move and fitness. +

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

    Definition at line 95 of file moBestImprSelect.h.

    @@ -207,7 +211,7 @@ References moBest

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.png index 5c56bea68..e803a39a4 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_best_impr_select.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator-members.html index eb360cecc..4377bbb07 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    -
    +
    -
    +

    moComparator< EOT > Member List

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

    -
    functor_category()eoBF< A1, A2, R > [static]
    operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    ~eoBF()eoBF< A1, A2, R > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.html index b12611e26..0d53b1270 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moComparator< EOT > Class Template Reference

    Template for classes which need to compare two EOT and indicate if the first is "better" than the second. +

    moComparator< EOT > Class Template Reference

    Template for classes which need to compare two EOT and indicate if the first is "better" than the second. More...

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

    Inheritance diagram for moComparator< EOT >:

    -moFitComparator< EOT > +eoBF< A1, A2, R > +eoFunctorBase +moFitComparator< EOT > - +List of all members.

    Detailed Description

    @@ -53,7 +55,7 @@ The objects that extend this template describe how an EOT is "better" than an ot

    Definition at line 45 of file moComparator.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png index e0d3262b7..5c939a24d 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_comparator.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html index 99bc9923e..c3df40310 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    -
    +
    -
    +

    moCoolingSchedule Member List

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

    -
    functor_category()eoUF< double &, bool > [static]
    operator()(double &)=0eoUF< double &, bool > [pure virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< double &, bool > [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html index 11d26309f..33db9d07a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.html @@ -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,10 +36,12 @@

    Inheritance diagram for moCoolingSchedule:

    -moExponentialCoolingSchedule -moLinearCoolingSchedule +eoUF< double &, bool > +eoFunctorBase +moExponentialCoolingSchedule +moLinearCoolingSchedule - +List of all members.

    Detailed Description

    @@ -51,7 +53,7 @@ It is only a description... An object that herits from this class is needed to b

    Definition at line 46 of file moCoolingSchedule.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png index 9524bf074..f60c26373 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_cooling_schedule.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html index adb050395..d1eb57a0c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html @@ -29,11 +29,14 @@
  • Class Members

    • moExponentialCoolingSchedule Member List

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

    + - + -
    functor_category()eoUF< double &, bool > [static]
    moExponentialCoolingSchedule(double _threshold, double _ratio)moExponentialCoolingSchedule [inline]
    operator()(double &_temperature)moExponentialCoolingSchedule [inline]
    operator()(double &_temperature)moExponentialCoolingSchedule [inline, virtual]
    ratiomoExponentialCoolingSchedule [private]
    thresholdmoExponentialCoolingSchedule [private]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html index 15c99086e..308b01321 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html @@ -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 &_temperature)
     Function which proceeds to the cooling.
     Function which proceeds to the cooling.

    Private Attributes

    double threshold
    _temperature  )  [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 65 of file moExponentialCoolingSchedule.h.

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

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png index 889062daa..02c711475 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html index 3a6ef5602..1ac238e39 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select-members.html @@ -32,12 +32,15 @@ best_fitnessmoFirstImprSelect< M > [private] best_movemoFirstImprSelect< M > [private] Fitness typedefmoFirstImprSelect< M > + functor_category()eoBF< M &, M::EOType::Fitness &, void > [static] init(const Fitness &_fitness)moFirstImprSelect< M > [inline, virtual] initial_fitnessmoFirstImprSelect< M > [private] - operator()(M &_move, Fitness &_fitness)moFirstImprSelect< M > [inline] + operator()(M &_move, Fitness &_fitness)moFirstImprSelect< M > [inline, virtual] update(const M &_move, const Fitness &_fitness)moFirstImprSelect< M > [inline, virtual] validmoFirstImprSelect< M > [private] -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html index 4a2422c5a..1d731dc1d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.html @@ -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  - + @@ -147,7 +149,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:
    @@ -187,7 +189,7 @@ template<class M>
    - +
     Procedure which initialise the exploration.
    bool update (const M &_move, const Fitness &_fitness)
     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 &_fitness)
     Procedure which saved the best move and fitness.
    ) [inline] [inline, virtual]
    @@ -203,6 +205,8 @@ Procedure which saved the best move and fitness. +

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

    Definition at line 96 of file moFirstImprSelect.h.

    @@ -211,7 +215,7 @@ References moFir

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png index d7c432afc..a2a1234c8 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_first_impr_select.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html index e5ae03ff6..a258cd168 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator-members.html @@ -29,8 +29,12 @@
  • Class Members

    • moFitComparator< EOT > Member List

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

    + -
    functor_category()eoBF< A1, A2, R > [static]
    operator()(const EOT &_solution1, const EOT &_solution2)moFitComparator< EOT > [inline]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + moComparator::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.html index db702cf53..ee0242224 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.html @@ -36,14 +36,16 @@

    Inheritance diagram for moFitComparator< EOT >:

    -moComparator< EOT > +moComparator< EOT > +eoBF< A1, A2, R > +eoFunctorBase List of all members. - +

    Public Member Functions

    bool operator() (const EOT &_solution1, const EOT &_solution2)
     Function which makes the comparison and gives the result.
     Function which makes the comparison and gives the result.

    Detailed Description

    template<class EOT>
    @@ -84,7 +86,7 @@ template<class EOT>

    -Function which makes the comparison and gives the result. +Function which makes the comparison and gives the result.

    Parameters:
    @@ -100,7 +102,7 @@ Definition at line

    The documentation for this class was generated from the following file:     -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png index f9345d24c..38eca919c 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_comparator.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html index e3d20b792..169f1a8f3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html @@ -31,10 +31,13 @@

    moFitSolContinue< EOT > Member List

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

    + - -
    Fitness typedefmoFitSolContinue< EOT >
    fitnessmoFitSolContinue< EOT > [private]
    functor_category()eoUF< const EOT &, bool > [static]
    init()moFitSolContinue< EOT > [inline, virtual]
    moFitSolContinue(Fitness _fitness)moFitSolContinue< EOT > [inline]
    operator()(const EOT &_solution)moFitSolContinue< EOT > [inline]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(const EOT &_solution)moFitSolContinue< EOT > [inline, virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.html index db9e50f15..b6d636788 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.html @@ -36,7 +36,9 @@

    Inheritance diagram for moFitSolContinue< EOT >:

    -moSolContinue< EOT > +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -51,7 +53,7 @@ typedef EOT::Fitness  - + @@ -116,14 +118,14 @@ template<class EOT> - +
     Basic constructor.
    bool operator() (const EOT &_solution)
     Function that activates the stopping criterion.
     Function that activates the stopping criterion.
    void init ()
     Procedure which allows to initialise all the stuff needed.
    const EOT &  _solution  )  [inline] [inline, virtual]

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

    Indicates if the fitness threshold has not yet been reached.

    Parameters:
    @@ -133,6 +135,8 @@ Indicates if the fitness threshold has not yet been reached.

    Returns:
    true or false according to the value of the fitness.
    +

    +Implements eoUF< const EOT &, bool >.

    Definition at line 67 of file moFitSolContinue.h.

    @@ -168,7 +172,7 @@ Definition at line moFitSolContinue.h -

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png index 84c76d5a4..76c36e46c 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_fit_sol_continue.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html index 827202bd4..008b36f21 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html @@ -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]
    generationMaximumNumbermoGenSolContinue< EOT > [private]
    generationNumbermoGenSolContinue< EOT > [private]
    init()moGenSolContinue< EOT > [inline, virtual]
    moGenSolContinue(unsigned int _generationMaximumNumber)moGenSolContinue< EOT > [inline]
    operator()(const EOT &_solution)moGenSolContinue< EOT > [inline]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(const EOT &_solution)moGenSolContinue< EOT > [inline, virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.html index f2d37c61d..6799e009a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.html +++ b/tags/dummy-tag/paradiseo-mo/doc/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 &_solution)
     Function that activates the stop criterion.
     Function that activates the stop criterion.
    void init ()
     Procedure which allows to initialise the generation counter.
    const EOT &  _solution  )  [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 66 of file moGenSolContinue.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png index 571c39c65..b40e34991 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_gen_sol_continue.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html index a24a59397..1fd46ccc0 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c-members.html @@ -29,14 +29,24 @@
  • Class Members

    • moHC< M > Member List

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

    + + + + + + - -
    className() const eoMonOp< M::EOType > [virtual]
    eoMonOp()eoMonOp< M::EOType >
    eoOp(OpType _type)eoOp< EOType >
    eoOp(const eoOp &_eop)eoOp< EOType >
    EOT typedefmoHC< M > [private]
    Fitness typedefmoHC< M > [private]
    full_evaluationmoHC< M > [private]
    functor_category()eoUF< M::EOType &, bool > [static]
    getType() const eoOp< EOType >
    moHC(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, eoEvalFunc< EOT > &_full_evaluation)moHC< M > [inline]
    moHC(moMoveExpl< M > &_move_explorer, eoEvalFunc< EOT > &_full_evaluation)moHC< M > [inline]
    move_explorermoHC< M > [private]
    operator()(EOT &_solution)moHC< M > [inline]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(EOT &_solution)moHC< M > [inline, virtual] + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c.html index c3f1f222f..d90c991d5 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c.html @@ -36,15 +36,15 @@ List of all members. - + - + - + @@ -60,7 +60,7 @@ typedef EOT::Fitness  +eoEvalFunc< EOT > & 

    Public Member Functions

     moHC (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, eoEvalFunc< EOT > &_full_evaluation)
     moHC (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, eoEvalFunc< EOT > &_full_evaluation)
     Full constructor.
     moHC (moMoveExpl< M > &_move_explorer, eoEvalFunc< EOT > &_full_evaluation)
     moHC (moMoveExpl< M > &_move_explorer, eoEvalFunc< EOT > &_full_evaluation)
     Light constructor.
    bool operator() (EOT &_solution)
     Function which launches the HC.
     Function which launches the HC.

    Private Types

    typedef M::EOType EOT
     Complete exploration of the neighborhood.
    -eoEvalFunc< EOT > & full_evaluation
    full_evaluation
     A full evaluation function.
    @@ -108,7 +108,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -153,7 +153,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -193,14 +193,14 @@ template<class M> EOT &  _solution  )  - [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:
    @@ -210,6 +210,8 @@ The HC has to improve a current solution. As the eoUF< M::EOType &, bool >.

    Definition at line 94 of file moHC.h.

    @@ -218,7 +220,7 @@ References moHC< M >::fu

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html index fd8a27cd9..9a67c753a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html @@ -31,13 +31,16 @@

    moHCMoveLoopExpl< M > Member List

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

    + - -
    EOT typedefmoHCMoveLoopExpl< M > [private]
    Fitness typedefmoHCMoveLoopExpl< M > [private]
    functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
    incremental_evaluationmoHCMoveLoopExpl< M > [private]
    moHCMoveLoopExpl(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection)moHCMoveLoopExpl< M > [inline]
    move_initializermoHCMoveLoopExpl< M > [private]
    move_selectionmoHCMoveLoopExpl< M > [private]
    next_move_generatormoHCMoveLoopExpl< M > [private]
    operator()(const EOT &_old_solution, EOT &_new_solution)moHCMoveLoopExpl< M > [inline]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(const EOT &_old_solution, EOT &_new_solution)moHCMoveLoopExpl< M > [inline, virtual] + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html index c258e11c7..bd0100fce 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html +++ b/tags/dummy-tag/paradiseo-mo/doc/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 79 of file moHCMoveLoopExpl.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png index 52db31402..8c76fd46e 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html index a5c9f23d8..34c76d001 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s-members.html @@ -31,17 +31,27 @@

    moILS< M > Member List

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

    + + + + + + - + + -
    acceptance_criterionmoILS< M > [private]
    algorithmmoILS< M > [private]
    className() const eoMonOp< M::EOType > [virtual]
    continumoILS< M > [private]
    eoMonOp()eoMonOp< M::EOType >
    eoOp(OpType _type)eoOp< EOType >
    eoOp(const eoOp &_eop)eoOp< EOType >
    EOT typedefmoILS< M > [private]
    Fitness typedefmoILS< M > [private]
    full_evaluationmoILS< M > [private]
    functor_category()eoUF< M::EOType &, bool > [static]
    getType() const eoOp< EOType >
    moILS(moAlgo< EOT > &_algorithm, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)moILS< M > [inline]
    moILS(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)moILS< M > [inline]
    moILS(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion, moSolContinue< EOT > &_moTS_continue, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)moILS< M > [inline]
    moILS(moRandMove< M > &_random_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moSolContinue< EOT > &_moSA_continue, double _initial_temperature, moCoolingSchedule &_cooling_schedule, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)moILS< M > [inline]
    operator()(EOT &_solution)moILS< M > [inline]
    operator()(EOT &_solution)moILS< M > [inline, virtual]
    OpType enum nameeoOp< EOType >
    perturbationmoILS< M > [private]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html index fdeab9f60..f7366468a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_i_l_s.html @@ -36,21 +36,21 @@ List of all members. - + - + - + - + - + @@ -74,11 +74,11 @@ typedef EOT::Fitness  +eoMonOp< EOT > &  +eoEvalFunc< EOT > & 

    Public Member Functions

     moILS (moAlgo< EOT > &_algorithm, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     moILS (moAlgo< EOT > &_algorithm, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     Generic constructor.
     moILS (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     moILS (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moMoveSelect< M > &_move_selection, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     Constructor for using a moHC for the moAlgo.
     moILS (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion, moSolContinue< EOT > &_moTS_continue, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     moILS (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion, moSolContinue< EOT > &_moTS_continue, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     Constructor for using a moTS for the moAlgo.
     moILS (moRandMove< M > &_random_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moSolContinue< EOT > &_moSA_continue, double _initial_temperature, moCoolingSchedule &_cooling_schedule, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     moILS (moRandMove< M > &_random_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moSolContinue< EOT > &_moSA_continue, double _initial_temperature, moCoolingSchedule &_cooling_schedule, moSolContinue< EOT > &_continue, moComparator< EOT > &_acceptance_criterion, eoMonOp< EOT > &_perturbation, eoEvalFunc< EOT > &_full_evaluation)
     Constructor for using a moSA for the moAlgo.
    bool operator() (EOT &_solution)
     Function which launches the ILS.
     Function which launches the ILS.

    Private Types

    typedef M::EOType EOT
     The acceptance criterion.
    -eoMonOp< EOT > & perturbation
    perturbation
     The perturbation generator.
    -eoEvalFunc< EOT > & full_evaluation
    full_evaluation
     The full evaluation function.
    @@ -120,13 +120,13 @@ template<class M> - eoMonOp< EOT > &  + eoMonOp< EOT > &  _perturbation, - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -201,13 +201,13 @@ template<class M> - eoMonOp< EOT > &  + eoMonOp< EOT > &  _perturbation, - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -296,13 +296,13 @@ template<class M> - eoMonOp< EOT > &  + eoMonOp< EOT > &  _perturbation, - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -387,13 +387,13 @@ template<class M> - eoMonOp< EOT > &  + eoMonOp< EOT > &  _perturbation, - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -439,14 +439,14 @@ template<class M> EOT &  _solution  )  - [inline] + [inline, virtual]

    -Function which launches the ILS. +Function which launches the ILS.

    The ILS has to improve a current solution. As the moSA, the moTS and the moHC, it can be used for HYBRIDATION in an evolutionnary algorithm.

    Parameters:
    @@ -456,6 +456,8 @@ The ILS has to improve a current solution. As the eoUF< M::EOType &, bool >.

    Definition at line 146 of file moILS.h.

    @@ -464,7 +466,7 @@ References moILS< M >:

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html index e3c67d17c..42529edce 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html @@ -32,10 +32,14 @@ best_fitnessmoImprBestFitAspirCrit< 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 &_fitness)moImprBestFitAspirCrit< M > [inline] -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html index acd631b46..aa80da84f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html +++ b/tags/dummy-tag/paradiseo-mo/doc/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 current fitness is better that the already saved fitness. +Function that indicates if the current fitness is better that the already saved fitness.

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

    Parameters:
    @@ -125,7 +127,7 @@ References moImprBestFitAspirCrit.h -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png index c0203e510..76e0473f0 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html index 15551c6b1..e5cb493bd 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html @@ -30,12 +30,16 @@

    moItRandNextMove< M > Member List

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

     Initialisation procedure.
    bool operator() (const M &_move, const Fitness &_fitness)
     Function that indicates if the current fitness is better that the already saved fitness.
     Function that indicates if the current fitness is better that the already saved fitness.

    Private Attributes

    Fitness best_fitness
    + + -
    EOT typedefmoItRandNextMove< M > [private]
    functor_category()eoBF< A1, A2, R > [static]
    iteration_maximum_numbermoItRandNextMove< M > [private]
    iteration_numbermoItRandNextMove< M > [private]
    moItRandNextMove(moRandMove< M > &_random_move_generator, unsigned int _iteration_maximum_number)moItRandNextMove< M > [inline]
    operator()(M &_move, const EOT &_solution)moItRandNextMove< M > [inline]
    moNextMove::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    random_move_generatormoItRandNextMove< M > [private]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html index a11bc796b..cfb9d53d7 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png index e2933b674..3ec8c9761 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_it_rand_next_move.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html index edfbc096a..460828d9c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html @@ -31,8 +31,12 @@

    moLSCheckPoint< M > Member List

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

    _random_move_generator The random move generator.
    + -
    add(eoBF< const M &, const typename M::EOType &, void > &_function)moLSCheckPoint< M > [inline]
    functionsmoLSCheckPoint< M > [private]
    functor_category()eoBF< A1, A2, R > [static]
    operator()(const M &_move, const typename M::EOType &_solution)moLSCheckPoint< M > [inline]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + eoBF::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html index 8245fe5d8..5e5e03fef 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_l_s_check_point.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html index 505d20e6c..e3ba42aab 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html @@ -29,11 +29,14 @@
  • Class Members

    • 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 &_solution)
     Function which launches the checkpointing.
    void add (eoBF< const M &, const typename M::EOType &, void > &_function)
     Function which launches the checkpointing.
    void add (eoBF< const M &, const typename M::EOType &, void > &_function)
     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 > * >     		functions
    void moLSCheckPoint< M >::add (eoBF< const M &, const typename M::EOType &, void > & eoBF< const M &, const typename M::EOType &, void > &  _function  )  [inline]
    + - + -
    functor_category()eoUF< double &, bool > [static]
    moLinearCoolingSchedule(double _threshold, double _quantity)moLinearCoolingSchedule [inline]
    operator()(double &_current_temperature)moLinearCoolingSchedule [inline]
    operator()(double &_current_temperature)moLinearCoolingSchedule [inline, virtual]
    quantitymoLinearCoolingSchedule [private]
    thresholdmoLinearCoolingSchedule [private]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html index 7961bc6b3..85bef1a61 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html @@ -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 &_current_temperature)
     Function which proceeds to the cooling.
     Function which proceeds to the cooling.

    Private Attributes

    double threshold
    _current_temperature  )  [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:
    true if the new temperature (current temperature - quantity) is greater than the threshold, false otherwise.
    +

    +Implements eoUF< double &, bool >.

    Definition at line 65 of file moLinearCoolingSchedule.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png index 969ab05a5..064f41e2d 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html index fb30ac0cc..af53eeb1e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move-members.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects 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 Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move.html index 0824587c3..168aa9020 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move.html +++ b/tags/dummy-tag/paradiseo-mo/doc/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 49 of file moMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl-members.html index 18ee1e09f..3b7c48a16 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +

    Public Types

    - - +
    -
    +

    moMoveExpl< M > Member List

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

    -
    functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
    operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual]
    ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html index 0deb29d65..36d590dfb 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.html @@ -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,11 +36,13 @@

    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 > - +List of all members.

    Detailed Description

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

    Definition at line 46 of file moMoveExpl.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png index 1b27438a7..66c1602bb 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_expl.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html index 25c601df5..82d79b4d2 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    -
    +
    -
    +

    moMoveIncrEval< M > Member List

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

    -
    functor_category()eoBF< A1, A2, R > [static]
    operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    ~eoBF()eoBF< A1, A2, R > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html index 6da9e24fa..3eb58cbae 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_incr_eval.html @@ -28,12 +28,18 @@
  • 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 + +List of all members.

    Detailed Description

    @@ -48,7 +54,7 @@ From a move and a solution, it computes a new fitness that could be associated t

    Definition at line 49 of file moMoveIncrEval.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init-members.html index a8e9c8473..1a3306d61 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    -
    +
    -
    +

    moMoveInit< M > Member List

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

    -
    functor_category()eoBF< A1, A2, R > [static]
    operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    ~eoBF()eoBF< A1, A2, R > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html index acf153b3f..ce440bbe1 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_init.html @@ -28,12 +28,18 @@
  • 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 + +List of all members.

    Detailed Description

    @@ -48,7 +54,7 @@ Class which allows to initiase a move. Only a description... An object that heri

    Definition at line 47 of file moMoveInit.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html index b491715dd..4b1e885e6 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    -
    +
    -
    +

    moMoveLoopExpl< M > Member List

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

    -
    functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
    operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual]
    ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html index 98c69692f..9a9fb619f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.html @@ -36,11 +36,13 @@

    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 > - +List of all members.

    Detailed Description

    @@ -55,7 +57,7 @@ Only a description... moHCM

    Definition at line 47 of file moMoveLoopExpl.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png index 3fc99c0f6..82d725cec 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_loop_expl.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html index 1c6309408..1ceeded5a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select-members.html @@ -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 &_fitness)=0moMoveSelect< M > [pure virtual]
    operator()(M &, M::EOType::Fitness &)=0eoBF< M &, M::EOType::Fitness &, void > [pure virtual]
    update(const M &_move, const Fitness &_fitness)=0moMoveSelect< M > [pure virtual]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html index 95d514054..a9e235b6e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.html @@ -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 &_fitness)=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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png index 0781eef97..10bda515a 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_move_select.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move-members.html index 9b189343a..147c1b06b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    - -
    +
    -
    +

    moNextMove< M > Member List

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

    -
    functor_category()eoBF< A1, A2, R > [static]
    operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    ~eoBF()eoBF< A1, A2, R > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Wed Jan 16 15:50:40 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html index 20576ecad..45d7ffd24 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.html @@ -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,9 +36,11 @@

    Inheritance diagram for moNextMove< M >:

    -moItRandNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase +moItRandNextMove< M > - +List of all members.

    Detailed Description

    @@ -53,7 +55,7 @@ Useful for the explorer (for moTS or <

    Definition at line 47 of file moNextMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png index 17c4c95d1..2021f9a10 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_next_move.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html index 611ed3aca..4bd8bfd2a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html @@ -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, virtual]
    operator()(const M &_move, const typename M::EOType::Fitness &_fitness)moNoAspirCrit< M > [inline]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.html index 40cf43150..f6242c307 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.html +++ b/tags/dummy-tag/paradiseo-mo/doc/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:
    @@ -131,7 +133,7 @@ Definition at line 7

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png index 79fd6d32d..c0687eec9 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_aspir_crit.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html index ced8d5af1..22afb2315 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html @@ -33,11 +33,14 @@
    + - -

    Public Member Functions

    bool operator() (const M &_move, const typename M::EOType::Fitness &_fitness)
     Function which describes the aspiration criterion behaviour.
     Function which describes the aspiration criterion behaviour.
    void init ()
     Procedure which initialises all that needs a moNoAspirCrit.
    firstFitnessSavedmoNoFitImprSolContinue< EOT > [private]
    fitnessmoNoFitImprSolContinue< EOT > [private]
    Fitness typedefmoNoFitImprSolContinue< EOT >
    functor_category()eoUF< const EOT &, bool > [static]
    init()moNoFitImprSolContinue< EOT > [inline, virtual]
    maxNumberOfIterationsWithoutImprovementmoNoFitImprSolContinue< EOT > [private]
    moNoFitImprSolContinue(unsigned int _maxNumberOfIterationWithoutImprovement)moNoFitImprSolContinue< EOT > [inline]
    operator()(const EOT &_solution)moNoFitImprSolContinue< EOT > [inline]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(const EOT &_solution)moNoFitImprSolContinue< EOT > [inline, virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html index b6ae51560..223aa5013 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html @@ -36,7 +36,9 @@

    Inheritance diagram for moNoFitImprSolContinue< EOT >:

    -moSolContinue< EOT > +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -51,7 +53,7 @@ typedef EOT::Fitness  - + @@ -128,14 +130,14 @@ template<class EOT> - +
     Basic constructor.
    bool operator() (const EOT &_solution)
     Function that activates the stopping criterion.
     Function that activates the stopping criterion.
    void init ()
     Procedure which allows to initialise all the stuff needed.
    const EOT &  _solution  )  [inline] [inline, virtual]

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

    Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations).

    Parameters:
    @@ -144,6 +146,8 @@ Indicates if the fitness has not been improved since a given number of iteration
    Returns:
    true or false.
    +

    +Implements eoUF< const EOT &, bool >.

    Definition at line 67 of file moNoFitImprSolContinue.h.

    @@ -181,7 +185,7 @@ References moNoFitImprSolContinue.h -

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png index dfd768a2f..a727d6003 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html index 8b47bf784..e034847ce 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html @@ -33,11 +33,14 @@
    + - + -
    better_movesmoRandImprSelect< M > [private]
    firstTimemoRandImprSelect< M > [private]
    Fitness typedefmoRandImprSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &_fitness)moRandImprSelect< M > [inline, virtual]
    initial_fitnessmoRandImprSelect< M > [private]
    operator()(M &_move, Fitness &_fitness)moRandImprSelect< M > [inline]
    operator()(M &_move, Fitness &_fitness)moRandImprSelect< M > [inline, virtual]
    update(const M &_move, const Fitness &_fitness)moRandImprSelect< M > [inline, virtual]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html index 3e745de52..31b0ec816 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.html @@ -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  - + @@ -148,7 +150,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:
    @@ -188,7 +190,7 @@ template<class M>
    - +
     Procedure which all that needs a moRandImprSelect.
    bool update (const M &_move, const Fitness &_fitness)
     Function that updates the fitness and move vectors.
     Function that updates the fitness and move vectors.
    void operator() (M &_move, Fitness &_fitness)
     The move selection.
    ) [inline] [inline, virtual]
    @@ -205,15 +207,17 @@ One the saved move is randomly chosen.

    +

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

    Definition at line 100 of file moRandImprSelect.h.

    -References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, and moRandImprSelect< M >::firstTime. +References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, moRandImprSelect< M >::firstTime, and eoRng::random().

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png index 38a074a58..b935a8e2f 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_impr_select.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move-members.html index 0ace25c4e..ef0c0dd5d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move-members.html @@ -1,14 +1,14 @@ - -ParadisEO-MOMovingObjects: Member List + +ParadisEO-MO-MovingObjects: Member List - +
    -
    +
    -
    +

    moRandMove< M > Member List

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

    -
    functor_category()eoUF< M &, void > [static]
    operator()(M &)=0eoUF< M &, void > [pure virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< M &, void > [virtual]

    Generated on Wed Jan 16 15:50:41 2008 for ParadisEO-MOMovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  -doxygen 1.5.4
    +doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html index 2f77f327f..ac46f6d90 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_rand_move.html @@ -28,12 +28,18 @@
  • 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 + +List of all members.

    Detailed Description

    @@ -48,7 +54,7 @@ Only a description... An object that herits from this class needs to be designed

    Definition at line 46 of file moRandMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html index 4492bf66f..01a8fa30d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a-members.html @@ -29,17 +29,27 @@
  • Class Members

    • moSA< M > Member List

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

    + + + + + + - + + -
    className() const eoMonOp< M::EOType > [virtual]
    continumoSA< M > [private]
    cooling_schedulemoSA< M > [private]
    eoMonOp()eoMonOp< M::EOType >
    eoOp(OpType _type)eoOp< EOType >
    eoOp(const eoOp &_eop)eoOp< EOType >
    EOT typedefmoSA< M > [private]
    Fitness typedefmoSA< M > [private]
    full_evaluationmoSA< M > [private]
    functor_category()eoUF< M::EOType &, bool > [static]
    getType() const eoOp< EOType >
    incremental_evaluationmoSA< M > [private]
    initial_temperaturemoSA< M > [private]
    moSA(moRandMove< M > &_random_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moSolContinue< EOT > &_continue, double _initial_temperature, moCoolingSchedule &_cooling_schedule, eoEvalFunc< EOT > &_full_evaluation)moSA< M > [inline]
    operator()(EOT &_solution)moSA< M > [inline]
    operator()(EOT &_solution)moSA< M > [inline, virtual]
    OpType enum nameeoOp< EOType >
    random_move_generatormoSA< M > [private]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html index 3d65dcfb8..a04eb3e93 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_s_a.html @@ -36,7 +36,7 @@ List of all members. - + @@ -73,7 +73,7 @@ double  +eoEvalFunc< EOT > & 

    Public Member Functions

     moSA (moRandMove< M > &_random_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moSolContinue< EOT > &_continue, double _initial_temperature, moCoolingSchedule &_cooling_schedule, eoEvalFunc< EOT > &_full_evaluation)
     moSA (moRandMove< M > &_random_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moSolContinue< EOT > &_continue, double _initial_temperature, moCoolingSchedule &_cooling_schedule, eoEvalFunc< EOT > &_full_evaluation)
     SA constructor.
    bool operator() (EOT &_solution)
     The cooling schedule.
    -eoEvalFunc< EOT > & full_evaluation
    full_evaluation
     A full evaluation function.
    @@ -127,7 +127,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -171,7 +171,7 @@ template<class M> EOT &  _solution  )  - [inline] + [inline, virtual] @@ -188,15 +188,17 @@ As a moTS or a eoUF< M::EOType &, bool >.

    Definition at line 89 of file moSA.h.

    -References moSA< M >::continu, moSA< M >::cooling_schedule, moSA< M >::full_evaluation, moSA< M >::incremental_evaluation, moSA< M >::initial_temperature, and moSA< M >::random_move_generator. +References moSA< M >::continu, moSA< M >::cooling_schedule, moSA< M >::full_evaluation, moSA< M >::incremental_evaluation, moSA< M >::initial_temperature, moSA< M >::random_move_generator, and eoRng::uniform().

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html index fb06314a7..1f85ed9f3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html @@ -31,16 +31,20 @@

    moSimpleMoveTabuList< M > Member List

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

    + + -
    add(const M &_move, const EOT &_solution)moSimpleMoveTabuList< M > [inline, virtual]
    EOT typedefmoSimpleMoveTabuList< M >
    functor_category()eoBF< A1, A2, R > [static]
    init()moSimpleMoveTabuList< M > [inline, virtual]
    memory_maximum_sizemoSimpleMoveTabuList< M > [private]
    memory_sizemoSimpleMoveTabuList< M > [private]
    moSimpleMoveTabuList(unsigned int _memory_maximum_size)moSimpleMoveTabuList< M > [inline]
    moveIterator typedefmoSimpleMoveTabuList< M >
    operator()(const M &_move, const EOT &_solution)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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html index 566ac99b0..f93db6839 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html @@ -36,7 +36,9 @@

    Inheritance diagram for moSimpleMoveTabuList< M >:

    -moTabuList< M > +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -56,7 +58,7 @@ typedef std::list< M >::iterator  - + @@ -121,7 +123,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 &_solution)
     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 &_solution)
     Procedure to add a move in the tabu list.
    @@ -274,7 +276,7 @@ Referenced by moSimpleMoveTabuList.h -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png index 796402f17..f4a038c83 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html index b222a6d9d..236f6862e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html @@ -31,16 +31,20 @@

    moSimpleSolutionTabuList< M > Member List

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

    + + -
    add(const M &_move, const EOT &_solution)moSimpleSolutionTabuList< M > [inline, virtual]
    EOT typedefmoSimpleSolutionTabuList< M >
    functor_category()eoBF< A1, A2, R > [static]
    init()moSimpleSolutionTabuList< M > [inline, virtual]
    memory_maximum_sizemoSimpleSolutionTabuList< M > [private]
    memory_sizemoSimpleSolutionTabuList< M > [private]
    moSimpleSolutionTabuList(unsigned int _memory_maximum_size)moSimpleSolutionTabuList< M > [inline]
    operator()(const M &_move, const EOT &_solution)moSimpleSolutionTabuList< M > [inline]
    moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    removeSolution(const EOT &_solution)moSimpleSolutionTabuList< M > [inline, private]
    solutionIterator typedefmoSimpleSolutionTabuList< M >
    tabuListmoSimpleSolutionTabuList< M > [private]
    update()moSimpleSolutionTabuList< M > [inline, virtual]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html index 17b1e9d95..7fc0a4031 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html @@ -36,7 +36,9 @@

    Inheritance diagram for moSimpleSolutionTabuList< M >:

    -moTabuList< M > +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -56,7 +58,7 @@ typedef std::list<   - + @@ -153,7 +155,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 &_solution)
     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 &_solution)
     Procedure to add a move in the tabu list.
    @@ -306,7 +308,7 @@ Referenced by moSimpleSolutionTabuList.h -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png index 3838fd012..38d26e329 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html index b09b6d5fb..608251ad0 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue-members.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.html index aba5ad9d7..68face9ed 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.html +++ b/tags/dummy-tag/paradiseo-mo/doc/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,10 +36,12 @@

    Inheritance diagram for moSolContinue< EOT >:

    -moFitSolContinue< EOT > -moGenSolContinue< EOT > -moNoFitImprSolContinue< EOT > -moSteadyFitSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase +moFitSolContinue< EOT > +moGenSolContinue< EOT > +moNoFitImprSolContinue< EOT > +moSteadyFitSolContinue< EOT > List of all members. @@ -54,7 +56,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).

    @@ -86,7 +88,7 @@ Implemented in moSolContinue.h -

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png index c6ccfa6a6..71ed9397d 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_sol_continue.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html index 613b65ee8..6b6fffff9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html @@ -33,13 +33,16 @@
    + - -
    firstFitnessSavedmoSteadyFitSolContinue< EOT > [private]
    Fitness typedefmoSteadyFitSolContinue< EOT >
    fitnessmoSteadyFitSolContinue< EOT > [private]
    functor_category()eoUF< const EOT &, bool > [static]
    init()moSteadyFitSolContinue< EOT > [inline, virtual]
    maxNumberOfIterationsmoSteadyFitSolContinue< EOT > [private]
    maxNumberOfIterationsReachedmoSteadyFitSolContinue< EOT > [private]
    maxNumberOfIterationsWithoutImprovementmoSteadyFitSolContinue< EOT > [private]
    moSteadyFitSolContinue(unsigned int _maxNumberOfIterations, unsigned int _maxNumberOfIterationWithoutImprovement)moSteadyFitSolContinue< EOT > [inline]
    operator()(const EOT &_solution)moSteadyFitSolContinue< EOT > [inline]
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(const EOT &_solution)moSteadyFitSolContinue< EOT > [inline, virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html index 53a20b3f9..c421e2234 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html @@ -36,7 +36,9 @@

    Inheritance diagram for moSteadyFitSolContinue< EOT >:

    -moSolContinue< EOT > +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -51,7 +53,7 @@ typedef EOT::Fitness  - + @@ -146,14 +148,14 @@ template<class EOT> - +
     Basic constructor.
    bool operator() (const EOT &_solution)
     Function that activates the stopping criterion.
     Function that activates the stopping criterion.
    void init ()
     Procedure which allows to initialise the stuff needed.
    const EOT &  _solution  )  [inline] [inline, virtual]

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

    Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations).

    Parameters:
    @@ -163,6 +165,8 @@ Indicates if the fitness has not been improved since a number of iterations (aft
    Returns:
    true or false.
    +

    +Implements eoUF< const EOT &, bool >.

    Definition at line 70 of file moSteadyFitSolContinue.h.

    @@ -200,7 +204,7 @@ References

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png index 1fa229f5a..702e690a2 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html index 113a18f46..2c828cc75 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s-members.html @@ -29,15 +29,25 @@
  • Class Members

    • moTS< M > Member List

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

    + + + + + + - -
    className() const eoMonOp< M::EOType > [virtual]
    continumoTS< M > [private]
    eoMonOp()eoMonOp< M::EOType >
    eoOp(OpType _type)eoOp< EOType >
    eoOp(const eoOp &_eop)eoOp< EOType >
    EOT typedefmoTS< M > [private]
    Fitness typedefmoTS< M > [private]
    full_evaluationmoTS< M > [private]
    functor_category()eoUF< M::EOType &, bool > [static]
    getType() const eoOp< EOType >
    moTS(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion, moSolContinue< EOT > &_continue, eoEvalFunc< EOT > &_full_evaluation)moTS< M > [inline]
    moTS(moMoveExpl< M > &_move_explorer, moSolContinue< EOT > &_continue, eoEvalFunc< EOT > &_full_evaluation)moTS< M > [inline]
    move_explorermoTS< M > [private]
    operator()(EOT &_solution)moTS< M > [inline]

    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + operator()(EOT &_solution)moTS< M > [inline, virtual] + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s.html index 38173bf14..b3008e481 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s.html @@ -36,15 +36,15 @@ List of all members. - + - + - + @@ -64,7 +64,7 @@ typedef EOT::Fitness  +eoEvalFunc< EOT > & 

    Public Member Functions

     moTS (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion, moSolContinue< EOT > &_continue, eoEvalFunc< EOT > &_full_evaluation)
     moTS (moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion, moSolContinue< EOT > &_continue, eoEvalFunc< EOT > &_full_evaluation)
     Constructor of a moTS specifying all the boxes.
     moTS (moMoveExpl< M > &_move_explorer, moSolContinue< EOT > &_continue, eoEvalFunc< EOT > &_full_evaluation)
     moTS (moMoveExpl< M > &_move_explorer, moSolContinue< EOT > &_continue, eoEvalFunc< EOT > &_full_evaluation)
     Constructor with less parameters.
    bool operator() (EOT &_solution)
     Function which launchs the Tabu Search.
     Function which launchs the Tabu Search.

    Private Types

    typedef M::EOType EOT
     Stop criterion.
    -eoEvalFunc< EOT > & full_evaluation
    full_evaluation
     Full evaluation function.
    @@ -124,7 +124,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -177,7 +177,7 @@ template<class M> - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  _full_evaluation  @@ -218,14 +218,14 @@ template<class M> EOT &  _solution  )  - [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:
    @@ -235,6 +235,8 @@ Algorithm of the tabu search. As a moSA
    Returns:
    TRUE.
    +

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

    Definition at line 102 of file moTS.h.

    @@ -243,7 +245,7 @@ References moTS< M >::co

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html index c7c6289c8..ff35bc3a2 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html @@ -32,14 +32,17 @@ aspiration_criterionmoTSMoveLoopExpl< M > [private] EOT typedefmoTSMoveLoopExpl< M > [private] Fitness typedefmoTSMoveLoopExpl< M > [private] + functor_category()eoBF< const M::EOType &, M::EOType &, void > [static] incremental_evaluationmoTSMoveLoopExpl< M > [private] moTSMoveLoopExpl(moMoveInit< M > &_move_initializer, moNextMove< M > &_next_move_generator, moMoveIncrEval< M > &_incremental_evaluation, moTabuList< M > &_tabu_list, moAspirCrit< M > &_aspiration_criterion)moTSMoveLoopExpl< M > [inline] move_initializermoTSMoveLoopExpl< M > [private] move_selectionmoTSMoveLoopExpl< M > [private] next_move_generatormoTSMoveLoopExpl< M > [private] - operator()(const EOT &_old_solution, EOT &_new_solution)moTSMoveLoopExpl< M > [inline] + operator()(const EOT &_old_solution, EOT &_new_solution)moTSMoveLoopExpl< M > [inline, virtual] tabu_listmoTSMoveLoopExpl< M > [private] -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html index 4cabadf0c..f7321389d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html @@ -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 90 of file moTSMoveLoopExpl.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png index 34c222321..717f30a17 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html index df6a2c281..d8b50ebb1 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list-members.html @@ -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 &_solution)=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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html index 3d8c90135..fb6737aad 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.html @@ -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 Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.png b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.png index 792ce859b..b4c545581 100644 Binary files a/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.png and b/tags/dummy-tag/paradiseo-mo/doc/html/classmo_tabu_list.png differ diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/files.html b/tags/dummy-tag/paradiseo-mo/doc/html/files.html index 39dcd659f..90c2ad610 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/files.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/files.html @@ -61,7 +61,7 @@
    moTS.h [code]
    moTSMoveLoopExpl.h [code]
    -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/functions.html b/tags/dummy-tag/paradiseo-mo/doc/html/functions.html index 44eb95f32..9b77cafad 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/functions.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/functions.html @@ -86,9 +86,9 @@ Here is a list of all documented class members with links to the class documenta
  • first_time : moImprBestFitAspirCrit< M >, moBestImprSelect< M >
  • firstFitnessSaved : moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • firstTime -: moRandImprSelect< M >
  • Fitness -: moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moILS< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >
  • fitness -: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >, moFitSolContinue< EOT >
  • full_evaluation +: moRandImprSelect< M >
  • fitness +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >, moFitSolContinue< EOT >
  • Fitness +: moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moILS< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >
  • full_evaluation : moTS< M >, moSA< M >, moILS< M >, moHC< M >
  • functions : moLSCheckPoint< M >

    - g -

    -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/functions_type.html b/tags/dummy-tag/paradiseo-mo/doc/html/functions_type.html index 94a960574..f6861b44b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/functions_type.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/functions_type.html @@ -45,7 +45,7 @@ : moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moILS< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >
  • moveIterator : moSimpleMoveTabuList< M >
  • solutionIterator : moSimpleSolutionTabuList< M > -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/functions_vars.html b/tags/dummy-tag/paradiseo-mo/doc/html/functions_vars.html index e448ffb58..37f245572 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/functions_vars.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/functions_vars.html @@ -123,7 +123,7 @@

    - v -

    -
    Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
    Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
    diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html b/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html index ca47f413e..5459776ee 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/hierarchy.html @@ -29,7 +29,10 @@
  • Class Members

    • ParadisEO-MO-MovingObjects Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically:
      -
    • moAlgo< EOT > +
    • eoFunctorBase + [external]
        +
      • eoBF< A1, A2, R > + [external] +
      • eoBF< M &, M::EOType::Fitness &, void > + [external] -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/index_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/index_8h-source.html index 19414d79c..1c5f343e3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/index_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/index_8h-source.html @@ -27,7 +27,7 @@ 00066 // c-file-style: "Stroustrup" 00067 // fill-column: 80 00068 // End: -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/main.html b/tags/dummy-tag/paradiseo-mo/doc/html/main.html index 33bd723b5..afe2ae2a0 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/main.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/main.html @@ -25,7 +25,7 @@

        1.1

        Introduction

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

        AUTHORS

        @@ -43,7 +43,7 @@ ParadisEO WebSite : http://paradiseo. Home Pagehttp://paradiseo.gforge.inria.fr

        Installation

        -The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html index 4d4453652..f5f8018c0 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_8h-source.html @@ -97,7 +97,7 @@ 00074 #include <moTSMoveLoopExpl.h> 00075 00076 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_algo_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_algo_8h-source.html index f1bf5a84b..e3cc28a56 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_algo_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_algo_8h-source.html @@ -63,11 +63,11 @@ 00040 #include <eoOp.h> 00041 00043 -00046 template < class EOT > class moAlgo:public eoMonOp < EOT > +00046 template < class EOT > class moAlgo:public eoMonOp < EOT > 00047 {}; 00048 00049 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html index d5c31f7e9..e469b5d97 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html @@ -63,7 +63,7 @@ 00040 00042 00046 template < class M > -00047 class moAspirCrit: public eoBF < const M &, const typename M::EOType::Fitness &, bool > +00047 class moAspirCrit: public eoBF < const M &, const typename M::EOType::Fitness &, bool > 00048 { 00049 public: 00050 @@ -72,7 +72,7 @@ 00056 }; 00057 00058 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html index 7ffae3712..7a3024b5e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html @@ -116,7 +116,7 @@ 00116 }; 00117 00118 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_comparator_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_comparator_8h-source.html index ec419b4f6..26dbe1612 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_comparator_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_comparator_8h-source.html @@ -62,11 +62,11 @@ 00039 00041 00044 template<class EOT> -00045 class moComparator: public eoBF<const EOT &, const EOT &, bool> +00045 class moComparator: public eoBF<const EOT &, const EOT &, bool> 00046 {}; 00047 00048 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html index 814de3f66..3c543aa77 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html @@ -62,11 +62,11 @@ 00039 #include <eoFunctor.h> 00040 00042 -00046 class moCoolingSchedule : public eoUF < double &, bool > +00046 class moCoolingSchedule : public eoUF < double &, bool > 00047 {}; 00048 00049 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html index a46c60d56..e719be5f4 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html @@ -84,7 +84,7 @@ 00077 }; 00078 00079 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html index 25a144764..cff6f8f4a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html @@ -115,7 +115,7 @@ 00118 }; 00119 00120 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html index b0ded89b1..5e2275b35 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_comparator_8h-source.html @@ -75,7 +75,7 @@ 00060 }; 00061 00062 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html index 706bba21d..2843d0371 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html @@ -94,7 +94,7 @@ 00088 }; 00089 00090 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html index d996e0044..15f70f63c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html @@ -94,7 +94,7 @@ 00090 }; 00091 00092 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_8h-source.html index 9172f667f..8d7e4ea18 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_8h-source.html @@ -116,7 +116,7 @@ 00122 }; 00123 00124 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html index fc470c7c4..b90193d1e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html @@ -138,7 +138,7 @@ 00136 }; 00137 00138 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html index 7d395c2dc..a706b0129 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_i_l_s_8h-source.html @@ -77,7 +77,7 @@ 00059 00061 00070 moILS (moAlgo<EOT> & _algorithm, moSolContinue <EOT> & _continue, moComparator<EOT> & _acceptance_criterion, -00071 eoMonOp<EOT> & _perturbation, eoEvalFunc<EOT> & _full_evaluation): +00071 eoMonOp<EOT> & _perturbation, eoEvalFunc<EOT> & _full_evaluation): 00072 algorithm(_algorithm), continu(_continue), acceptance_criterion(_acceptance_criterion), 00073 perturbation(_perturbation), full_evaluation(_full_evaluation) 00074 {} @@ -86,7 +86,7 @@ 00087 moILS (moMoveInit < M > & _move_initializer, moNextMove < M > & _next_move_generator, 00088 moMoveIncrEval < M > & _incremental_evaluation, moMoveSelect < M > & _move_selection, 00089 moSolContinue <EOT> & _continue, moComparator<EOT> & _acceptance_criterion, -00090 eoMonOp<EOT> & _perturbation, eoEvalFunc<EOT> & _full_evaluation): +00090 eoMonOp<EOT> & _perturbation, eoEvalFunc<EOT> & _full_evaluation): 00091 algorithm( *new moHC<M>(_move_initializer, _next_move_generator, _incremental_evaluation, _move_selection, _full_evaluation) ), 00092 continu(_continue), acceptance_criterion(_acceptance_criterion), perturbation(_perturbation), full_evaluation(_full_evaluation) 00093 {} @@ -95,8 +95,8 @@ 00108 moILS (moMoveInit <M> & _move_initializer, moNextMove <M> & _next_move_generator, 00109 moMoveIncrEval <M> & _incremental_evaluation, moTabuList <M> & _tabu_list, 00110 moAspirCrit <M> & _aspiration_criterion, moSolContinue <EOT> & _moTS_continue, -00111 moSolContinue <EOT> & _continue, moComparator<EOT> & _acceptance_criterion, eoMonOp<EOT> & _perturbation, -00112 eoEvalFunc<EOT> & _full_evaluation): +00111 moSolContinue <EOT> & _continue, moComparator<EOT> & _acceptance_criterion, eoMonOp<EOT> & _perturbation, +00112 eoEvalFunc<EOT> & _full_evaluation): 00113 algorithm( *new moTS<M>(_move_initializer, _next_move_generator, _incremental_evaluation, _tabu_list, _aspiration_criterion, 00114 _moTS_continue, _full_evaluation) ), 00115 continu(_continue), acceptance_criterion(_acceptance_criterion), perturbation(_perturbation), full_evaluation(_full_evaluation) @@ -105,7 +105,7 @@ 00119 00130 moILS (moRandMove<M> & _random_move_generator, moMoveIncrEval <M> & _incremental_evaluation, moSolContinue <EOT> & _moSA_continue, 00131 double _initial_temperature, moCoolingSchedule & _cooling_schedule, moSolContinue <EOT> & _continue, -00132 moComparator<EOT> & _acceptance_criterion, eoMonOp<EOT> & _perturbation, eoEvalFunc<EOT> & _full_evaluation): +00132 moComparator<EOT> & _acceptance_criterion, eoMonOp<EOT> & _perturbation, eoEvalFunc<EOT> & _full_evaluation): 00133 algorithm( *new moSA<M>(_random_move_generator, _incremental_evaluation, _moSA_continue, _initial_temperature, 00134 _cooling_schedule, _full_evaluation) ), 00135 continu(_continue), acceptance_criterion(_acceptance_criterion), perturbation(_perturbation), full_evaluation(_full_evaluation) @@ -161,13 +161,13 @@ 00194 00196 moComparator<EOT> & acceptance_criterion; 00197 -00199 eoMonOp<EOT> & perturbation; +00199 eoMonOp<EOT> & perturbation; 00200 -00202 eoEvalFunc<EOT> & full_evaluation; +00202 eoEvalFunc<EOT> & full_evaluation; 00203 }; 00204 00205 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html index dfaac3da9..49bd13a35 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -110,7 +110,7 @@ 00103 }; 00104 00105 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html index 65aaaae57..809ee540a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html @@ -103,7 +103,7 @@ 00100 }; 00101 00102 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html index fb6c65e3c..45fdbe23b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html @@ -63,7 +63,7 @@ 00040 00042 00045 template < class M > -00046 class moLSCheckPoint:public eoBF < const M &, const typename M::EOType &, void > +00046 class moLSCheckPoint:public eoBF < const M &, const typename M::EOType &, void > 00047 { 00048 public: 00049 @@ -90,7 +90,7 @@ 00081 }; 00082 00083 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html index c296051c6..02d20c95f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html @@ -84,7 +84,7 @@ 00077 }; 00078 00079 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_8h-source.html index 4ee04298b..ab944dd93 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_8h-source.html @@ -64,7 +64,7 @@ 00041 00043 00048 template < class EOT > -00049 class moMove:public eoUF < EOT &, void > +00049 class moMove:public eoUF < EOT &, void > 00050 { 00051 public: 00052 @@ -72,7 +72,7 @@ 00055 }; 00056 00057 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_expl_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_expl_8h-source.html index a130979bc..521114e1f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_expl_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_expl_8h-source.html @@ -63,11 +63,11 @@ 00040 00042 00045 template < class M > -00046 class moMoveExpl : public eoBF < const typename M::EOType &, typename M::EOType &, void > +00046 class moMoveExpl : public eoBF < const typename M::EOType &, typename M::EOType &, void > 00047 {}; 00048 00049 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html index 88cde9780..2fcbfdee5 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html @@ -63,11 +63,11 @@ 00040 00042 00048 template < class M > -00049 class moMoveIncrEval:public eoBF < const M &, const typename M::EOType &, typename M::EOType::Fitness > +00049 class moMoveIncrEval:public eoBF < const M &, const typename M::EOType &, typename M::EOType::Fitness > 00050 {}; 00051 00052 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_init_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_init_8h-source.html index 381986524..a1c1cfcaa 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_init_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_init_8h-source.html @@ -63,11 +63,11 @@ 00040 00042 00046 template < class M > -00047 class moMoveInit:public eoBF < M &, const typename M::EOType &, void > +00047 class moMoveInit:public eoBF < M &, const typename M::EOType &, void > 00048 {}; 00049 00050 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html index 5954ede6e..8e09bdcd1 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html @@ -68,7 +68,7 @@ 00048 {}; 00049 00050 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_select_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_select_8h-source.html index 4e7243b77..ef546b164 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_select_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_move_select_8h-source.html @@ -65,7 +65,7 @@ 00042 00044 00049 template < class M > -00050 class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, void > +00050 class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, void > 00051 { 00052 public: 00054 typedef typename M::EOType::Fitness Fitness; @@ -79,7 +79,7 @@ 00074 }; 00075 00076 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_next_move_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_next_move_8h-source.html index 72a30764e..0a68a2854 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_next_move_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_next_move_8h-source.html @@ -63,11 +63,11 @@ 00040 00042 00046 template < class M > -00047 class moNextMove:public eoBF < M &, const typename M::EOType &, bool > +00047 class moNextMove:public eoBF < M &, const typename M::EOType &, bool > 00048 {}; 00049 00050 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html index 24052329a..dd295b068 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html @@ -85,7 +85,7 @@ 00075 }; 00076 00077 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html index 012870058..10ade6802 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html @@ -125,7 +125,7 @@ 00121 }; 00122 00123 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html index 9f443bb37..6b9a51167 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html @@ -110,7 +110,7 @@ 00112 return; 00113 } 00114 -00115 index = rng.random (better_fitnesses.size ()); +00115 index = rng.random (better_fitnesses.size ()); 00116 00117 _move = better_moves[index]; 00118 _fitness = better_fitnesses[index]; @@ -128,7 +128,7 @@ 00134 }; 00135 00136 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_move_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_move_8h-source.html index e5980bd56..ba3b18de7 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_move_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_rand_move_8h-source.html @@ -63,11 +63,11 @@ 00040 00042 00045 template < class M > -00046 class moRandMove:public eoUF < M &, void > +00046 class moRandMove:public eoUF < M &, void > 00047 {}; 00048 00049 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_s_a_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_s_a_8h-source.html index 63759a432..572d6ac04 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_s_a_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_s_a_8h-source.html @@ -121,7 +121,7 @@ 00119 delta_fit = -delta_fit; 00120 } 00121 -00122 if ( (incremental_fitness > _solution.fitness()) || (rng.uniform () < exp (delta_fit / temperature)) ) +00122 if ( (incremental_fitness > _solution.fitness()) || (rng.uniform () < exp (delta_fit / temperature)) ) 00123 { 00124 move(_solution); 00125 _solution.fitness(incremental_fitness); @@ -159,7 +159,7 @@ 00163 }; 00164 00165 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html index 17aa5ae08..6efd76aa3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html @@ -160,7 +160,7 @@ 00152 }; 00153 00154 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html index b950e1137..acc5a5348 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html @@ -163,7 +163,7 @@ 00157 }; 00158 00159 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html index 1be0c0438..42985f5b2 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html @@ -64,7 +64,7 @@ 00041 00043 00047 template < class EOT > -00048 class moSolContinue:public eoUF < const EOT &, bool > +00048 class moSolContinue:public eoUF < const EOT &, bool > 00049 { 00050 public: 00052 @@ -72,7 +72,7 @@ 00056 }; 00057 00058 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html index e9ee25d73..fc896b9d4 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html @@ -140,7 +140,7 @@ 00140 }; 00141 00142 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_8h-source.html index cda993feb..009a381b4 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_8h-source.html @@ -138,7 +138,7 @@ 00149 }; 00150 00151 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html index fbaedce6b..df6a5cc9a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html @@ -158,7 +158,7 @@ 00161 }; 00162 00163 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html b/tags/dummy-tag/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html index b77559429..00210785d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html @@ -62,7 +62,7 @@ 00039 #include <eoFunctor.h> 00040 00042 -00046 template < class M > class moTabuList: public eoBF < const M &, const typename M::EOType &, bool > +00046 template < class M > class moTabuList: public eoBF < const M &, const typename M::EOType &, bool > 00047 { 00048 public: 00049 @@ -79,7 +79,7 @@ 00073 }; 00074 00075 #endif -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/search.php b/tags/dummy-tag/paradiseo-mo/doc/html/search.php index 0bf0aeec0..740c4c9e6 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/search.php +++ b/tags/dummy-tag/paradiseo-mo/doc/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
        Generated on Fri Feb 29 16:32:25 2008 for ParadisEO-MO-MovingObjects by  +
        Generated on Fri Feb 29 17:03:44 2008 for ParadisEO-MO-MovingObjects by  doxygen 1.4.7
        diff --git a/tags/dummy-tag/paradiseo-mo/doc/html/tree.html b/tags/dummy-tag/paradiseo-mo/doc/html/tree.html index db3597df6..a51ec4fd8 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/html/tree.html +++ b/tags/dummy-tag/paradiseo-mo/doc/html/tree.html @@ -105,64 +105,104 @@

        o+Class Hierarchy

        -

        |o*moAlgo< EOT >

        -

        |o+moAspirCrit< M >

        +

        |o+eoFunctorBase [external]

        -

        |o+moComparator< EOT >

        - -

        |o+moCoolingSchedule

        -

        o*Class Members

        -

        \+File List

        -
        +

        \+File List

        +

         o*index.h

         o*mo.h

         o*moAlgo.h

        diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex index 5184ae772..e1536fefb 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_algo.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps index fbf0b26ef..7a0252d70 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex index 4f97ce89e..fb42232f3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_aspir_crit.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps index f9c367972..e1504ce28 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex index f1c755153..9c8563a2b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_best_impr_select.tex @@ -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} @@ -23,7 +23,7 @@ typedef M::EOType::Fitness \bf{Fitness}\label{classmo_best_impr_select_c4ae17435 void \bf{init} (const \bf{Fitness} \&\_\-fitness) \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness) -\begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item void \bf{operator()} (M \&\_\-move, \bf{Fitness} \&\_\-fitness) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -75,7 +75,7 @@ References mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelec \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_5c0729fd316b0ef78406bce5ca91de2a} -Function that indicates if the current move has not improved the fitness. +\doxyref{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. @@ -94,7 +94,7 @@ Definition at line 77 of file mo\-Best\-Impr\-Select.h. References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_best_impr_select_33b3de7bd322f737eb97cce9a5404527} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_33b3de7bd322f737eb97cce9a5404527} Procedure which saved the best move and fitness. @@ -106,6 +106,8 @@ Procedure which saved the best move and fitness. \end{Desc} +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. + Definition at line 95 of file mo\-Best\-Impr\-Select.h. References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps index ed564a84f..d7869534e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 242.424 +%%BoundingBox: 0 0 500 484.848 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.03125 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 (moComparator< EOT >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw (moFitComparator< EOT >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -187,10 +189,20 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moComparator< EOT >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box (moFitComparator< EOT >) 0 0 box % ----- relations ----- +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in solid 1 0 0.25 out solid diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex index d9bbd7643..109c4139f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_comparator.tex @@ -8,7 +8,7 @@ Template for classes which need to compare two EOT and indicate if the first is Inheritance diagram for mo\-Comparator$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_comparator} +\includegraphics[height=4cm]{classmo_comparator} \end{center} \end{figure} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps index a1d0c2d59..099ff0bb2 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex index a84339123..a4d0ca6ec 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps index 9a4b2773b..92ecef949 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex index 51515b066..c9a49cabe 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex @@ -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 \&\_\-temperature) -\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -58,10 +58,10 @@ Definition at line 55 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 \_\-temperature})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_95b075e9786a5cc984ef1bb59a2107e4} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-temperature})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_95b075e9786a5cc984ef1bb59a2107e4} -Function which proceeds to the cooling. +\doxyref{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 65 of file mo\-Exponential\-Cooling\-Schedule.h. References ratio, and threshold. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps index 04ffcb96d..7057473a9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex index c8d72eff1..9ebdde510 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_first_impr_select.tex @@ -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_64763ce3 virtual void \bf{init} (const \bf{Fitness} \&\_\-fitness) \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness) -\begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item void \bf{operator()} (M \&\_\-move, \bf{Fitness} \&\_\-fitness) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -78,7 +78,7 @@ References mo\-First\-Impr\-Select$<$ M $>$::initial\_\-fitness, and mo\-First\- \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_f68b7ee7b35bf7347c16006f0587d313} -Function that indicates if the current move has not improved the fitness. +\doxyref{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. @@ -97,7 +97,7 @@ Definition at line 75 of file mo\-First\-Impr\-Select.h. References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::initial\_\-fitness, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_976569efd882886cb13184daeba79766} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_976569efd882886cb13184daeba79766} Procedure which saved the best move and fitness. @@ -109,6 +109,8 @@ Procedure which saved the best move and fitness. \end{Desc} +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. + Definition at line 96 of file mo\-First\-Impr\-Select.h. References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fitness, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps index 802516e3a..902d882c9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 242.424 +%%BoundingBox: 0 0 500 484.848 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.03125 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 (moFitComparator< EOT >) cw (moComparator< EOT >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moFitComparator< EOT >) 0 0 box (moComparator< EOT >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex index 079b484e4..a52eeae21 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_comparator.tex @@ -8,14 +8,14 @@ Comparison according to the fitness. Inheritance diagram for mo\-Fit\-Comparator$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_fit_comparator} +\includegraphics[height=4cm]{classmo_fit_comparator} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item bool \bf{operator()} (const EOT \&\_\-solution1, const EOT \&\_\-solution2) -\begin{CompactList}\small\item\em Function which makes the comparison and gives the result. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} which makes the comparison and gives the result. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} @@ -35,7 +35,7 @@ Definition at line 46 of file mo\-Fit\-Comparator.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Comparator}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution1}, const EOT \& {\em \_\-solution2})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_comparator_c920d5a49deb16710daf1e5fcde6b16c} -Function which makes the comparison and gives the result. +\doxyref{Function} which makes the comparison and gives the result. \begin{Desc} \item[Parameters:] diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps index fba9a3dd0..020df214d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 239.521 +%%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.0875 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 (moFitSolContinue< EOT >) cw (moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moFitSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex index 1cd050400..d676c4806 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex @@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic. Inheritance diagram for mo\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_fit_sol_continue} +\includegraphics[height=4cm]{classmo_fit_sol_continue} \end{center} \end{figure} \subsection*{Public Types} @@ -23,7 +23,7 @@ typedef EOT::Fitness \bf{Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bd \bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} \_\-fitness) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool \bf{operator()} (const EOT \&\_\-solution) -\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stopping criterion. \item\end{CompactList}\item void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -65,10 +65,10 @@ Definition at line 57 of file mo\-Fit\-Sol\-Continue.h. \subsection{Member Function Documentation} \index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!operator()@{operator()}} \index{operator()@{operator()}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_ce4e02895c13bfd131fc759adf83798f} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_ce4e02895c13bfd131fc759adf83798f} -Function that activates the stopping criterion. +\doxyref{Function} that activates the stopping criterion. Indicates if the fitness threshold has not yet been reached. @@ -81,6 +81,8 @@ Indicates if the fitness threshold has not yet been reached. \item[Returns:]true or false according to the value of the fitness. \end{Desc} +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. + Definition at line 67 of file mo\-Fit\-Sol\-Continue.h. References mo\-Fit\-Sol\-Continue$<$ EOT $>$::fitness.\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!init@{init}} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps index c9e65107d..c73c60ba3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex index 409efb3fd..298201777 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -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 int \_\-generation\-Maximum\-Number) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool \bf{operator()} (const EOT \&\_\-solution) -\begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{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 54 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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_2fd5f2f10b6d6208412582578fad48ea} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_2fd5f2f10b6d6208412582578fad48ea} -Function that activates the stop criterion. +\doxyref{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,6 +78,8 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[Returns:]true or false according to the current generation number. \end{Desc} +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. + Definition at line 66 of file mo\-Gen\-Sol\-Continue.h. References mo\-Gen\-Sol\-Continue$<$ EOT $>$::generation\-Maximum\-Number, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::generation\-Number.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex index 6d1471054..0888e3c45 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c.tex @@ -8,12 +8,12 @@ Hill Climbing (HC). \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-move\_\-explorer, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-move\_\-explorer, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item bool \bf{operator()} (\bf{EOT} \&\_\-solution) -\begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} which launches the HC. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item @@ -29,7 +29,7 @@ typedef EOT::Fitness \bf{Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd4 \bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-explorer}\label{classmo_h_c_ec4e702a6ec240f40ff9d262c36d080b} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_h_c_1175c588c19d3658cfc690d5f3f8d825} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_h_c_1175c588c19d3658cfc690d5f3f8d825} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -48,7 +48,7 @@ Definition at line 49 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\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_44a35bd30df6e79cff95a31b84889bd7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_44a35bd30df6e79cff95a31b84889bd7} Full constructor. @@ -64,7 +64,7 @@ All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl Definition at line 69 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_5002f969ef0a4d959610158fc62f137a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_5002f969ef0a4d959610158fc62f137a} Light constructor. @@ -83,10 +83,10 @@ Definition at line 82 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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_b739f9586b647e32bf31605066f984ad} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-HC}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_b739f9586b647e32bf31605066f984ad} -Function which launches the HC. +\doxyref{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. @@ -99,6 +99,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 94 of file mo\-HC.h. References mo\-HC$<$ M $>$::full\_\-evaluation, and mo\-HC$<$ M $>$::move\_\-explorer. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps index 1383bbf1b..1240e010d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex index 4dca17dd0..cc9269a9b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex @@ -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 66 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\_\-solution}, \bf{EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_fe9362c10d74a5e6ed09b56345396192} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-old\_\-solution}, \bf{EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_fe9362c10d74a5e6ed09b56345396192} 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 79 of file mo\-HCMove\-Loop\-Expl.h. References mo\-HCMove\-Loop\-Expl$<$ M $>$::incremental\_\-evaluation, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-initializer, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-selection, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move\_\-generator. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex index efaee4402..4f1f70d77 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_i_l_s.tex @@ -8,16 +8,16 @@ Iterated Local Search (ILS). \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-ILS} (\bf{mo\-Algo}$<$ \bf{EOT} $>$ \&\_\-algorithm, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-ILS} (\bf{mo\-Algo}$<$ \bf{EOT} $>$ \&\_\-algorithm, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \&\_\-perturbation, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Generic constructor. \item\end{CompactList}\item -\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-move\_\-selection, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \&\_\-perturbation, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Constructor for using a \doxyref{mo\-HC}{p.}{classmo_h_c} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. \item\end{CompactList}\item -\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-mo\-TS\_\-continue, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-mo\-TS\_\-continue, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \&\_\-perturbation, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Constructor for using a \doxyref{mo\-TS}{p.}{classmo_t_s} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. \item\end{CompactList}\item -\bf{mo\-ILS} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-mo\-SA\_\-continue, double \_\-initial\_\-temperature, \bf{mo\-Cooling\-Schedule} \&\_\-cooling\_\-schedule, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, eo\-Mon\-Op$<$ \bf{EOT} $>$ \&\_\-perturbation, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-ILS} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-mo\-SA\_\-continue, double \_\-initial\_\-temperature, \bf{mo\-Cooling\-Schedule} \&\_\-cooling\_\-schedule, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \&\_\-acceptance\_\-criterion, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \&\_\-perturbation, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Constructor for using a \doxyref{mo\-SA}{p.}{classmo_s_a} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. \item\end{CompactList}\item bool \bf{operator()} (\bf{EOT} \&\_\-solution) -\begin{CompactList}\small\item\em Function which launches the ILS. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} which launches the ILS. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item @@ -39,10 +39,10 @@ typedef EOT::Fitness \bf{Fitness}\label{classmo_i_l_s_8c464a9eae064a78eff75d4c72 \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& \bf{acceptance\_\-criterion}\label{classmo_i_l_s_295f6d0342c67bd3dc4cb82e2adc26be} \begin{CompactList}\small\item\em The acceptance criterion. \item\end{CompactList}\item -eo\-Mon\-Op$<$ \bf{EOT} $>$ \& \bf{perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2} +\bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \& \bf{perturbation}\label{classmo_i_l_s_f667a1bda06b6d221292df9aba3db8a2} \begin{CompactList}\small\item\em The perturbation generator. \item\end{CompactList}\item -eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_i_l_s_8e8c383ac6ec34aaf071fa18bb54be67} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_i_l_s_8e8c383ac6ec34aaf071fa18bb54be67} \begin{CompactList}\small\item\em The full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -61,7 +61,7 @@ Definition at line 50 of file mo\-ILS.h. \subsection{Constructor \& Destructor Documentation} \index{moILS@{mo\-ILS}!moILS@{moILS}} \index{moILS@{moILS}!moILS@{mo\-ILS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Algo}$<$ \bf{EOT} $>$ \& {\em \_\-algorithm}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c83f81ba0836ae262305efa15eeb3da2} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Algo}$<$ \bf{EOT} $>$ \& {\em \_\-algorithm}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_c83f81ba0836ae262305efa15eeb3da2} Generic constructor. @@ -77,7 +77,7 @@ Generic constructor using a \doxyref{mo\-Algo}{p.}{classmo_algo} Definition at line 70 of file mo\-ILS.h.\index{moILS@{mo\-ILS}!moILS@{moILS}} \index{moILS@{moILS}!moILS@{mo\-ILS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_6d684a1d13ad224a911c8b0277812297} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-move\_\-selection}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_6d684a1d13ad224a911c8b0277812297} Constructor for using a \doxyref{mo\-HC}{p.}{classmo_h_c} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. @@ -91,7 +91,7 @@ Constructor for using a \doxyref{mo\-HC}{p.}{classmo_h_c} for the \doxyref{mo\-A Definition at line 87 of file mo\-ILS.h.\index{moILS@{mo\-ILS}!moILS@{moILS}} \index{moILS@{moILS}!moILS@{mo\-ILS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-mo\-TS\_\-continue}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_740ac81a0d06eb471592ba0861d3a6d7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-mo\-TS\_\-continue}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_740ac81a0d06eb471592ba0861d3a6d7} Constructor for using a \doxyref{mo\-TS}{p.}{classmo_t_s} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. @@ -105,7 +105,7 @@ Constructor for using a \doxyref{mo\-TS}{p.}{classmo_t_s} for the \doxyref{mo\-A Definition at line 108 of file mo\-ILS.h.\index{moILS@{mo\-ILS}!moILS@{moILS}} \index{moILS@{moILS}!moILS@{mo\-ILS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-mo\-SA\_\-continue}, double {\em \_\-initial\_\-temperature}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-cooling\_\-schedule}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, eo\-Mon\-Op$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_36bab16abf36957dac36c467b86385bc} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-ILS}$<$ M $>$::\bf{mo\-ILS} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-mo\-SA\_\-continue}, double {\em \_\-initial\_\-temperature}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-cooling\_\-schedule}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{mo\-Comparator}$<$ \bf{EOT} $>$ \& {\em \_\-acceptance\_\-criterion}, \bf{eo\-Mon\-Op}$<$ \bf{EOT} $>$ \& {\em \_\-perturbation}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_36bab16abf36957dac36c467b86385bc} Constructor for using a \doxyref{mo\-SA}{p.}{classmo_s_a} for the \doxyref{mo\-Algo}{p.}{classmo_algo}. @@ -122,10 +122,10 @@ Definition at line 130 of file mo\-ILS.h. \subsection{Member Function Documentation} \index{moILS@{mo\-ILS}!operator()@{operator()}} \index{operator()@{operator()}!moILS@{mo\-ILS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-ILS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_i_l_s_3f6b950e5a6c363f04b8d4c259502488} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-ILS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_i_l_s_3f6b950e5a6c363f04b8d4c259502488} -Function which launches the ILS. +\doxyref{Function} which launches the ILS. The ILS has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a}, the \doxyref{mo\-TS}{p.}{classmo_t_s} and the \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionnary algorithm. @@ -138,6 +138,8 @@ The ILS 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 146 of file mo\-ILS.h. References mo\-ILS$<$ M $>$::acceptance\_\-criterion, mo\-ILS$<$ M $>$::algorithm, mo\-ILS$<$ M $>$::continu, mo\-ILS$<$ M $>$::full\_\-evaluation, and mo\-ILS$<$ M $>$::perturbation. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps index 41cee35a0..a00a3c3cb 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex index 2077ce9f8..463c3fa4d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex @@ -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_ffa451a14ff4ea86fb8bd9f \begin{CompactList}\small\item\em Initialisation procedure. \item\end{CompactList}\item bool \bf{operator()} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness) -\begin{CompactList}\small\item\em Function that indicates if the current fitness is better that the already saved fitness. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current fitness is better that the already saved fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -56,7 +56,7 @@ Definition at line 47 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 \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_b6e5e96d57a6b846033fc22a9951b067} -Function that indicates if the current fitness is better that the already saved fitness. +\doxyref{Function} that indicates if the current fitness is better that the already saved fitness. The first time, the function only saved the current move and fitness. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps index bc4ea56dc..5f2df0014 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex index 0f91e98a2..b997c2516 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex @@ -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 47 of file mo\-It\-Rand\-Next\-Move.h. The constructor. -Parameters only for initialising the attributes. +\doxyref{Parameters} only for initialising the attributes. \begin{Desc} \item[Parameters:] diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex index d14d35f38..085ec9560 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex @@ -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 \&\_\-solution) -\begin{CompactList}\small\item\em Function which launches the checkpointing. \item\end{CompactList}\item -void \bf{add} (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-function) +\begin{CompactList}\small\item\em \doxyref{Function} which launches the checkpointing. \item\end{CompactList}\item +void \bf{add} (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-function) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ \bf{functions}\label{classmo_l_s_check_point_56a7427a6aebac7955c22bab302c050a} +std::vector$<$ \bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ \bf{functions}\label{classmo_l_s_check_point_56a7427a6aebac7955c22bab302c050a} \begin{CompactList}\small\item\em Vector of functions. \item\end{CompactList}\end{CompactItemize} @@ -37,7 +43,7 @@ Definition at line 46 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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_e9b9d41e40dd7bab648327686b2b938d} -Function which launches the checkpointing. +\doxyref{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 57 of file mo\-LSCheck\-Point.h. References mo\-LSCheck\-Point$<$ M $>$::functions.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}} \index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::add (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-function})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_f95f2dc556cdfbdc81688562ca95202d} +\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 \_\-function})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_f95f2dc556cdfbdc81688562ca95202d} Procedure which add a new function to the function vector. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps index 35d64af4d..3e62629a9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex index 619e63641..42fb9ba1b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex @@ -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 \&\_\-current\_\-temperature) -\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -58,10 +58,10 @@ Definition at line 55 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 \_\-current\_\-temperature})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_b0a1886aaa7ee2a0c8e929e55ca321ce} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-current\_\-temperature})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_b0a1886aaa7ee2a0c8e929e55ca321ce} -Function which proceeds to the cooling. +\doxyref{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:]true if the new temperature (current temperature - quantity) is greater than the threshold, false otherwise. \end{Desc} +Implements \bf{eo\-UF$<$ double \&, bool $>$}. + Definition at line 65 of file mo\-Linear\-Cooling\-Schedule.h. References quantity, and threshold. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex index 5cd25c61c..cc8f13ae3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps index 708dd0b50..18fb8889f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex index f0a20eb24..74504c401 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_expl.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex index 93e64f287..1152069a6 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex index c3ecf461a..df4cfe81b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_init.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps index 76326be37..c6a78b5b1 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex index 102be85ad..66752874e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps index 86a37c002..b61e2bf9f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex index d682c30d0..c883830cb 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_move_select.tex @@ -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_8148ccc0e6fbd2 virtual void \bf{init} (const \bf{Fitness} \&\_\-fitness)=0 \begin{CompactList}\small\item\em Procedure which initialises all that the move selector needs including the initial fitness. \item\end{CompactList}\item virtual bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness)=0 -\begin{CompactList}\small\item\em Function which updates the best solutions. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{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_im \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool \bf{mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_5b4d3b2f030cca80c563c3db0c4af404} -Function which updates the best solutions. +\doxyref{Function} which updates the best solutions. \begin{Desc} \item[Parameters:] diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps index d9586a593..08b997f12 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex index b69390f0b..038a60577 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_next_move.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps index 4a1de4c86..f5d50a373 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex index 1ebd893bc..b05a9cb0d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex @@ -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*{Public Member Functions} \begin{CompactItemize} \item bool \bf{operator()} (const M \&\_\-move, const typename M::EOType::Fitness \&\_\-fitness) -\begin{CompactList}\small\item\em Function which describes the aspiration criterion behaviour. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{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 47 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 \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_aspir_crit_289aac56f03c4651fcbcec4a91fb6fd6} -Function which describes the aspiration criterion behaviour. +\doxyref{Function} which describes the aspiration criterion behaviour. Does nothing. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps index 6c532ffcd..67d7d5048 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 193.237 +%%BoundingBox: 0 0 500 386.473 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.5875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.29375 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 (moNoFitImprSolContinue< EOT >) cw (moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moNoFitImprSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex index 0314d36c5..a8d573b98 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex @@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic. Inheritance diagram for mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_no_fit_impr_sol_continue} +\includegraphics[height=4cm]{classmo_no_fit_impr_sol_continue} \end{center} \end{figure} \subsection*{Public Types} @@ -23,7 +23,7 @@ typedef EOT::Fitness \bf{Fitness}\label{classmo_no_fit_impr_sol_continue_64c184d \bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int \_\-max\-Number\-Of\-Iteration\-Without\-Improvement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool \bf{operator()} (const EOT \&\_\-solution) -\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stopping criterion. \item\end{CompactList}\item void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -74,10 +74,10 @@ Definition at line 57 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. \subsection{Member Function Documentation} \index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!operator()@{operator()}} \index{operator()@{operator()}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_d8966c73cbe625644df9061377f7221a} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_d8966c73cbe625644df9061377f7221a} -Function that activates the stopping criterion. +\doxyref{Function} that activates the stopping criterion. Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). \begin{Desc} \item[Parameters:] @@ -88,6 +88,8 @@ Indicates if the fitness has not been improved since a given number of iteration \item[Returns:]true or false. \end{Desc} +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. + Definition at line 67 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::fitness, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!init@{init}} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps index 74d2fc0f6..fe55210a4 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex index cb9743f3f..0d0622250 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex @@ -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_3bff2fdb9 void \bf{init} (const \bf{Fitness} \&\_\-fitness) \begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item bool \bf{update} (const M \&\_\-move, const \bf{Fitness} \&\_\-fitness) -\begin{CompactList}\small\item\em Function that updates the fitness and move vectors. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that updates the fitness and move vectors. \item\end{CompactList}\item void \bf{operator()} (M \&\_\-move, \bf{Fitness} \&\_\-fitness) \begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -80,7 +80,7 @@ References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\ \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-move}, const \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_b20cfd0164266aa75960cba3c1673f69} -Function that updates the fitness and move vectors. +\doxyref{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. @@ -99,7 +99,7 @@ Definition at line 80 of file mo\-Rand\-Impr\-Select.h. References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-moves, mo\-Rand\-Impr\-Select$<$ M $>$::first\-Time, and mo\-Rand\-Impr\-Select$<$ M $>$::initial\_\-fitness.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_rand_impr_select_1bc88f10830960c1d88e22e444c4e670} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-move}, \bf{Fitness} \& {\em \_\-fitness})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_1bc88f10830960c1d88e22e444c4e670} The move selection. @@ -113,9 +113,11 @@ One the saved move is randomly chosen. \end{Desc} +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. + Definition at line 100 of file mo\-Rand\-Impr\-Select.h. -References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-moves, and mo\-Rand\-Impr\-Select$<$ M $>$::first\-Time. +References mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-fitnesses, mo\-Rand\-Impr\-Select$<$ M $>$::better\_\-moves, mo\-Rand\-Impr\-Select$<$ M $>$::first\-Time, and eo\-Rng::random(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex index 5c76871d6..135c99254 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_rand_move.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex index 97777c58a..d5571e9ef 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_s_a.tex @@ -8,7 +8,7 @@ Simulated Annealing (SA). \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, double \_\-initial\_\-temperature, \bf{mo\-Cooling\-Schedule} \&\_\-cooling\_\-schedule, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-random\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, double \_\-initial\_\-temperature, \bf{mo\-Cooling\-Schedule} \&\_\-cooling\_\-schedule, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item bool \bf{operator()} (\bf{EOT} \&\_\-solution) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} @@ -39,7 +39,7 @@ double \bf{initial\_\-temperature}\label{classmo_s_a_e07bf4ca64248e94ab85e8a1ba3 \bf{mo\-Cooling\-Schedule} \& \bf{cooling\_\-schedule}\label{classmo_s_a_f514ae01cdfc67bf0b87d5389b3792e5} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_s_a_ace30095ffc4924d84e14a0e59f7746f} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_s_a_ace30095ffc4924d84e14a0e59f7746f} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -58,7 +58,7 @@ Definition at line 53 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 \_\-random\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, double {\em \_\-initial\_\-temperature}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-cooling\_\-schedule}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_12e7da3a56b82daa29a30d1254da5823} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-SA}$<$ M $>$::\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-random\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, double {\em \_\-initial\_\-temperature}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-cooling\_\-schedule}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_12e7da3a56b82daa29a30d1254da5823} SA constructor. @@ -77,7 +77,7 @@ Definition at line 74 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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_bea8176b0c05a96696b2ab29d3f3c544} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-SA}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_bea8176b0c05a96696b2ab29d3f3c544} function that launches the SA algorithm. @@ -93,9 +93,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 89 of file mo\-SA.h. -References mo\-SA$<$ M $>$::continu, mo\-SA$<$ M $>$::cooling\_\-schedule, mo\-SA$<$ M $>$::full\_\-evaluation, mo\-SA$<$ M $>$::incremental\_\-evaluation, mo\-SA$<$ M $>$::initial\_\-temperature, and mo\-SA$<$ M $>$::random\_\-move\_\-generator. +References mo\-SA$<$ M $>$::continu, mo\-SA$<$ M $>$::cooling\_\-schedule, mo\-SA$<$ M $>$::full\_\-evaluation, mo\-SA$<$ M $>$::incremental\_\-evaluation, mo\-SA$<$ M $>$::initial\_\-temperature, mo\-SA$<$ M $>$::random\_\-move\_\-generator, and eo\-Rng::uniform(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps index 624cb75de..b0dcef476 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex index 29d7657c1..1d143fbe9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex @@ -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} @@ -27,7 +27,7 @@ typedef std::list$<$ M $>$::iterator \bf{move\-Iterator}\label{classmo_simple_mo \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item bool \bf{operator()} (const M \&\_\-move, const \bf{EOT} \&\_\-solution) -\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item void \bf{add} (const M \&\_\-move, const \bf{EOT} \&\_\-solution) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item void \bf{update} () @@ -68,7 +68,7 @@ Definition at line 46 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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_8d38f296f3d7721025820f16f25fcf7e} -Function that indicates if, in a given state, the \_\-move is tabu or not. +\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps index e46012fd0..06f8e8fc5 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex index 6a96c6fd9..d3942cec2 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex @@ -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} @@ -26,7 +26,7 @@ typedef std::list$<$ \bf{EOT} $>$::iterator \bf{solution\-Iterator}\label{classm \bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int \_\-memory\_\-maximum\_\-size) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item bool \bf{operator()} (const M \&\_\-move, const \bf{EOT} \&\_\-solution) -\begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item void \bf{add} (const M \&\_\-move, const \bf{EOT} \&\_\-solution) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item void \bf{update} () @@ -84,7 +84,7 @@ Definition at line 60 of file mo\-Simple\-Solution\-Tabu\-List.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-move}, const \bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_9052858ae3e6765cbe4c344bdae6c692} -Function that indicates if, in a given state, the \_\-move is tabu or not. +\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps index 34ec5563d..3914bf1d9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 48.3092 +%%BoundingBox: 0 0 500 96.6184 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 10.35 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5.175 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 4 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 (moFitSolContinue< EOT >) cw (moGenSolContinue< EOT >) cw (moNoFitImprSolContinue< EOT >) cw @@ -190,6 +192,8 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moSolContinue< EOT >) 1.5 1 box + (eoUF< const EOT &, bool >) 1.5 2 box + (eoFunctorBase) 1.5 3 box (moFitSolContinue< EOT >) 0 0 box (moGenSolContinue< EOT >) 1 0 box (moNoFitImprSolContinue< EOT >) 2 0 box @@ -197,6 +201,14 @@ boundx scalefactor div boundy scalefactor div scale % ----- relations ----- +solid +0 1.5 1 out +solid +1 1.5 2 in +solid +0 1.5 2 out +solid +1 1.5 3 in solid 1 1.5 0.25 out solid diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex index fc282875f..c8b042e11 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_sol_continue.tex @@ -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=1.35266cm]{classmo_sol_continue} +\includegraphics[height=2.70531cm]{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 (\doxyref{eo\-UF}). diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps index ab211e5df..944e80b1e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 194.175 +%%BoundingBox: 0 0 500 388.35 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.575 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.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 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (moSteadyFitSolContinue< EOT >) cw (moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (moSteadyFitSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex index 5ab93e0b6..a47d0107f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex @@ -8,7 +8,7 @@ One possible stopping criterion for a solution-based heuristic. Inheritance diagram for mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{classmo_steady_fit_sol_continue} +\includegraphics[height=4cm]{classmo_steady_fit_sol_continue} \end{center} \end{figure} \subsection*{Public Types} @@ -23,7 +23,7 @@ typedef EOT::Fitness \bf{Fitness}\label{classmo_steady_fit_sol_continue_c289721a \bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int \_\-max\-Number\-Of\-Iterations, unsigned int \_\-max\-Number\-Of\-Iteration\-Without\-Improvement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool \bf{operator()} (const EOT \&\_\-solution) -\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stopping criterion. \item\end{CompactList}\item void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} @@ -80,10 +80,10 @@ Definition at line 58 of file mo\-Steady\-Fit\-Sol\-Continue.h. \subsection{Member Function Documentation} \index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!operator()@{operator()}} \index{operator()@{operator()}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_f7432bccb768d50a2fef248c2b174904} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_f7432bccb768d50a2fef248c2b174904} -Function that activates the stopping criterion. +\doxyref{Function} that activates the stopping criterion. Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations). @@ -96,6 +96,8 @@ Indicates if the fitness has not been improved since a number of iterations (aft \item[Returns:]true or false. \end{Desc} +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. + Definition at line 70 of file mo\-Steady\-Fit\-Sol\-Continue.h. References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::fitness, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!init@{init}} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex index 87dc4c160..967b0da47 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s.tex @@ -8,12 +8,12 @@ Tabu Search (TS). \subsection*{Public Member Functions} \begin{CompactItemize} \item -\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-move\_\-initializer, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-next\_\-move\_\-generator, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-incremental\_\-evaluation, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-aspiration\_\-criterion, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-move\_\-explorer, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, eo\-Eval\-Func$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) +\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-move\_\-explorer, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-continue, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-full\_\-evaluation) \begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item bool \bf{operator()} (\bf{EOT} \&\_\-solution) -\begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em \doxyref{Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item @@ -32,7 +32,7 @@ typedef EOT::Fitness \bf{Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f87 \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{continu}\label{classmo_t_s_962a37393faf5239e657388d375cd9b3} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -eo\-Eval\-Func$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_t_s_f44bb408007e2bff99f7a201842e8e48} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-evaluation}\label{classmo_t_s_f44bb408007e2bff99f7a201842e8e48} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -51,7 +51,7 @@ Definition at line 50 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\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_336408ddf8b7a29ffa8e01e9c18d8e10} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-move\_\-initializer}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-next\_\-move\_\-generator}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-incremental\_\-evaluation}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-aspiration\_\-criterion}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_336408ddf8b7a29ffa8e01e9c18d8e10} Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. @@ -67,7 +67,7 @@ In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loo Definition at line 72 of file mo\-TS.h.\index{moTS@{mo\-TS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, eo\-Eval\-Func$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_7e435fac1b8d5a410b7374d114e005e2} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-move\_\-explorer}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-continue}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-full\_\-evaluation})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_7e435fac1b8d5a410b7374d114e005e2} Constructor with less parameters. @@ -86,10 +86,10 @@ Definition at line 89 of file mo\-TS.h. \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 \_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2a011779723e24a5132a37593775bf56} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-TS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_2a011779723e24a5132a37593775bf56} -Function which launchs the Tabu Search. +\doxyref{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. @@ -102,6 +102,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 102 of file mo\-TS.h. References mo\-TS$<$ M $>$::continu, mo\-TS$<$ M $>$::full\_\-evaluation, and mo\-TS$<$ M $>$::move\_\-explorer. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps index d8324527a..fd31fc02a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex index b45f31c1d..9aa984100 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex @@ -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 $>$::aspiration\_\-criterion, and mo\-TSM \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\_\-solution}, \bf{EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_853743f2e21def3ea129556f47fafa55} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-old\_\-solution}, \bf{EOT} \& {\em \_\-new\_\-solution})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_853743f2e21def3ea129556f47fafa55} 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 90 of file mo\-TSMove\-Loop\-Expl.h. References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspiration\_\-criterion, mo\-TSMove\-Loop\-Expl$<$ M $>$::incremental\_\-evaluation, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-initializer, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-selection, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move\_\-generator, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps index 63ca07c99..43c125a8a 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 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/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex index 74ed52d91..c209fa1e9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/classmo_tabu_list.tex @@ -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/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty b/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty index 145e32de7..a126b72f0 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Feb 29 16:32:25 2008 for Paradis\-EO-MO-Moving\-Objects by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Feb 29 16:32:25 2008 for Paradis\-EO-MO-Moving\-Objects by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Feb 29 17:03:44 2008 for Paradis\-EO-MO-Moving\-Objects by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Feb 29 17:03:44 2008 for Paradis\-EO-MO-Moving\-Objects by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex index f45576d4f..32df1afe3 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/hierarchy.tex @@ -1,6 +1,7 @@ \section{Paradis\-EO-MO-Moving\-Objects Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} -\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\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}}{} @@ -10,15 +11,20 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \begin{CompactList} \item \contentsline{section}{mo\-Fit\-Comparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{} \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\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{mo\-ILS$<$ M $>$}{\pageref{classmo_i_l_s}}{} \item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} -\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} +\item \contentsline{section}{mo\-Move\-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}}{} @@ -27,20 +33,16 @@ 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 \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} +\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\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{} @@ -48,10 +50,32 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item \contentsline{section}{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{} \item \contentsline{section}{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{} \end{CompactList} -\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} +\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\-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]}\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} +\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{mo\-ILS$<$ M $>$}{\pageref{classmo_i_l_s}}{} +\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} \item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} \end{CompactList} diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex index 369fe2d8e..265fd24e9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/main.tex @@ -1,5 +1,5 @@ \section{Introduction}\label{main_Introduction} -MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par +MO is an extension of the ANSI-C++ compliant evolutionary computation library \doxyref{EO}. \par It contains classes for almost any kind of one solution based heuristics.\section{AUTHORS}\label{main_authors} \begin{TabularC}{1} \hline diff --git a/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex b/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex index ceefb8021..8da049e64 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex +++ b/tags/dummy-tag/paradiseo-mo/doc/latex/refman.tex @@ -19,7 +19,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.4.7}\\ \vspace*{0.5cm} -{\small Fri Feb 29 16:32:25 2008}\\ +{\small Fri Feb 29 17:03:44 2008}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3 index 589028da2..5b388b01b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAlgo.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3 index 45bda1adb..3c6a952ef 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moAspirCrit.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index 5d21f3ebc..69e0b6715 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moBestImprSelect.3 @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)" .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 &_fitness)" .br @@ -81,7 +81,7 @@ Definition at line 58 of file moBestImprSelect.h. References moBestImprSelect< M >::first_time. .SS "template bool \fBmoBestImprSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [inline, virtual]\fP" .PP -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 @@ -104,7 +104,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 77 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fitness, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. -.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline]\fP" +.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline, virtual]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -116,6 +116,8 @@ Procedure which saved the best move and fitness. .RE .PP +.PP +Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 95 of file moBestImprSelect.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3 index c6bdad506..11b9d93de 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moComparator.3 @@ -10,6 +10,8 @@ moComparator \- Template for classes which need to compare two EOT and indicate .PP \fC#include \fP .PP +Inherits \fBeoBF< A1, A2, R >< const const EOT &, EOT &, bool >\fP. +.PP Inherited by \fBmoFitComparator< EOT >\fP. .PP .SH "Detailed Description" diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index cab6ab0e7..a7a178374 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index 6f6b07cf4..2bdda508c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 @@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "bool \fBoperator()\fP (double &_temperature)" .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 55 of file moExponentialCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moExponentialCoolingSchedule::operator() (double & _temperature)\fC [inline]\fP" +.SS "bool moExponentialCoolingSchedule::operator() (double & _temperature)\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 65 of file moExponentialCoolingSchedule.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index ba199ee4e..2577b2b0c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)" .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 &_fitness)" .br @@ -87,7 +87,7 @@ Definition at line 60 of file moFirstImprSelect.h. References moFirstImprSelect< M >::initial_fitness, and moFirstImprSelect< M >::valid. .SS "template bool \fBmoFirstImprSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [inline, virtual]\fP" .PP -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 @@ -110,7 +110,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 75 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fitness, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::initial_fitness, and moFirstImprSelect< M >::valid. -.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline]\fP" +.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline, virtual]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -122,6 +122,8 @@ Procedure which saved the best move and fitness. .RE .PP +.PP +Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 96 of file moFirstImprSelect.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3 index a1542226d..12168f389 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitComparator.3 @@ -18,7 +18,7 @@ Inherits \fBmoComparator< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &_solution1, const EOT &_solution2)" .br -.RI "\fIFunction which makes the comparison and gives the result. \fP" +.RI "\fI\fBFunction\fP which makes the comparison and gives the result. \fP" .in -1c .SH "Detailed Description" .PP @@ -33,7 +33,7 @@ Definition at line 46 of file moFitComparator.h. .PP .SS "template bool \fBmoFitComparator\fP< EOT >::operator() (const EOT & _solution1, const EOT & _solution2)\fC [inline]\fP" .PP -Function which makes the comparison and gives the result. +\fBFunction\fP which makes the comparison and gives the result. .PP \fBParameters:\fP .RS 4 diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3 index 68deb1a5e..bd5349f89 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moFitSolContinue.3 @@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &_solution)" .br -.RI "\fIFunction that activates the stopping criterion. \fP" +.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP" .ti -1c .RI "void \fBinit\fP ()" .br @@ -69,9 +69,9 @@ Basic constructor. Definition at line 57 of file moFitSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP" +.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP" .PP -Function that activates the stopping criterion. +\fBFunction\fP that activates the stopping criterion. .PP Indicates if the fitness threshold has not yet been reached. .PP @@ -86,6 +86,8 @@ true or false according to the value of the fitness. .RE .PP +.PP +Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 67 of file moFitSolContinue.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3 index 83a58fb4c..042ca2dc4 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moGenSolContinue.3 @@ -22,7 +22,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &_solution)" .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 54 of file moGenSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP" +.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & _solution)\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,6 +82,8 @@ true or false according to the current generation number. .RE .PP +.PP +Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 66 of file moGenSolContinue.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3 index db3b80672..893ee2813 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHC.3 @@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIFull constructor. \fP" .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &_move_explorer, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &_move_explorer, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fILight constructor. \fP" .ti -1c .RI "bool \fBoperator()\fP (\fBEOT\fP &_solution)" .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_evaluation\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -63,7 +63,7 @@ Class which describes the algorithm for a hill climbing. Definition at line 49 of file moHC.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Full constructor. .PP @@ -85,7 +85,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP. .PP Definition at line 69 of file moHC.h. -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & _move_explorer, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & _move_explorer, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Light constructor. .PP @@ -103,9 +103,9 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM Definition at line 82 of file moHC.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP" +.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & _solution)\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 94 of file moHC.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index 1369547b9..0a5f91688 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 @@ -87,7 +87,7 @@ All the boxes have to be specified. Definition at line 66 of file moHCMoveLoopExpl.h. .SH "Member Function Documentation" .PP -.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\fC [inline]\fP" +.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\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 79 of file moHCMoveLoopExpl.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3 index 45b094d5a..271eff2da 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moILS.3 @@ -16,25 +16,25 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > &_algorithm, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > &_algorithm, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIGeneric constructor. \fP" .ti -1c -.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoMoveSelect\fP< M > &_move_selection, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIConstructor for using a \fBmoHC\fP for the \fBmoAlgo\fP. \fP" .ti -1c -.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoILS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIConstructor for using a \fBmoTS\fP for the \fBmoAlgo\fP. \fP" .ti -1c -.RI "\fBmoILS\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, eoMonOp< \fBEOT\fP > &_perturbation, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoILS\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBmoComparator\fP< \fBEOT\fP > &_acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > &_perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIConstructor for using a \fBmoSA\fP for the \fBmoAlgo\fP. \fP" .ti -1c .RI "bool \fBoperator()\fP (\fBEOT\fP &_solution)" .br -.RI "\fIFunction which launches the ILS. \fP" +.RI "\fI\fBFunction\fP which launches the ILS. \fP" .in -1c .SS "Private Types" @@ -64,11 +64,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIThe acceptance criterion. \fP" .ti -1c -.RI "eoMonOp< \fBEOT\fP > & \fBperturbation\fP" +.RI "\fBeoMonOp\fP< \fBEOT\fP > & \fBperturbation\fP" .br .RI "\fIThe perturbation generator. \fP" .ti -1c -.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_evaluation\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP" .br .RI "\fIThe full evaluation function. \fP" .in -1c @@ -83,7 +83,7 @@ Class which describes the algorithm for a iterated local search. Definition at line 50 of file moILS.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > & _algorithm, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoAlgo\fP< \fBEOT\fP > & _algorithm, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Generic constructor. .PP @@ -105,7 +105,7 @@ Generic constructor using a \fBmoAlgo\fP .PP Definition at line 70 of file moILS.h. -.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoMoveSelect\fP< M > & _move_selection, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Constructor for using a \fBmoHC\fP for the \fBmoAlgo\fP. .PP @@ -131,7 +131,7 @@ Constructor for using a \fBmoHC\fP for the \fBmoAlgo\fP. .PP Definition at line 87 of file moILS.h. -.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _moTS_continue, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Constructor for using a \fBmoTS\fP for the \fBmoAlgo\fP. .PP @@ -161,7 +161,7 @@ Constructor for using a \fBmoTS\fP for the \fBmoAlgo\fP. .PP Definition at line 108 of file moILS.h. -.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, eoMonOp< \fBEOT\fP > & _perturbation, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoILS\fP< M >::\fBmoILS\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _moSA_continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBmoComparator\fP< \fBEOT\fP > & _acceptance_criterion, \fBeoMonOp\fP< \fBEOT\fP > & _perturbation, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Constructor for using a \fBmoSA\fP for the \fBmoAlgo\fP. .PP @@ -191,9 +191,9 @@ Constructor for using a \fBmoSA\fP for the \fBmoAlgo\fP. Definition at line 130 of file moILS.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoILS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP" +.SS "template bool \fBmoILS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline, virtual]\fP" .PP -Function which launches the ILS. +\fBFunction\fP which launches the ILS. .PP The ILS has to improve a current solution. As the \fBmoSA\fP, the \fBmoTS\fP and the \fBmoHC\fP, it can be used for HYBRIDATION in an evolutionnary algorithm. .PP @@ -208,6 +208,8 @@ true. .RE .PP +.PP +Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 146 of file moILS.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index 5542abe64..270b44539 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 @@ -34,7 +34,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &_move, const \fBFitness\fP &_fitness)" .br -.RI "\fIFunction that indicates if the current fitness is better that the already saved fitness. \fP" +.RI "\fI\fBFunction\fP that indicates if the current fitness is better that the already saved fitness. \fP" .in -1c .SS "Private Attributes" @@ -61,7 +61,7 @@ Definition at line 47 of file moImprBestFitAspirCrit.h. .PP .SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & _move, const \fBFitness\fP & _fitness)\fC [inline]\fP" .PP -Function that indicates if the current fitness is better that the already saved fitness. +\fBFunction\fP that indicates if the current fitness is better that the already saved fitness. .PP The first time, the function only saved the current move and fitness. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3 index d748228dd..a83890dbc 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moItRandNextMove.3 @@ -63,7 +63,7 @@ Definition at line 47 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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 index 48142cc78..e2b40860f 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 @@ -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 &_solution)" .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 > &_function)" +.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &_function)" .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 > * > \fBfunctions\fP" +.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunctions\fP" .br .RI "\fIVector of functions. \fP" .in -1c @@ -43,7 +45,7 @@ Definition at line 46 of file moLSCheckPoint.h. .PP .SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & _move, const typename M::EOType & _solution)\fC [inline]\fP" .PP -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 57 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::functions. -.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & _function)\fC [inline]\fP" +.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & _function)\fC [inline]\fP" .PP Procedure which add a new function to the function vector. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index 17e0d9f13..9c20251b7 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 @@ -22,7 +22,7 @@ Inherits \fBmoCoolingSchedule\fP. .ti -1c .RI "bool \fBoperator()\fP (double &_current_temperature)" .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 55 of file moLinearCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moLinearCoolingSchedule::operator() (double & _current_temperature)\fC [inline]\fP" +.SS "bool moLinearCoolingSchedule::operator() (double & _current_temperature)\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 @@ true if the new temperature (current temperature - quantity) is greater than the .RE .PP +.PP +Implements \fBeoUF< double &, bool >\fP. .PP Definition at line 65 of file moLinearCoolingSchedule.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3 index a582d0604..76cc8a352 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMove.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3 index 236f12380..e89b21ef9 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveExpl.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index 0e7861192..ae96303e2 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3 index ea5522461..cc0f06723 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveInit.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3 index 8acba244e..6278039f1 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moMoveSelect.3 @@ -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 &_fitness)=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 & _fitness)\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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3 index 02a97e449..a2ca5503b 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNextMove.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index 709480b77..94832e34c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 @@ -18,7 +18,7 @@ Inherits \fBmoAspirCrit< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &_move, const typename M::EOType::Fitness &_fitness)" .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 47 of file moNoAspirCrit.h. .PP .SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & _move, const typename M::EOType::Fitness & _fitness)\fC [inline]\fP" .PP -Function which describes the aspiration criterion behaviour. +\fBFunction\fP which describes the aspiration criterion behaviour. .PP Does nothing. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 index 3faabadef..2e855943e 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 @@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &_solution)" .br -.RI "\fIFunction that activates the stopping criterion. \fP" +.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP" .ti -1c .RI "void \fBinit\fP ()" .br @@ -81,9 +81,9 @@ Basic constructor. Definition at line 57 of file moNoFitImprSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP" +.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP" .PP -Function that activates the stopping criterion. +\fBFunction\fP that activates the stopping criterion. .PP Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). .PP @@ -98,6 +98,8 @@ true or false. .RE .PP +.PP +Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 67 of file moNoFitImprSolContinue.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3 index 40c2e8f13..6051a9c02 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandImprSelect.3 @@ -30,7 +30,7 @@ Inherits \fBmoMoveSelect< M >< M >\fP. .ti -1c .RI "bool \fBupdate\fP (const M &_move, const \fBFitness\fP &_fitness)" .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 &_fitness)" .br @@ -87,7 +87,7 @@ Definition at line 63 of file moRandImprSelect.h. References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, moRandImprSelect< M >::firstTime, and moRandImprSelect< M >::initial_fitness. .SS "template bool \fBmoRandImprSelect\fP< M >::update (const M & _move, const \fBFitness\fP & _fitness)\fC [inline, virtual]\fP" .PP -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 @@ -110,7 +110,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 80 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, moRandImprSelect< M >::firstTime, and moRandImprSelect< M >::initial_fitness. -.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline]\fP" +.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & _move, \fBFitness\fP & _fitness)\fC [inline, virtual]\fP" .PP The move selection. .PP @@ -124,10 +124,12 @@ One the saved move is randomly chosen. .RE .PP +.PP +Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 100 of file moRandImprSelect.h. .PP -References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, and moRandImprSelect< M >::firstTime. +References moRandImprSelect< M >::better_fitnesses, moRandImprSelect< M >::better_moves, moRandImprSelect< M >::firstTime, and eoRng::random(). .SH "Author" .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3 index b594e62f1..eb5477139 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moRandMove.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3 index eb45f78ce..e9f1c6f00 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSA.3 @@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &_random_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, double _initial_temperature, \fBmoCoolingSchedule\fP &_cooling_schedule, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fISA constructor. \fP" .ti -1c @@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIThe cooling schedule. \fP" .ti -1c -.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_evaluation\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm. Definition at line 53 of file moSA.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & _random_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, double _initial_temperature, \fBmoCoolingSchedule\fP & _cooling_schedule, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP SA constructor. .PP @@ -101,7 +101,7 @@ All the boxes used by a SA need to be given. Definition at line 74 of file moSA.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP" +.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & _solution)\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 89 of file moSA.h. .PP -References moSA< M >::continu, moSA< M >::cooling_schedule, moSA< M >::full_evaluation, moSA< M >::incremental_evaluation, moSA< M >::initial_temperature, and moSA< M >::random_move_generator. +References moSA< M >::continu, moSA< M >::cooling_schedule, moSA< M >::full_evaluation, moSA< M >::incremental_evaluation, moSA< M >::initial_temperature, moSA< M >::random_move_generator, and eoRng::uniform(). .SH "Author" .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index c21b5547c..3663bbb6d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 @@ -34,7 +34,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &_move, const \fBEOT\fP &_solution)" .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 &_solution)" .br @@ -83,7 +83,7 @@ Definition at line 46 of file moSimpleMoveTabuList.h. .PP .SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & _move, const \fBEOT\fP & _solution)\fC [inline]\fP" .PP -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 diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 index da2d8a0e5..925c32128 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 @@ -34,7 +34,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .ti -1c .RI "bool \fBoperator()\fP (const M &_move, const \fBEOT\fP &_solution)" .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 &_solution)" .br @@ -97,7 +97,7 @@ Definition at line 60 of file moSimpleSolutionTabuList.h. .PP .SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & _move, const \fBEOT\fP & _solution)\fC [inline]\fP" .PP -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 diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3 index bdb0543d0..a35f11d62 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSolContinue.3 @@ -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 \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP. .PP .SS "Public Member Functions" @@ -26,7 +28,7 @@ Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmo .SS "template class moSolContinue< EOT >" Class that describes a stop criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function (eoUF). +It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). .PP Definition at line 48 of file moSolContinue.h. .SH "Member Function Documentation" diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 index a39cf8b77..cb5398988 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 @@ -30,7 +30,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "bool \fBoperator()\fP (const EOT &_solution)" .br -.RI "\fIFunction that activates the stopping criterion. \fP" +.RI "\fI\fBFunction\fP that activates the stopping criterion. \fP" .ti -1c .RI "void \fBinit\fP ()" .br @@ -91,9 +91,9 @@ Basic constructor. Definition at line 58 of file moSteadyFitSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline]\fP" +.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & _solution)\fC [inline, virtual]\fP" .PP -Function that activates the stopping criterion. +\fBFunction\fP that activates the stopping criterion. .PP Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations). .PP @@ -108,6 +108,8 @@ true or false. .RE .PP +.PP +Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 70 of file moSteadyFitSolContinue.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3 index 064987957..ca519377c 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTS.3 @@ -16,17 +16,17 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &_move_initializer, \fBmoNextMove\fP< M > &_next_move_generator, \fBmoMoveIncrEval\fP< M > &_incremental_evaluation, \fBmoTabuList\fP< M > &_tabu_list, \fBmoAspirCrit\fP< M > &_aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP" .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &_move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, eoEvalFunc< \fBEOT\fP > &_full_evaluation)" +.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &_move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > &_continue, \fBeoEvalFunc\fP< \fBEOT\fP > &_full_evaluation)" .br .RI "\fIConstructor with less parameters. \fP" .ti -1c .RI "bool \fBoperator()\fP (\fBEOT\fP &_solution)" .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_evaluation\fP" +.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_evaluation\fP" .br .RI "\fIFull evaluation function. \fP" .in -1c @@ -67,7 +67,7 @@ Generic algorithm that describes a tabu search. Definition at line 50 of file moTS.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & _move_initializer, \fBmoNextMove\fP< M > & _next_move_generator, \fBmoMoveIncrEval\fP< M > & _incremental_evaluation, \fBmoTabuList\fP< M > & _tabu_list, \fBmoAspirCrit\fP< M > & _aspiration_criterion, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Constructor of a \fBmoTS\fP specifying all the boxes. .PP @@ -93,7 +93,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. .PP Definition at line 72 of file moTS.h. -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & _move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, eoEvalFunc< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & _move_explorer, \fBmoSolContinue\fP< \fBEOT\fP > & _continue, \fBeoEvalFunc\fP< \fBEOT\fP > & _full_evaluation)\fC [inline]\fP" .PP Constructor with less parameters. .PP @@ -113,9 +113,9 @@ The explorer is given in the parameters. Definition at line 89 of file moTS.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & _solution)\fC [inline]\fP" +.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & _solution)\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 @@ -130,6 +130,8 @@ TRUE. .RE .PP +.PP +Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 102 of file moTS.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index 567d04a4e..3a57a7b4d 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 @@ -99,7 +99,7 @@ Definition at line 71 of file moTSMoveLoopExpl.h. References moTSMoveLoopExpl< M >::aspiration_criterion, and moTSMoveLoopExpl< M >::tabu_list. .SH "Member Function Documentation" .PP -.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\fC [inline]\fP" +.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & _old_solution, \fBEOT\fP & _new_solution)\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 90 of file moTSMoveLoopExpl.h. .PP diff --git a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3 b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3 index 4338fb889..4ba24a276 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3 +++ b/tags/dummy-tag/paradiseo-mo/doc/man/man3/moTabuList.3 @@ -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/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag b/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag index 9d818e64a..d2f5d3318 100644 --- a/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag +++ b/tags/dummy-tag/paradiseo-mo/doc/mo.doxytag @@ -14,11 +14,13 @@ moAlgo classmo_algo.html EOT + eoMonOp< EOT > moAspirCrit classmo_aspir_crit.html M + eoBF virtual void init @@ -86,10 +88,12 @@ moComparator classmo_comparator.html EOT + eoBF moCoolingSchedule classmo_cooling_schedule.html + eoUF< double &, bool > moExponentialCoolingSchedule @@ -621,6 +625,7 @@ moLSCheckPoint classmo_l_s_check_point.html M + eoBF void operator() @@ -647,6 +652,7 @@ moMove classmo_move.html EOT + eoUF< EOT &, void > EOT EOType @@ -659,16 +665,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 @@ -680,6 +689,7 @@ moMoveSelect classmo_move_select.html M + eoBF< M &, M::EOType::Fitness &, void > M::EOType::Fitness Fitness @@ -706,6 +716,7 @@ moNextMove classmo_next_move.html M + eoBF moNoAspirCrit @@ -855,6 +866,7 @@ moRandMove classmo_rand_move.html M + eoUF< M &, void > moSA @@ -1102,6 +1114,7 @@ moSolContinue classmo_sol_continue.html EOT + eoUF< const EOT &, bool > virtual void init @@ -1190,6 +1203,7 @@ moTabuList classmo_tabu_list.html M + eoBF M::EOType EOT