diff --git a/trunk/paradiseo-mo/docs/Doxyfile b/trunk/paradiseo-mo/docs/Doxyfile index d5074bb99..e6b9c50e7 100644 --- a/trunk/paradiseo-mo/docs/Doxyfile +++ b/trunk/paradiseo-mo/docs/Doxyfile @@ -198,7 +198,8 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html +#TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html +TAGFILES = GENERATE_TAGFILE = mo.doxytag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES diff --git a/trunk/paradiseo-mo/docs/html/annotated.html b/trunk/paradiseo-mo/docs/html/annotated.html index 9c09ffd2e..4369f8d4b 100644 --- a/trunk/paradiseo-mo/docs/html/annotated.html +++ b/trunk/paradiseo-mo/docs/html/annotated.html @@ -33,14 +33,15 @@ moAlgo< EOT >Description of an algorithm of the paradiseo-mo library moAspirCrit< M >Description of the conditions in which a tabu move could be accepted moBestImprSelect< M >One of the possible moMoveSelect - moCoolSchedThis class gives the description of a cooling schedule - moEasyCoolSchedOne of the possible moCoolSched + moCoolingScheduleThis class gives the description of a cooling schedule + moExponentialCoolingScheduleOne of the possible moCoolingSchedule moFirstImprSelect< M >One possible moMoveSelect moGenSolContinue< EOT >One possible stop criterion for a solution-based heuristic moHC< M >Hill Climbing (HC) moHCMoveLoopExpl< M >Iterative explorer used by a moHC moImprBestFitAspirCrit< M >One of the possible moAspirCrit moItRandNextMove< M >One of the possible moNextMove + moLinearCoolingScheduleOne of the possible moCoolingSchedule moLSCheckPoint< M >Class which allows a checkpointing system moMove< EOT >Definition of a move moMoveExpl< M >Description of a move (moMove) explorer @@ -58,7 +59,7 @@ moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/class_empty_selection.html b/trunk/paradiseo-mo/docs/html/class_empty_selection.html index f617dc40b..2bf2798d5 100644 --- a/trunk/paradiseo-mo/docs/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/docs/html/class_empty_selection.html @@ -45,7 +45,7 @@ This class is used as an exception that can be thrown if a solution selector has

Definition at line 21 of file moMoveSelect.h.

The documentation for this class was generated from the following file: -
Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classes.html b/trunk/paradiseo-mo/docs/html/classes.html index 6465dd0d2..41145b74b 100644 --- a/trunk/paradiseo-mo/docs/html/classes.html +++ b/trunk/paradiseo-mo/docs/html/classes.html @@ -31,21 +31,21 @@

PARADISEO-MO Class Index

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

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

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

-

Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +moMoveInit   moTS   moGenSolContinue   moMoveLoopExpl   moTSMoveLoopExpl   
  H  
+

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

+

Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/classmo_algo.html b/trunk/paradiseo-mo/docs/html/classmo_algo.html index 1b7f21b1b..bfe0382e7 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_algo.html +++ b/trunk/paradiseo-mo/docs/html/classmo_algo.html @@ -28,19 +28,11 @@
  • 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 -
    @@ -56,7 +48,7 @@ Description of an algorithm of the paradiseo-mo library.

    Definition at line 21 of file moAlgo.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html index ff3aeb566..439a37e8e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html @@ -29,12 +29,8 @@
  • 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]
    operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    ~eoBF()eoBF< A1, A2, R > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html index eede7fcd2..44f701036 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moAspirCrit< M > Class Template Reference

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

    moAspirCrit< M > Class Template Reference

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

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

    Inheritance diagram for moAspirCrit< M >:

    -eoBF< A1, A2, R > -eoFunctorBase -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -86,7 +84,7 @@ Implemented in moAspirCrit.h -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png index e6cefe1bf..b959606a7 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html index e4450a0f8..40b95e7b9 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html @@ -33,13 +33,10 @@
    - - + - - -
    best_movemoBestImprSelect< M > [private]
    first_timemoBestImprSelect< M > [private]
    Fitness typedefmoBestImprSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline]
    update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
    ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html index 5a5e8a07d..f563a80ae 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html @@ -36,9 +36,7 @@

    Inheritance diagram for moBestImprSelect< M >:

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

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

    Definition at line 68 of file moBestImprSelect.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.png b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.png index e803a39a4..5b868e9d7 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.png and b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_cool_sched.html b/trunk/paradiseo-mo/docs/html/classmo_cool_sched.html deleted file mode 100644 index cf85447df..000000000 --- a/trunk/paradiseo-mo/docs/html/classmo_cool_sched.html +++ /dev/null @@ -1,59 +0,0 @@ - - -PARADISEO-MO: moCoolSched Class Reference - - - - -
    -
    -
    -
    -

    moCoolSched Class Reference

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

    -#include <moCoolSched.h> -

    -

    Inheritance diagram for moCoolSched: -

    - -eoUF< double &, bool > -eoFunctorBase -moEasyCoolSched - - - -
    -

    Detailed Description

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

    -It is only a description... An object that herits from this class is needed to be used in a moSA. See moEasyCoolSched for example. -

    - -

    -Definition at line 22 of file moCoolSched.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  - -doxygen 1.5.1
    - - diff --git a/trunk/paradiseo-mo/docs/html/classmo_cool_sched.png b/trunk/paradiseo-mo/docs/html/classmo_cool_sched.png deleted file mode 100644 index 2cd469782..000000000 Binary files a/trunk/paradiseo-mo/docs/html/classmo_cool_sched.png and /dev/null differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.png b/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.png deleted file mode 100644 index 6717391b7..000000000 Binary files a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.png and /dev/null differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html new file mode 100644 index 000000000..fb249a8c9 --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html @@ -0,0 +1,40 @@ + + +PARADISEO-MO: Member List + + + + +
    +
    +
    +
    +

    moExponentialCoolingSchedule Member List

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

    + + + + +
    moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
    operator()(double &__temp)moExponentialCoolingSchedule [inline]
    ratiomoExponentialCoolingSchedule [private]
    thresholdmoExponentialCoolingSchedule [private]

    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  + +doxygen 1.5.1
    + + diff --git a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html similarity index 53% rename from trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html rename to trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html index 1087ad9b2..6e5005522 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html @@ -1,6 +1,6 @@ -PARADISEO-MO: moEasyCoolSched Class Reference +PARADISEO-MO: moExponentialCoolingSchedule Class Reference @@ -28,51 +28,49 @@
  • Class Hierarchy
  • Class Members
    • -

    moEasyCoolSched Class Reference

    One of the possible moCoolSched. +

    moExponentialCoolingSchedule Class Reference

    One of the possible moCoolingSchedule. More...

    -#include <moEasyCoolSched.h> +#include <moExponentialCoolingSchedule.h>

    -

    Inheritance diagram for moEasyCoolSched: -

    - -moCoolSched -eoUF< double &, bool > -eoFunctorBase +

    Inheritance diagram for moExponentialCoolingSchedule: +

    + +moCoolingSchedule -List of all members. +List of all members.
    - + - - + + - + - + - +

    Public Member Functions

     moEasyCoolSched (double __threshold, double __ratio)
     moExponentialCoolingSchedule (double __threshold, double __ratio)
     Simple constructor.
    bool operator() (double &__temp)
     Simple constructor.
    bool operator() (double &__temp)
     Function which proceeds to the cooling.
     Function which proceeds to the cooling.

    Private Attributes

    -double threshold
    +double threshold
     The temperature threhold.
    -double ratio
    +double ratio
     The decreasing factor of the temperature.

    Detailed Description

    -One of the possible moCoolSched. +One of the possible moCoolingSchedule.

    -The simpliest, the temperature decrease according to a ratio until it greater than a threshold. +An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.

    -Definition at line 22 of file moEasyCoolSched.h.

    Constructor & Destructor Documentation

    - +Definition at line 22 of file moExponentialCoolingSchedule.h.

    Constructor & Destructor Documentation

    +
    - + @@ -103,21 +101,21 @@ Simple constructor.

    -Definition at line 31 of file moEasyCoolSched.h. +Definition at line 31 of file moExponentialCoolingSchedule.h.

    Member Function Documentation

    - +
    moEasyCoolSched::moEasyCoolSched moExponentialCoolingSchedule::moExponentialCoolingSchedule ( double  __threshold,
    - + - +
    bool moEasyCoolSched::operator() bool moExponentialCoolingSchedule::operator() ( double &  __temp  )  [inline, virtual] [inline]
    @@ -126,7 +124,7 @@ Definition at line Function which proceeds to the cooling.

    -Decrease the temperature and indicates if it is greater than the threshold.

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

    Parameters:
    @@ -135,16 +133,14 @@ Decrease the temperature and indicates if it is greater than the threshold.

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

    -Implements eoUF< double &, bool >. +Definition at line 41 of file moExponentialCoolingSchedule.h.

    -Definition at line 44 of file moEasyCoolSched.h. -

    -References ratio, and threshold. +References ratio, and threshold.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
  • moExponentialCoolingSchedule.h +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png new file mode 100644 index 000000000..f00c024dc Binary files /dev/null and b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html index cc3ec310e..fbd2ad74a 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html @@ -32,16 +32,13 @@
    • - - + - - -
    __temp the current temperature.
    best_fitmoFirstImprSelect< M > [private]
    best_movemoFirstImprSelect< M > [private]
    Fitness typedefmoFirstImprSelect< M >
    functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
    init(const Fitness &__fit)moFirstImprSelect< M > [inline, virtual]
    init_fitmoFirstImprSelect< M > [private]
    operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline, virtual]
    operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline]
    update(const M &__move, const typename M::EOType::Fitness &__fit)moFirstImprSelect< M > [inline]
    moMoveSelect::update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
    validmoFirstImprSelect< M > [private]
    ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html index 48cd9f747..eba713ddd 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html @@ -36,9 +36,7 @@

    Inheritance diagram for moFirstImprSelect< M >:

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

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

    Definition at line 76 of file moFirstImprSelect.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png index a2a1234c8..c7295b050 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png and b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html index 531069d24..72f06b230 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html @@ -29,15 +29,12 @@
  • Class Members

    • moGenSolContinue< EOT > Member List

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

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

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  + operator()(const EOT &__sol)moGenSolContinue< EOT > [inline] +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html index b04c8aab2..9a21f8d7d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html @@ -36,9 +36,7 @@

    Inheritance diagram for moGenSolContinue< EOT >:

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

    -Implements eoUF< const EOT &, bool >.

    Definition at line 44 of file moGenSolContinue.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png index b40e34991..84c8334c7 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png and b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html index e8d8db046..838bab937 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html @@ -35,8 +35,8 @@ moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline] moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline] move_explmoHC< M > [private] - operator()(EOT &__sol)moHC< M > [inline, virtual] -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  + operator()(EOT &__sol)moHC< M > [inline] +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c.html b/trunk/paradiseo-mo/docs/html/classmo_h_c.html index fdbf49d10..1137e1ab8 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c.html @@ -36,19 +36,15 @@

    Inheritance diagram for moHC< M >:

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

    Public Member Functions

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

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

    Definition at line 82 of file moHC.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c.png b/trunk/paradiseo-mo/docs/html/classmo_h_c.png index 6a4aadb1e..1d7aa7716 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_h_c.png and b/trunk/paradiseo-mo/docs/html/classmo_h_c.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html index 16a515068..8f19f2554 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html @@ -36,8 +36,8 @@ move_initmoHCMoveLoopExpl< M > [private] move_selectmoHCMoveLoopExpl< M > [private] next_movemoHCMoveLoopExpl< M > [private] - operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline, virtual] -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  + operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline] +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html index c01229938..defb704dc 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html @@ -36,10 +36,8 @@

    Inheritance diagram for moHCMoveLoopExpl< M >:

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

    -

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

    Definition at line 59 of file moHCMoveLoopExpl.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.png b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.png index 8c76fd46e..8c51e26c5 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html index 16cac5dab..8f21344e2 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html @@ -32,14 +32,10 @@ best_fitmoImprBestFitAspirCrit< M > [private] first_timemoImprBestFitAspirCrit< M > [private] Fitness typedefmoImprBestFitAspirCrit< M > - functor_category()eoBF< A1, A2, R > [static] init()moImprBestFitAspirCrit< M > [inline, virtual] moImprBestFitAspirCrit()moImprBestFitAspirCrit< M > [inline] operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline] - moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] - ~eoBF()eoBF< A1, A2, R > [virtual] - ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html index f7dbb0c1d..7a8053992 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html @@ -36,9 +36,7 @@

    Inheritance diagram for moImprBestFitAspirCrit< M >:

    -moAspirCrit< M > -eoBF< A1, A2, R > -eoFunctorBase +moAspirCrit< M > List of all members. @@ -127,7 +125,7 @@ References moImprBestFitAspirCrit.h -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png index 76e0473f0..cfb21ada8 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html index db720875e..e101defaa 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html @@ -35,7 +35,7 @@
    -
    num_itermoItRandNextMove< M > [private]
    operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
    rand_movemoItRandNextMove< M > [private]
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html index 86ba124d8..49f92e3f1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html @@ -36,9 +36,7 @@

    Inheritance diagram for moItRandNextMove< M >:

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

    The documentation for this class was generated from the following file:     -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png index a90754a6b..574beda2c 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png and b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html index 8a9e6e12d..2cccedf30 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html @@ -31,12 +31,8 @@

    moLSCheckPoint< M > Member List

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

    - - - - -
    add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline]
    funcmoLSCheckPoint< M > [private]
    functor_category()eoBF< A1, A2, R > [static]
    operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline]
    eoBF::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
    ~eoBF()eoBF< A1, A2, R > [virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html index 944a0c06c..7fd098a42 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html @@ -28,29 +28,23 @@
  • 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. - + @@ -120,7 +114,7 @@ template<class M> - + @@ -146,7 +140,7 @@ References moLSChe

    The documentation for this class was generated from the following file:     -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html similarity index 51% rename from trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html rename to trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html index 73f1f2881..424e35571 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_easy_cool_sched-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html @@ -28,12 +28,12 @@
  • Class Hierarchy
  • Class Members
    • -

    moEasyCoolSched Member List

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


    Public Member Functions

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

    Private Attributes

    -std::vector< eoBF< const M &,
    +std::vector< eoBF< const M &,
    const typename M::EOType &,
    void > * >     		func
    void moLSCheckPoint< M >::add (eoBF< const M &, const typename M::EOType &, void > & eoBF< const M &, const typename M::EOType &, void > &  __f  )  [inline]
    - - - - -
    moEasyCoolSched(double __threshold, double __ratio)moEasyCoolSched [inline]
    operator()(double &__temp)moEasyCoolSched [inline, virtual]
    ratiomoEasyCoolSched [private]
    thresholdmoEasyCoolSched [private]
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +

    moLinearCoolingSchedule Member List

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

    + + + + +
    moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
    operator()(double &__temp)moLinearCoolingSchedule [inline]
    quantitymoLinearCoolingSchedule [private]
    thresholdmoLinearCoolingSchedule [private]

    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html new file mode 100644 index 000000000..f5d0119be --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html @@ -0,0 +1,147 @@ + + +PARADISEO-MO: moLinearCoolingSchedule Class Reference + + + + +
    +
    +
    +
    +

    moLinearCoolingSchedule Class Reference

    One of the possible moCoolingSchedule. +More... +

    +#include <moLinearCoolingSchedule.h> +

    +

    Inheritance diagram for moLinearCoolingSchedule: +

    + +moCoolingSchedule + +List of all members. + + + + + + + + + + + + + + + +

    Public Member Functions

     moLinearCoolingSchedule (double __threshold, double __quantity)
     Simple constructor.
    bool operator() (double &__temp)
     Function which proceeds to the cooling.

    Private Attributes

    +double threshold
     The temperature threhold.
    +double quantity
     The quantity that allows the temperature to decrease.
    +

    Detailed Description

    +One of the possible moCoolingSchedule. +

    +An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. +

    + +

    +Definition at line 22 of file moLinearCoolingSchedule.h.

    Constructor & Destructor Documentation

    + +
    +
    + + + + + + + + + + + + + + + + + + +
    moLinearCoolingSchedule::moLinearCoolingSchedule (double  __threshold,
    double  __quantity 
    ) [inline]
    +
    +
    + +

    +Simple constructor. +

    +

    Parameters:
    + + + +
    __threshold the threshold.
    __quantity the quantity used to descrease the temperature.
    +
    + +

    +Definition at line 31 of file moLinearCoolingSchedule.h. +

    +

    +

    Member Function Documentation

    + +
    +
    + + + + + + + + + +
    bool moLinearCoolingSchedule::operator() (double &  __temp  )  [inline]
    +
    +
    + +

    +Function which proceeds to the cooling. +

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

    +

    Parameters:
    + + +
    __temp the current temperature.
    +
    +
    Returns:
    if the new temperature (current temperature - quantity) is greater than the threshold.
    + +

    +Definition at line 41 of file moLinearCoolingSchedule.h. +

    +References quantity, and threshold. +

    +

    +

    The documentation for this class was generated from the following file: +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  + +doxygen 1.5.1
    + + diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png new file mode 100644 index 000000000..3821b70aa Binary files /dev/null and b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_move-members.html index dd75eb245..e7f96125f 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move-members.html @@ -30,11 +30,7 @@

    moMove< EOT > Member List

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

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

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move.html b/trunk/paradiseo-mo/docs/html/classmo_move.html index 1c00dd8fb..e9402491b 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move.html @@ -28,17 +28,11 @@
  • 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. @@ -59,7 +53,7 @@ A move transforms a solution to another close solution. It describes how a solut

    Definition at line 23 of file moMove.h.

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

    moMoveExpl< M > Class Template Reference

    Description of a move (moMove) explorer. +

    moMoveExpl< M > Class Template Reference

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

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

    Inheritance diagram for moMoveExpl< M >:

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

    Public Types

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

    Definition at line 21 of file moMoveExpl.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_expl.png b/trunk/paradiseo-mo/docs/html/classmo_move_expl.png index 66c1602bb..1b27438a7 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_move_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_move_expl.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html b/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html index 61ee0c85c..7b3849c17 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html @@ -28,17 +28,11 @@
  • 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 -
    @@ -54,7 +48,7 @@ From a move and a solution, it computes a new fitness that could be associated t

    Definition at line 24 of file moMoveIncrEval.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_init.html b/trunk/paradiseo-mo/docs/html/classmo_move_init.html index 4622d5514..31fb01fd5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_init.html @@ -28,17 +28,11 @@
  • 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 -
    @@ -54,7 +48,7 @@ Class which allows to initiase a move. Only a description... An object that heri

    Definition at line 22 of file moMoveInit.h.

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

    Inheritance diagram for moMoveLoopExpl< M >:

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

    Definition at line 21 of file moMoveLoopExpl.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.png b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.png index 82d725cec..3fc99c0f6 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html index df32263f3..cdf43659e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html @@ -30,13 +30,9 @@

    moMoveSelect< M > Member List

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

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

    moMoveSelect< M > Class Template Reference

    Class that describes a move selector (moMove). +

    moMoveSelect< M > Class Template Reference

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

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

    Inheritance diagram for moMoveSelect< M >:

    -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase -moBestImprSelect< M > -moFirstImprSelect< M > -moRandImprSelect< M > +moBestImprSelect< M > +moFirstImprSelect< M > +moRandImprSelect< M > List of all members. @@ -144,7 +142,7 @@ Implemented in moMoveSelect.h -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select.png b/trunk/paradiseo-mo/docs/html/classmo_move_select.png index 10bda515a..0781eef97 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_move_select.png and b/trunk/paradiseo-mo/docs/html/classmo_move_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_next_move.html index eec94d219..bda978c66 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_next_move.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moNextMove< M > Class Template Reference

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

    moNextMove< M > Class Template Reference

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

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

    Inheritance diagram for moNextMove< M >:

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

    Definition at line 22 of file moNextMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.png b/trunk/paradiseo-mo/docs/html/classmo_next_move.png index 6bc1397f2..ee1f90bbc 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_next_move.png and b/trunk/paradiseo-mo/docs/html/classmo_next_move.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html index d37520070..73ae51290 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html @@ -29,13 +29,9 @@
  • Class Members

    • moNoAspirCrit< M > Member List

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

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

    Inheritance diagram for moNoAspirCrit< M >:

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

    The documentation for this class was generated from the following file:     -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png index ce623c0e3..f8412d8ed 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html index ff9629c90..99a04c02e 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html @@ -30,16 +30,13 @@

    moRandImprSelect< M > Member List

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

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

    Inheritance diagram for moRandImprSelect< M >:

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

    -

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

    Definition at line 77 of file moRandImprSelect.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.png b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.png index b935a8e2f..6931c3dfd 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.png and b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html index 3ef55563b..32d7b8051 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html @@ -28,17 +28,11 @@
  • 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 -
    @@ -54,7 +48,7 @@ Only a description... An object that herits from this class needs to be designed

    Definition at line 21 of file moRandMove.h.

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html index 4148227ec..24f3edd09 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html @@ -30,16 +30,16 @@

    moSA< M > Member List

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

    - + - + - -
    contmoSA< M > [private]
    cool_schedmoSA< M > [private]
    cool_schedmoSA< M > [private]
    EOT typedefmoSA< M > [private]
    Fitness typedefmoSA< M > [private]
    full_evalmoSA< M > [private]
    incr_evalmoSA< M > [private]
    init_tempmoSA< M > [private]
    moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolSched &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline]
    moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline]
    move_randmoSA< M > [private]
    operator()(EOT &__sol)moSA< M > [inline, virtual]

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  + operator()(EOT &__sol)moSA< M > [inline] +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.html b/trunk/paradiseo-mo/docs/html/classmo_s_a.html index 6669b12ea..7f5f74549 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a.html @@ -36,18 +36,14 @@

    Inheritance diagram for moSA< M >:

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

    Public Member Functions

     moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolSched &__cool_sched, eoEvalFunc< EOT > &__full_eval)
     moSA (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)
     SA constructor.
     SA constructor.
    bool operator() (EOT &__sol)
     function that launches the SA algorithm.
    init_temp
     Initial temperature.
    -moCoolSched & cool_sched
    +moCoolingSchedule & cool_sched
     The cooling schedule.
    -eoEvalFunc< EOT > & full_eval
    full_eval
     A full evaluation function.
    @@ -97,7 +93,7 @@ Class that describes a Simulated Annealing algorithm.

    Definition at line 32 of file moSA.h.

    Constructor & Destructor Documentation

    - +
    @@ -130,13 +126,13 @@ template<class M>
    - moCoolSched &  + moCoolingSchedule &  __cool_sched, - eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -180,7 +176,7 @@ template<class M>
    EOT &  __sol  )  - [inline, virtual] + [inline]
    @@ -197,8 +193,6 @@ As a moTS or a
    Returns:
    TRUE.
    -

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

    Definition at line 82 of file moSA.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.png b/trunk/paradiseo-mo/docs/html/classmo_s_a.png index e14866c80..59c20157a 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_s_a.png and b/trunk/paradiseo-mo/docs/html/classmo_s_a.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html index 2379c2ec2..1ff73d268 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html @@ -29,12 +29,8 @@
  • 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]
    operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< const EOT &, bool > [virtual]

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html index cf2ffaf7e..b07967ab1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html @@ -28,7 +28,7 @@
  • Class Hierarchy
  • Class Members
    • -

    moSolContinue< EOT > Class Template Reference

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

    moSolContinue< EOT > Class Template Reference

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

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

    Inheritance diagram for moSolContinue< EOT >:

    -eoUF< const EOT &, bool > -eoFunctorBase -moGenSolContinue< EOT > +moGenSolContinue< EOT > List of all members. @@ -53,7 +51,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).

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

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png index 345d1b66d..ff1f2edde 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png and b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html index c19567788..8556c84eb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html @@ -38,8 +38,8 @@
    - -
    moTS(moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
    move_explmoTS< M > [private]
    mutexmoTS< M > [private, static]
    operator()(EOT &__sol)moTS< M > [inline, virtual]
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  + operator()(EOT &__sol)moTS< M > [inline] +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s.html b/trunk/paradiseo-mo/docs/html/classmo_t_s.html index e8bed1dbd..ba0c47e0d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s.html @@ -36,19 +36,15 @@

    Inheritance diagram for moTS< M >:

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

    Public Member Functions

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

    Static Private Attributes

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

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

    Definition at line 104 of file moTS.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s.png b/trunk/paradiseo-mo/docs/html/classmo_t_s.png index 8932f0e2f..5d6c7b304 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_t_s.png and b/trunk/paradiseo-mo/docs/html/classmo_t_s.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html index e1e1ceef8..2eb6dd221 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html @@ -37,9 +37,9 @@ move_initmoTSMoveLoopExpl< M > [private] move_selectmoTSMoveLoopExpl< M > [private] next_movemoTSMoveLoopExpl< M > [private] - operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline, virtual] + operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline] tabu_listmoTSMoveLoopExpl< M > [private] -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html index 2d59b6f8b..8f98b65a5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html @@ -36,10 +36,8 @@

    Inheritance diagram for moTSMoveLoopExpl< M >:

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

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

    Definition at line 69 of file moTSMoveLoopExpl.h.

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png index 717f30a17..c9608b2de 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png and b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html index a3afa24cb..fced2808d 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html @@ -31,13 +31,9 @@

    moTabuList< M > Member List

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

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

    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html index 6ee4f08b0..4579803b6 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html @@ -28,17 +28,11 @@
  • Class Hierarchy
  • Class Members
    • -

    moTabuList< M > Class Template Reference

    Class describing a tabu list that a moTS uses. +

    moTabuList< M > Class Template Reference

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

    #include <moTabuList.h>

    -

    Inheritance diagram for moTabuList< M >: -

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

    The documentation for this class was generated from the following file: -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/files.html b/trunk/paradiseo-mo/docs/html/files.html index 943d06717..7d2184e4d 100644 --- a/trunk/paradiseo-mo/docs/html/files.html +++ b/trunk/paradiseo-mo/docs/html/files.html @@ -27,14 +27,15 @@
    - - + + + @@ -52,7 +53,7 @@

    Public Types

    moAlgo.h [code]
    moAspirCrit.h [code]
    moBestImprSelect.h [code]
    moCoolSched.h [code]
    moEasyCoolSched.h [code]
    moCoolingSchedule.h [code]
    moExponentialCoolingSchedule.h [code]
    moFirstImprSelect.h [code]
    moGenSolContinue.h [code]
    moHC.h [code]
    moHCMoveLoopExpl.h [code]
    moImprBestFitAspirCrit.h [code]
    moItRandNextMove.h [code]
    moLinearCoolingSchedule.h [code]
    moLSCheckPoint.h [code]
    moMove.h [code]
    moMoveExpl.h [code]
    moTS.h [code]
    moTSMoveLoopExpl.h [code]
    -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions.html b/trunk/paradiseo-mo/docs/html/functions.html index b360b1bc2..48b676330 100644 --- a/trunk/paradiseo-mo/docs/html/functions.html +++ b/trunk/paradiseo-mo/docs/html/functions.html @@ -47,6 +47,7 @@
  • m
  • n
  • o
    • +
  • q
  • r
  • t
  • u
    • @@ -78,7 +79,7 @@ Here is a list of all documented class members with links to the class documenta : moSA< M > , moTS< M >
  • cool_sched -: moSA< M > +: moSA< M >

    - e -

    +

    - q -

    - r -

    - t -

    - u -

    • update() @@ -228,7 +237,7 @@ Here is a list of all documented class members with links to the class documenta
    • vect_better_moves : moRandImprSelect< M >
    -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_func.html b/trunk/paradiseo-mo/docs/html/functions_func.html index 9e93c86e6..f27504017 100644 --- a/trunk/paradiseo-mo/docs/html/functions_func.html +++ b/trunk/paradiseo-mo/docs/html/functions_func.html @@ -68,8 +68,8 @@ , moBestImprSelect< M >

    - m -

    - u -

    -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_type.html b/trunk/paradiseo-mo/docs/html/functions_type.html index 8ee94fe72..28bbe948c 100644 --- a/trunk/paradiseo-mo/docs/html/functions_type.html +++ b/trunk/paradiseo-mo/docs/html/functions_type.html @@ -61,7 +61,7 @@ , moHC< M > , moFirstImprSelect< M > -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/functions_vars.html b/trunk/paradiseo-mo/docs/html/functions_vars.html index 93b9dc4a7..7c9b0e14c 100644 --- a/trunk/paradiseo-mo/docs/html/functions_vars.html +++ b/trunk/paradiseo-mo/docs/html/functions_vars.html @@ -45,6 +45,7 @@
  • i
  • m
  • n
    • +
  • q
  • r
  • t
  • v
    • @@ -72,7 +73,7 @@ : moSA< M > , moTS< M >
  • cool_sched -: moSA< M > +: moSA< M >

    - f -

    +

    - q -

    - r -

    - t -

    - v -

    -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/hierarchy.html b/trunk/paradiseo-mo/docs/html/hierarchy.html index 235bf01f3..8fd0d134a 100644 --- a/trunk/paradiseo-mo/docs/html/hierarchy.html +++ b/trunk/paradiseo-mo/docs/html/hierarchy.html @@ -30,26 +30,25 @@

    PARADISEO-MO Class Hierarchy

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

    Welcome to PARADISEO-Moving Objects

    0.1

    -intro

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

    -tutorial

    +Tutorial

    -install

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

    -design

    -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +Overall Design +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_8h-source.html index 517aa803d..8b8fdc291 100644 --- a/trunk/paradiseo-mo/docs/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_8h-source.html @@ -64,7 +64,7 @@ 00041 #include "moTSMoveLoopExpl.h" 00042 00043 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html index 0456ff46f..ae2fa179a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html @@ -38,13 +38,13 @@ 00015 #include <eoOp.h> 00016 00018 -00021 template < class EOT > class moAlgo:public eoMonOp < EOT > +00021 template < class EOT > class moAlgo:public eoMonOp < EOT > 00022 { 00023 00024 }; 00025 00026 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html index ee0cc11e7..206c1f958 100644 --- a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename +00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename 00023 M::EOType::Fitness &, 00024 bool > 00025 { @@ -51,7 +51,7 @@ 00035 }; 00036 00037 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html index 1cc9a9497..ce3f15ddf 100644 --- a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html @@ -92,7 +92,7 @@ 00091 }; 00092 00093 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html deleted file mode 100644 index 3dc11878d..000000000 --- a/trunk/paradiseo-mo/docs/html/mo_cool_sched_8h-source.html +++ /dev/null @@ -1,51 +0,0 @@ - - -PARADISEO-MO: moCoolSched.h Source File - - - - -
    -
    -

    moCoolSched.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moCoolSched.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moCoolSched_h
-00013 #define __moCoolSched_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 class moCoolSched:public eoUF < double &, bool >
-00023 {
-00024 
-00025 };
-00026 
-00027 #endif
-
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  - -doxygen 1.5.1
    - - diff --git a/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html deleted file mode 100644 index 598c04180..000000000 --- a/trunk/paradiseo-mo/docs/html/mo_easy_cool_sched_8h-source.html +++ /dev/null @@ -1,72 +0,0 @@ - - -PARADISEO-MO: moEasyCoolSched.h Source File - - - - -
    -
    -

    moEasyCoolSched.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moEasyCoolSched.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moEasyCoolSched_h
-00013 #define __moEasyCoolSched_h
-00014 
-00015 #include "moCoolSched.h"
-00016 
-00018 
-00022 class moEasyCoolSched:public moCoolSched
-00023 {
-00024 
-00025 public:
-00027 
-00031   moEasyCoolSched (double __threshold,
-00032                    double __ratio):threshold (__threshold), ratio (__ratio)
-00033   {
-00034 
-00035   }
-00036 
-00038 
-00044   bool operator   () (double &__temp)
-00045   {
-00046 
-00047     return (__temp *= ratio) > threshold;
-00048   }
-00049 
-00050 private:
-00051 
-00053   double threshold;
-00054 
-00056   double ratio;
-00057 
-00058 };
-00059 
-00060 #endif
-
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  - -doxygen 1.5.1
    - - diff --git a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html new file mode 100644 index 000000000..9a5c9f9ee --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html @@ -0,0 +1,67 @@ + + +PARADISEO-MO: moExponentialCoolingSchedule.h Source File + + + + +
    +
    +

    moExponentialCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moExponentialCoolingSchedule.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moExponentialCoolingSchedule_h
+00013 #define __moExponentialCoolingSchedule_h
+00014 
+00015 #include "moCoolingSchedule.h"
+00016 
+00018 
+00022 class moExponentialCoolingSchedule: public moCoolingSchedule
+00023 {
+00024 
+00025 public:
+00027 
+00031   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
+00032   {}
+00033 
+00035 
+00041   bool operator() (double &__temp)
+00042   {
+00043     return (__temp *= ratio) > threshold;
+00044   }
+00045 
+00046 private:
+00047 
+00049   double threshold;
+00050 
+00052   double ratio;
+00053 };
+00054 
+00055 #endif
+
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  + +doxygen 1.5.1
    + + diff --git a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html index 8fec42e58..1b135de96 100644 --- a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html @@ -99,7 +99,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html index aa3e12294..b604e60cf 100644 --- a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html @@ -71,7 +71,7 @@ 00067 }; 00068 00069 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html index bedbdc2c5..7b236ea66 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html @@ -125,7 +125,7 @@ 00131 }; 00132 00133 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html index ab5904d28..b7af88a03 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html @@ -108,7 +108,7 @@ 00106 }; 00107 00108 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html index 4c7989a39..11fd23d46 100644 --- a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -89,7 +89,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html index 54a1efb64..d7465960f 100644 --- a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html @@ -85,7 +85,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html index af13bcad3..6dff8143f 100644 --- a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename +00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename 00022 M::EOType &, void > 00023 { 00024 @@ -64,7 +64,7 @@ 00054 00055 private: 00056 -00058 std::vector < eoBF < const +00058 std::vector < eoBF < const 00059 M &, const 00060 typename 00061 M::EOType &, void >*> @@ -73,7 +73,7 @@ 00064 }; 00065 00066 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html new file mode 100644 index 000000000..4fbe1692b --- /dev/null +++ b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html @@ -0,0 +1,67 @@ + + +PARADISEO-MO: moLinearCoolingSchedule.h Source File + + + + +
    +
    +

    moLinearCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moLinearCoolingSchedule.h"
+00004 
+00005 // (c) OPAC Team, LIFL, 2003-2007
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moLinearCoolingSchedule_h
+00013 #define __moLinearCoolingSchedule_h
+00014 
+00015 #include "moCoolingSchedule.h"
+00016 
+00018 
+00022 class moLinearCoolingSchedule: public moCoolingSchedule
+00023 {
+00024 
+00025 public:
+00027 
+00031   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
+00032   {}
+00033 
+00035 
+00041   bool operator() (double &__temp)
+00042   {
+00043     return (__temp -= quantity) > threshold;
+00044   }
+00045 
+00046 private:
+00047 
+00049   double threshold;
+00050 
+00052   double quantity;
+00053 };
+00054 
+00055 #endif
+
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  + +doxygen 1.5.1
    + + diff --git a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html index a44817a94..e99429908 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00023 template < class EOT > class moMove:public eoUF < EOT &, void > +00023 template < class EOT > class moMove:public eoUF < EOT &, void > 00024 { 00025 00026 public: @@ -47,7 +47,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html index f97760789..9655840bd 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moMoveExpl:public eoBF < const typename +00021 template < class M > class moMoveExpl:public eoBF < const typename 00022 M::EOType &, 00023 typename 00024 M::EOType &, void > @@ -47,7 +47,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html index 70ddf932e..9dd5a49f7 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename +00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename 00025 M::EOType &, 00026 typename 00027 M::EOType::Fitness > @@ -47,7 +47,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html index 8e6165ef3..05bd2ae1e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html @@ -38,14 +38,14 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moMoveInit:public eoBF < M &, const typename +00022 template < class M > class moMoveInit:public eoBF < M &, const typename 00023 M::EOType &, void > 00024 { 00025 00026 }; 00027 00028 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html index bb5fc5222..00d8d4fd2 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html index 5ecde3ab0..fabfedcc5 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html @@ -44,7 +44,7 @@ 00024 }; 00025 00027 -00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, +00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, 00033 void > 00034 { 00035 public: @@ -65,7 +65,7 @@ 00063 }; 00064 00065 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html index c07b9bcaf..90bd86cc0 100644 --- a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moNextMove:public eoBF < M &, const typename +00022 template < class M > class moNextMove:public eoBF < M &, const typename 00023 M::EOType &, 00024 bool > 00025 { @@ -46,7 +46,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html index 38731a6dd..0bbe82a2e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html @@ -56,7 +56,7 @@ 00046 }; 00047 00048 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html index 422c80aa7..23a02ff8b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html @@ -96,7 +96,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html index f3393c03d..b47f6544c 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html @@ -38,13 +38,13 @@ 00015 #include <eoFunctor.h> 00016 00018 -00021 template < class M > class moRandMove:public eoUF < M &, void > +00021 template < class M > class moRandMove:public eoUF < M &, void > 00022 { 00023 00024 }; 00025 00026 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html index 2cea3d49b..12366e3a3 100644 --- a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html @@ -43,7 +43,7 @@ 00020 #include "moAlgo.h" 00021 #include "moRandMove.h" 00022 #include "moMoveIncrEval.h" -00023 #include "moCoolSched.h" +00023 #include "moCoolingSchedule.h" 00024 #include "moSolContinue.h" 00025 00026 #include <math.h> @@ -65,16 +65,16 @@ 00047 public: 00048 00050 -00060 moSA (moRandMove < M > &__move_rand, +00060 moSA (moRandMove < M > &__move_rand, 00061 moMoveIncrEval < M > &__incr_eval, 00062 moSolContinue < EOT > &__cont, 00063 double __init_temp, -00064 moCoolSched & __cool_sched, eoEvalFunc < EOT > &__full_eval): +00064 moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval): 00065 move_rand (__move_rand), 00066 incr_eval (__incr_eval), 00067 cont (__cont), 00068 init_temp (__init_temp), -00069 cool_sched (__cool_sched), +00069 cool_sched (__cool_sched), 00070 full_eval (__full_eval) 00071 { 00072 @@ -123,7 +123,7 @@ 00121 while (cont (__sol)); 00122 00123 } -00124 while (cool_sched (temp)); +00124 while (cool_sched (temp)); 00125 00126 __sol = best_sol; 00127 @@ -141,13 +141,13 @@ 00143 double 00144 init_temp; 00145 -00147 moCoolSched & cool_sched; +00147 moCoolingSchedule & cool_sched; 00148 00150 eoEvalFunc < EOT > &full_eval; // Full evaluator. 00151 }; 00152 00153 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html index 222230668..a8c147b19 100644 --- a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool > +00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool > 00023 { 00024 00025 public: @@ -47,7 +47,7 @@ 00031 }; 00032 00033 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html index 93c498677..91396374c 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html @@ -167,7 +167,7 @@ 00182 template < class EOT > bool moTS < EOT >::first_time = true; 00183 00184 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html index 89756df53..6a86f4f93 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html @@ -127,7 +127,7 @@ 00130 }; 00131 00132 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html index 84796410e..8e3945c79 100644 --- a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html @@ -38,7 +38,7 @@ 00015 #include <eoFunctor.h> 00016 00018 -00022 template < class M > class moTabuList:public eoBF < const M &, const typename +00022 template < class M > class moTabuList:public eoBF < const M &, const typename 00023 M::EOType &, 00024 bool > 00025 { @@ -64,7 +64,7 @@ 00058 }; 00059 00060 #endif -
    Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/search.idx b/trunk/paradiseo-mo/docs/html/search.idx index 2e0e0648e..a5a4e9752 100644 Binary files a/trunk/paradiseo-mo/docs/html/search.idx and b/trunk/paradiseo-mo/docs/html/search.idx differ diff --git a/trunk/paradiseo-mo/docs/html/search.php b/trunk/paradiseo-mo/docs/html/search.php index 0589134d5..a5fe19b43 100644 --- a/trunk/paradiseo-mo/docs/html/search.php +++ b/trunk/paradiseo-mo/docs/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
    Generated on Thu Dec 21 10:49:59 2006 for PARADISEO-MO by  +
    Generated on Wed Apr 18 10:15:04 2007 for PARADISEO-MO by  doxygen 1.5.1
    diff --git a/trunk/paradiseo-mo/docs/html/tree.html b/trunk/paradiseo-mo/docs/html/tree.html index 4f9e90ea7..8abd43c05 100644 --- a/trunk/paradiseo-mo/docs/html/tree.html +++ b/trunk/paradiseo-mo/docs/html/tree.html @@ -70,14 +70,15 @@

    |o*moAlgo< EOT >

    |o*moAspirCrit< M >

    |o*moBestImprSelect< M >

    -

    |o*moCoolSched

    -

    |o*moEasyCoolSched

    +

    |o*moCoolingSchedule

    +

    |o*moExponentialCoolingSchedule

    |o*moFirstImprSelect< M >

    |o*moGenSolContinue< EOT >

    |o*moHC< M >

    |o*moHCMoveLoopExpl< M >

    |o*moImprBestFitAspirCrit< M >

    |o*moItRandNextMove< M >

    +

    |o*moLinearCoolingSchedule

    |o*moLSCheckPoint< M >

    |o*moMove< EOT >

    |o*moMoveExpl< M >

    @@ -98,109 +99,69 @@

    o+Class Hierarchy

    |o*EmptySelection

    -

    |o+eoFunctorBase [external]

    +

    |o*moAlgo< EOT >

    +

    |o+moAlgo< M::EOType >

    +

    |o+moAspirCrit< M >

    + +

    |o+moCoolingSchedule

    + +

    |o*moLSCheckPoint< M >

    +

    |o*moMove< EOT >

    +

    |o+moMoveExpl< M >

    + -

    |\+eoOp< EOType > [external]

    -

    o*Class Members

    -

    \+File List

    -
    +

    \+File List

    +

     o*index.h

     o*mo.h

     o*moAlgo.h

     o*moAspirCrit.h

     o*moBestImprSelect.h

    -

     o*moCoolSched.h

    -

     o*moEasyCoolSched.h

    +

     o*moCoolingSchedule.h

    +

     o*moExponentialCoolingSchedule.h

     o*moFirstImprSelect.h

     o*moGenSolContinue.h

     o*moHC.h

     o*moHCMoveLoopExpl.h

     o*moImprBestFitAspirCrit.h

     o*moItRandNextMove.h

    +

     o*moLinearCoolingSchedule.h

     o*moLSCheckPoint.h

     o*moMove.h

     o*moMoveExpl.h

    diff --git a/trunk/paradiseo-mo/docs/latex/annotated.tex b/trunk/paradiseo-mo/docs/latex/annotated.tex index ee1ee2025..7bad31b4d 100644 --- a/trunk/paradiseo-mo/docs/latex/annotated.tex +++ b/trunk/paradiseo-mo/docs/latex/annotated.tex @@ -4,14 +4,15 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be \item\contentsline{section}{{\bf mo\-Algo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} \item\contentsline{section}{{\bf mo\-Aspir\-Crit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} \item\contentsline{section}{{\bf mo\-Best\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} -\item\contentsline{section}{{\bf mo\-Cool\-Sched} (This class gives the description of a cooling schedule )}{\pageref{classmo_cool_sched}}{} -\item\contentsline{section}{{\bf mo\-Easy\-Cool\-Sched} (One of the possible \doxyref{mo\-Cool\-Sched}{p.}{classmo_cool_sched} )}{\pageref{classmo_easy_cool_sched}}{} +\item\contentsline{section}{{\bf mo\-Cooling\-Schedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} +\item\contentsline{section}{{\bf mo\-Exponential\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} \item\contentsline{section}{{\bf mo\-First\-Impr\-Select$<$ M $>$} (One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} \item\contentsline{section}{{\bf mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} \item\contentsline{section}{{\bf mo\-HC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} \item\contentsline{section}{{\bf mo\-HCMove\-Loop\-Expl$<$ M $>$} (Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} \item\contentsline{section}{{\bf mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} (One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} \item\contentsline{section}{{\bf mo\-It\-Rand\-Next\-Move$<$ M $>$} (One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} +\item\contentsline{section}{{\bf mo\-Linear\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} \item\contentsline{section}{{\bf mo\-LSCheck\-Point$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} \item\contentsline{section}{{\bf mo\-Move$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} \item\contentsline{section}{{\bf mo\-Move\-Expl$<$ M $>$} (Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_algo.tex b/trunk/paradiseo-mo/docs/latex/classmo_algo.tex index bfd2994a6..ad07def4d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_algo.tex @@ -5,12 +5,6 @@ Description of an algorithm of the paradiseo-mo library. {\tt \#include $<$mo\-Algo.h$>$} -Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=4cm]{classmo_algo} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps index 7a0252d70..fbf0b26ef 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 218.579 +%%BoundingBox: 0 0 500 109.29 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.575 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moAspirCrit< M >) cw -(eoBF< A1, A2, R >) cw -(eoFunctorBase) cw (moImprBestFitAspirCrit< M >) cw (moNoAspirCrit< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -190,21 +188,11 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moAspirCrit< M >) 0.5 1 box - (eoBF< A1, A2, R >) 0.5 2 box - (eoFunctorBase) 0.5 3 box (moImprBestFitAspirCrit< M >) 0 0 box (moNoAspirCrit< M >) 1 0 box % ----- relations ----- -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -1 0.5 3 in solid 1 0.5 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex index 646d32397..ffec16f05 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex @@ -8,7 +8,7 @@ Description of the conditions in which a tabu move could be accepted. Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_aspir_crit} +\includegraphics[height=2cm]{classmo_aspir_crit} \end{center} \end{figure} \subsection*{Public Member Functions} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps index e1504ce28..f9c367972 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 259.74 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.925 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moBestImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moBestImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex index baf716c2f..a7b05435f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_best_impr_select} +\includegraphics[height=2cm]{classmo_best_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -77,7 +77,7 @@ Definition at line 47 of file mo\-Best\-Impr\-Select.h. References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -94,8 +94,6 @@ Procedure which saved the best move and fitness. \end{Desc} -Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. - Definition at line 68 of file mo\-Best\-Impr\-Select.h. References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex b/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex deleted file mode 100644 index 419ecef30..000000000 --- a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.tex +++ /dev/null @@ -1,27 +0,0 @@ -\section{mo\-Cool\-Sched Class Reference} -\label{classmo_cool_sched}\index{moCoolSched@{moCoolSched}} -This class gives the description of a cooling schedule. - - -{\tt \#include $<$mo\-Cool\-Sched.h$>$} - -Inheritance diagram for mo\-Cool\-Sched::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=4cm]{classmo_cool_sched} -\end{center} -\end{figure} - - -\subsection{Detailed Description} -This class gives the description of a cooling schedule. - -It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-SA}{p.}{classmo_s_a}. See \doxyref{mo\-Easy\-Cool\-Sched}{p.}{classmo_easy_cool_sched} for example. - - - -Definition at line 22 of file mo\-Cool\-Sched.h. - -The documentation for this class was generated from the following file:\begin{CompactItemize} -\item -mo\-Cool\-Sched.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps similarity index 89% rename from trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps rename to trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps index 881e79dfc..9a4b2773b 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_cool_sched.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 503.145 +%%BoundingBox: 0 0 500 203.046 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 0.99375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.4625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -173,10 +173,8 @@ boxfont setfont 1 boundaspect scale -(moCoolSched) cw -(eoUF< double &, bool >) cw -(eoFunctorBase) cw -(moEasyCoolSched) cw +(moExponentialCoolingSchedule) cw +(moCoolingSchedule) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,22 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moCoolSched) 0 1 box - (eoUF< double &, bool >) 0 2 box - (eoFunctorBase) 0 3 box - (moEasyCoolSched) 0 0 box + (moExponentialCoolingSchedule) 0 0 box + (moCoolingSchedule) 0 1 box % ----- relations ----- solid -0 0 1 out +0 0 0 out solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -1 0 0.25 out -solid -0 0 0.75 in +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex new file mode 100644 index 000000000..3a4a742b0 --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex @@ -0,0 +1,83 @@ +\section{mo\-Exponential\-Cooling\-Schedule Class Reference} +\label{classmo_exponential_cooling_schedule}\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. + + +{\tt \#include $<$mo\-Exponential\-Cooling\-Schedule.h$>$} + +Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_exponential_cooling_schedule} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf mo\-Exponential\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) +\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item +bool {\bf operator()} (double \&\_\-\_\-temp) +\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +double {\bf threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} + +\begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item +double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} + +\begin{CompactList}\small\item\em The decreasing factor of the temperature. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. + +An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold. + + + +Definition at line 22 of file mo\-Exponential\-Cooling\-Schedule.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Exponential\-Cooling\-Schedule::mo\-Exponential\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} + + +Simple constructor. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-threshold}]the threshold. \item[{\em \_\-\_\-ratio}]the ratio used to descrease the temperature. \end{description} +\end{Desc} + + +Definition at line 31 of file mo\-Exponential\-Cooling\-Schedule.h. + +\subsection{Member Function Documentation} +\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}} +\index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} + + +Function which proceeds to the cooling. + +It decreases the temperature and indicates if it is greater than the threshold. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-temp}]the current temperature. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} + + +Definition at line 41 of file mo\-Exponential\-Cooling\-Schedule.h. + +References ratio, and threshold. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +mo\-Exponential\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps index 7057473a9..04ffcb96d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 258.065 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.9375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moFirstImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moFirstImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex index e28acfa68..c202586d4 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex @@ -8,7 +8,7 @@ One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_first_impr_select} +\includegraphics[height=2cm]{classmo_first_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -90,7 +90,7 @@ Definition at line 52 of file mo\-First\-Impr\-Select.h. References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -107,8 +107,6 @@ Procedure which saved the best move and fitness. \end{Desc} -Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. - Definition at line 76 of file mo\-First\-Impr\-Select.h. References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps index c73c60ba3..c9e65107d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 441.989 +%%BoundingBox: 0 0 500 227.273 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moGenSolContinue< EOT >) cw (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moGenSolContinue< EOT >) 0 0 box (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex index 4b0194020..5f4ac8050 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex @@ -8,7 +8,7 @@ One possible stop criterion for a solution-based heuristic. Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_gen_sol_continue} +\includegraphics[height=2cm]{classmo_gen_sol_continue} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -62,7 +62,7 @@ Definition at line 30 of file mo\-Gen\-Sol\-Continue.h. \subsection{Member Function Documentation} \index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}} \index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} Function that activates the stop criterion. @@ -78,8 +78,6 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc} -Implements {\bf eo\-UF$<$ const EOT \&, bool $>$}. - Definition at line 44 of file mo\-Gen\-Sol\-Continue.h. References mo\-Gen\-Sol\-Continue$<$ EOT $>$::max\-Num\-Gen, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps b/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps index 184d2041a..648f11f20 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moHC< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moHC< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moHC< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex index dc5b26818..917388faa 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex @@ -8,15 +8,15 @@ Hill Climbing (HC). Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_h_c} +\includegraphics[height=2cm]{classmo_h_c} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize} @@ -35,7 +35,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd {\bf mo\-Move\-Expl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} +eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -54,7 +54,7 @@ Definition at line 26 of file mo\-HC.h. \subsection{Constructor \& Destructor Documentation} \index{moHC@{mo\-HC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} Full constructor. @@ -70,7 +70,7 @@ All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl Definition at line 53 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}} \index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} Light constructor. @@ -89,7 +89,7 @@ Definition at line 67 of file mo\-HC.h. \subsection{Member Function Documentation} \index{moHC@{mo\-HC}!operator()@{operator()}} \index{operator()@{operator()}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-HC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-HC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} Function which launches the HC. @@ -105,8 +105,6 @@ The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_ \item[Returns:]TRUE. \end{Desc} -Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. - Definition at line 82 of file mo\-HC.h. References mo\-HC$<$ M $>$::full\_\-eval, and mo\-HC$<$ M $>$::move\_\-expl. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps index 1240e010d..1383bbf1b 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 327.869 +%%BoundingBox: 0 0 500 346.821 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.44167 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,8 +176,6 @@ boxfont setfont (moHCMoveLoopExpl< M >) cw (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moHCMoveLoopExpl< M >) 0 0 box (moMoveLoopExpl< M >) 0 1 box (moMoveExpl< M >) 0 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box - (eoFunctorBase) 0 4 box % ----- relations ----- @@ -205,11 +201,3 @@ solid 0 0 1 out solid 1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -0 0 3 out -solid -1 0 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex index e404ab915..fbcfeea7c 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex @@ -8,7 +8,7 @@ Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_h_c_move_loop_expl} +\includegraphics[height=3cm]{classmo_h_c_move_loop_expl} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -75,7 +75,7 @@ Definition at line 43 of file mo\-HCMove\-Loop\-Expl.h. \subsection{Member Function Documentation} \index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}} \index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,8 +89,6 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} -Implements {\bf eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. - Definition at line 59 of file mo\-HCMove\-Loop\-Expl.h. References mo\-HCMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-select, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps index a00a3c3cb..41cee35a0 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 437.158 +%%BoundingBox: 0 0 500 218.579 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.14375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moImprBestFitAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< A1, A2, R >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moImprBestFitAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex index 33da06ec9..5303c7f37 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit} +\includegraphics[height=2cm]{classmo_impr_best_fit_aspir_crit} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps index 5f2df0014..bc4ea56dc 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 490.798 +%%BoundingBox: 0 0 500 245.399 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moItRandNextMove< M >) cw (moNextMove< M >) cw -(eoBF< A1, A2, R >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moItRandNextMove< M >) 0 0 box (moNextMove< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex index b9a7dc563..ff90d301e 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_it_rand_next_move} +\includegraphics[height=2cm]{classmo_it_rand_next_move} \end{center} \end{figure} \subsection*{Public Member Functions} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex b/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex index 968b56892..44cc5d177 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex @@ -5,23 +5,17 @@ Class which allows a checkpointing system. {\tt \#include $<$mo\-LSCheck\-Point.h$>$} -Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_l_s_check_point} -\end{center} -\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the checkpointing. \item\end{CompactList}\item -void {\bf add} ({\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) +void {\bf add} (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ {\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} +std::vector$<$ eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} \begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize} @@ -58,7 +52,7 @@ Definition at line 34 of file mo\-LSCheck\-Point.h. References mo\-LSCheck\-Point$<$ M $>$::func.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}} \index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::add ({\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::add (eo\-BF$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} Procedure which add a new function to the function vector. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.eps b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.eps new file mode 100644 index 000000000..35d64af4d --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.eps @@ -0,0 +1,197 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 238.095 +%%Pages: 0 +%%BeginSetup +%%EndSetup +%%EndComments + +% ----- variables ----- + +/boxwidth 0 def +/boxheight 40 def +/fontheight 24 def +/marginwidth 10 def +/distx 20 def +/disty 40 def +/boundaspect 2.1 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 2 def +/cols 1 def +/scalefactor 0 def +/boxfont /Times-Roman findfont fontheight scalefont def + +% ----- procedures ----- + +/dotted { [1 4] 0 setdash } def +/dashed { [5] 0 setdash } def +/solid { [] 0 setdash } def + +/max % result = MAX(arg1,arg2) +{ + /a exch def + /b exch def + a b gt {a} {b} ifelse +} def + +/xoffset % result = MAX(0,(scalefactor-(boxwidth*cols+distx*(cols-1)))/2) +{ + 0 scalefactor boxwidth cols mul distx cols 1 sub mul add sub 2 div max +} def + +/cw % boxwidth = MAX(boxwidth, stringwidth(arg1)) +{ + /str exch def + /boxwidth boxwidth str stringwidth pop max def +} def + +/box % draws a box with text `arg1' at grid pos (arg2,arg3) +{ gsave + 2 setlinewidth + newpath + exch xspacing mul xoffset add + exch yspacing mul + moveto + boxwidth 0 rlineto + 0 boxheight rlineto + boxwidth neg 0 rlineto + 0 boxheight neg rlineto + closepath + dup stringwidth pop neg boxwidth add 2 div + boxheight fontheight 2 div sub 2 div + rmoveto show stroke + grestore +} def + +/mark +{ newpath + exch xspacing mul xoffset add boxwidth add + exch yspacing mul + moveto + 0 boxheight 4 div rlineto + boxheight neg 4 div boxheight neg 4 div rlineto + closepath + eofill + stroke +} def + +/arrow +{ newpath + moveto + 3 -8 rlineto + -6 0 rlineto + 3 8 rlineto + closepath + eofill + stroke +} def + +/out % draws an output connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight add + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/in % draws an input connector for the block at (arg1,arg2) +{ + newpath + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul disty 2 div sub + /y exch def + /x exch def + x y moveto + 0 disty 2 div rlineto + stroke + 1 eq { x y disty 2 div add arrow } if +} def + +/hedge +{ + exch xspacing mul xoffset add boxwidth 2 div add + exch yspacing mul boxheight 2 div sub + /y exch def + /x exch def + newpath + x y moveto + boxwidth 2 div distx add 0 rlineto + stroke + 1 eq + { newpath x boxwidth 2 div distx add add y moveto + -8 3 rlineto + 0 -6 rlineto + 8 3 rlineto + closepath + eofill + stroke + } if +} def + +/vedge +{ + /ye exch def + /ys exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add dup + ys yspacing mul boxheight 2 div sub + moveto + ye yspacing mul boxheight 2 div sub + lineto + stroke +} def + +/conn % connections the blocks from col `arg1' to `arg2' of row `arg3' +{ + /ys exch def + /xe exch def + /xs exch def + newpath + xs xspacing mul xoffset add boxwidth 2 div add + ys yspacing mul disty 2 div sub + moveto + xspacing xe xs sub mul 0 + rlineto + stroke +} def + +% ----- main ------ + +boxfont setfont +1 boundaspect scale +(moLinearCoolingSchedule) cw +(moCoolingSchedule) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/scalefactor + boxwidth cols mul distx cols 1 sub mul add + boxheight rows mul disty rows 1 sub mul add boundaspect mul + max def +boundx scalefactor div boundy scalefactor div scale + +% ----- classes ----- + + (moLinearCoolingSchedule) 0 0 box + (moCoolingSchedule) 0 1 box + +% ----- relations ----- + +solid +0 0 0 out +solid +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex new file mode 100644 index 000000000..8e525ba4b --- /dev/null +++ b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex @@ -0,0 +1,83 @@ +\section{mo\-Linear\-Cooling\-Schedule Class Reference} +\label{classmo_linear_cooling_schedule}\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}} +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. + + +{\tt \#include $<$mo\-Linear\-Cooling\-Schedule.h$>$} + +Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=2cm]{classmo_linear_cooling_schedule} +\end{center} +\end{figure} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf mo\-Linear\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) +\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item +bool {\bf operator()} (double \&\_\-\_\-temp) +\begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +double {\bf threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} + +\begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item +double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} + +\begin{CompactList}\small\item\em The quantity that allows the temperature to decrease. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. + +An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. + + + +Definition at line 22 of file mo\-Linear\-Cooling\-Schedule.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} +\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Linear\-Cooling\-Schedule::mo\-Linear\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} + + +Simple constructor. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-threshold}]the threshold. \item[{\em \_\-\_\-quantity}]the quantity used to descrease the temperature. \end{description} +\end{Desc} + + +Definition at line 31 of file mo\-Linear\-Cooling\-Schedule.h. + +\subsection{Member Function Documentation} +\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}} +\index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} + + +Function which proceeds to the cooling. + +It decreases the temperature and indicates if it is greater than the threshold. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-temp}]the current temperature. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} + + +Definition at line 41 of file mo\-Linear\-Cooling\-Schedule.h. + +References quantity, and threshold. + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +mo\-Linear\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_move.tex index 873616a4c..0460f6faf 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move.tex @@ -5,12 +5,6 @@ Definition of a move. {\tt \#include $<$mo\-Move.h$>$} -Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move} -\end{center} -\end{figure} \subsection*{Public Types} \begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps index 18fb8889f..708dd0b50 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 163.934 +%%BoundingBox: 0 0 500 173.41 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw (moMoveLoopExpl< M >) cw (moHCMoveLoopExpl< M >) cw (moTSMoveLoopExpl< M >) cw @@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveExpl< M >) 0.5 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box - (eoFunctorBase) 0.5 4 box (moMoveLoopExpl< M >) 0.5 1 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box % ----- relations ----- -solid -0 0.5 2 out -solid -1 0.5 3 in -solid -0 0.5 3 out -solid -1 0.5 4 in solid 1 0.5 1.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex index 5d0b1e66b..614132a6c 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex @@ -8,7 +8,7 @@ Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4.59016cm]{classmo_move_expl} +\includegraphics[height=3cm]{classmo_move_expl} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex index 91421ef4b..6b4bd7289 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex @@ -5,12 +5,6 @@ {\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$} -Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move_incr_eval} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex index 353911436..556b323ee 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex @@ -5,12 +5,6 @@ Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. {\tt \#include $<$mo\-Move\-Init.h$>$} -Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_move_init} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps index c6a78b5b1..76326be37 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 163.934 +%%BoundingBox: 0 0 500 173.41 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.88333 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw (moHCMoveLoopExpl< M >) cw (moTSMoveLoopExpl< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moMoveLoopExpl< M >) 0.5 1 box (moMoveExpl< M >) 0.5 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0.5 3 box - (eoFunctorBase) 0.5 4 box (moHCMoveLoopExpl< M >) 0 0 box (moTSMoveLoopExpl< M >) 1 0 box @@ -204,14 +200,6 @@ solid solid 1 0.5 2 in solid -0 0.5 2 out -solid -1 0.5 3 in -solid -0 0.5 3 out -solid -1 0.5 4 in -solid 1 0.5 0.25 out solid 0 1 1 conn diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex index 1a6c5b997..8bbfd3542 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex @@ -8,7 +8,7 @@ Class which describes an iterative explorer. Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4.59016cm]{classmo_move_loop_expl} +\includegraphics[height=3cm]{classmo_move_loop_expl} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps index b61e2bf9f..86a37c002 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 101.01 +%%BoundingBox: 0 0 500 83.8574 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.95 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5.9625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 3 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw (moBestImprSelect< M >) cw (moFirstImprSelect< M >) cw (moRandImprSelect< M >) cw @@ -191,22 +189,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveSelect< M >) 1 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 1 2 box - (eoFunctorBase) 1 3 box (moBestImprSelect< M >) 0 0 box (moFirstImprSelect< M >) 1 0 box (moRandImprSelect< M >) 2 0 box % ----- relations ----- -solid -0 1 1 out -solid -1 1 2 in -solid -0 1 2 out -solid -1 1 3 in solid 1 1 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex index 2ed02f91e..390b93989 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex @@ -8,7 +8,7 @@ Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2.82828cm]{classmo_move_select} +\includegraphics[height=2cm]{classmo_move_select} \end{center} \end{figure} \subsection*{Public Types} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps b/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps index 08b997f12..d9586a593 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 490.798 +%%BoundingBox: 0 0 500 245.399 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moNextMove< M >) cw -(eoBF< A1, A2, R >) cw -(eoFunctorBase) cw (moItRandNextMove< M >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -189,20 +187,10 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moNextMove< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box - (eoFunctorBase) 0 3 box (moItRandNextMove< M >) 0 0 box % ----- relations ----- -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in solid 1 0 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex index 7da58dd8d..e51cd5566 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex @@ -8,7 +8,7 @@ Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_next_move} +\includegraphics[height=2cm]{classmo_next_move} \end{center} \end{figure} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps index f5d50a373..4a1de4c86 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 583.942 +%%BoundingBox: 0 0 500 291.971 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.7125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moNoAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< A1, A2, R >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moNoAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex index 53fcf3593..2c5a3b5e1 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex @@ -8,7 +8,7 @@ One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_ Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_no_aspir_crit} +\includegraphics[height=2cm]{classmo_no_aspir_crit} \end{center} \end{figure} \subsection*{Private Member Functions} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps index fe55210a4..74d2fc0f6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 303.03 +%%BoundingBox: 0 0 500 251.572 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.65 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.9875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,8 +175,6 @@ boxfont setfont 1 boundaspect scale (moRandImprSelect< M >) cw (moMoveSelect< M >) cw -(eoBF< M &, M::EOType::Fitness &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,8 +188,6 @@ boundx scalefactor div boundy scalefactor div scale (moRandImprSelect< M >) 0 0 box (moMoveSelect< M >) 0 1 box - (eoBF< M &, M::EOType::Fitness &, void >) 0 2 box - (eoFunctorBase) 0 3 box % ----- relations ----- @@ -199,11 +195,3 @@ solid 0 0 0 out solid 1 0 1 in -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex index 297d4d381..feaa35f47 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex @@ -8,7 +8,7 @@ One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\- Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_rand_impr_select} +\includegraphics[height=2cm]{classmo_rand_impr_select} \end{center} \end{figure} \subsection*{Public Types} @@ -96,7 +96,7 @@ Definition at line 56 of file mo\-Rand\-Impr\-Select.h. References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}} \index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -115,8 +115,6 @@ One the saved move is randomly chosen. \end{Desc} -Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. - Definition at line 77 of file mo\-Rand\-Impr\-Select.h. References mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex index a35b6919a..ff3370a8d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex @@ -5,12 +5,6 @@ Random move generator. {\tt \#include $<$mo\-Rand\-Move.h$>$} -Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_rand_move} -\end{center} -\end{figure} \subsection{Detailed Description} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps b/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps index efa0100f9..90945c761 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_s_a.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moSA< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moSA< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moSA< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex b/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex index 07cb399d6..4d26fe051 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex @@ -8,13 +8,13 @@ Simulated Annealing (SA). Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_s_a} +\includegraphics[height=2cm]{classmo_s_a} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf mo\-Cool\-Sched} \&\_\-\_\-cool\_\-sched, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf mo\-Cooling\-Schedule} \&\_\-\_\-cool\_\-sched, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} @@ -42,10 +42,10 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b3 double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} \begin{CompactList}\small\item\em Initial temperature. \item\end{CompactList}\item -{\bf mo\-Cool\-Sched} \& {\bf cool\_\-sched}\label{classmo_s_a_c7aaf7424aa1b9f889d2ba9c959e5a1d} +{\bf mo\-Cooling\-Schedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} +eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} @@ -64,7 +64,7 @@ Definition at line 32 of file mo\-SA.h. \subsection{Constructor \& Destructor Documentation} \index{moSA@{mo\-SA}!moSA@{moSA}} \index{moSA@{moSA}!moSA@{mo\-SA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-SA}$<$ M $>$::{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf mo\-Cool\-Sched} \& {\em \_\-\_\-cool\_\-sched}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_ef9ffb0d95c599e0a06c78db5f2f4b12} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-SA}$<$ M $>$::{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf mo\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} SA constructor. @@ -83,7 +83,7 @@ Definition at line 60 of file mo\-SA.h. \subsection{Member Function Documentation} \index{moSA@{mo\-SA}!operator()@{operator()}} \index{operator()@{operator()}!moSA@{mo\-SA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-SA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-SA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} function that launches the SA algorithm. @@ -99,8 +99,6 @@ As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, t \item[Returns:]TRUE. \end{Desc} -Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. - Definition at line 82 of file mo\-SA.h. References mo\-SA$<$ M $>$::cont, mo\-SA$<$ M $>$::cool\_\-sched, mo\-SA$<$ M $>$::full\_\-eval, mo\-SA$<$ M $>$::incr\_\-eval, mo\-SA$<$ M $>$::init\_\-temp, and mo\-SA$<$ M $>$::move\_\-rand. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps index c2a7fb9ca..08a227b1a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 441.989 +%%BoundingBox: 0 0 500 227.273 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 4 def +/rows 2 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,8 +174,6 @@ boxfont setfont 1 boundaspect scale (moSolContinue< EOT >) cw -(eoUF< const EOT &, bool >) cw -(eoFunctorBase) cw (moGenSolContinue< EOT >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -189,20 +187,10 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moSolContinue< EOT >) 0 1 box - (eoUF< const EOT &, bool >) 0 2 box - (eoFunctorBase) 0 3 box (moGenSolContinue< EOT >) 0 0 box % ----- relations ----- -solid -0 0 1 out -solid -1 0 2 in -solid -0 0 2 out -solid -1 0 3 in solid 1 0 0.25 out solid diff --git a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex index 457ef3ba7..9039a615f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex @@ -8,7 +8,7 @@ Class that describes a stop criterion for a solution-based heuristic. Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_sol_continue} +\includegraphics[height=2cm]{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 ({\bf eo\-UF}). +It allows to add an initialisation procedure to an object that is a unary function (eo\-UF). diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps b/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps index a62652ad5..7f23b6aef 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 271.739 +%%BoundingBox: 0 0 500 268.456 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.84 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def -/cols 2 def +/rows 2 def +/cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,10 +175,6 @@ boxfont setfont 1 boundaspect scale (moTS< M >) cw (moAlgo< M::EOType >) cw -(eoMonOp< M::EOType >) cw -(eoOp< EOType >) cw -(eoUF< M::EOType &, bool >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -190,32 +186,12 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moTS< M >) 0.5 0 box - (moAlgo< M::EOType >) 0.5 1 box - (eoMonOp< M::EOType >) 0.5 2 box - (eoOp< EOType >) 0 3 box - (eoUF< M::EOType &, bool >) 1 3 box - (eoFunctorBase) 1 4 box + (moTS< M >) 0 0 box + (moAlgo< M::EOType >) 0 1 box % ----- relations ----- solid -0 0.5 0 out +0 0 0 out solid -1 0.5 1 in -solid -0 0.5 1 out -solid -1 0.5 2 in -solid -0 0.5 2 out -solid -0 1 3 conn -solid -1 0 3 in -solid -1 1 3 in -solid -0 1 3 out -solid -1 1 4 in +1 0 1 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex index 08c652ad2..8cf3ec796 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex @@ -8,15 +8,15 @@ Tabu Search (TS). Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_t_s} +\includegraphics[height=2cm]{classmo_t_s} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, eo\-Eval\-Func$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} @@ -38,7 +38,7 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f8 {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} +eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection*{Static Private Attributes} @@ -66,7 +66,7 @@ Definition at line 30 of file mo\-TS.h. \subsection{Constructor \& Destructor Documentation} \index{moTS@{mo\-TS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. @@ -84,7 +84,7 @@ Definition at line 59 of file mo\-TS.h. References mo\-TS$<$ M $>$::first\_\-time, and mo\-TS$<$ M $>$::mutex.\index{moTS@{mo\-TS}!moTS@{moTS}} \index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, eo\-Eval\-Func$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -105,7 +105,7 @@ References mo\-TS$<$ M $>$::first\_\-time, and mo\-TS$<$ M $>$::mutex. \subsection{Member Function Documentation} \index{moTS@{mo\-TS}!operator()@{operator()}} \index{operator()@{operator()}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-TS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-TS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} Function which launchs the Tabu Search. @@ -121,8 +121,6 @@ Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyr \item[Returns:]TRUE. \end{Desc} -Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. - Definition at line 104 of file mo\-TS.h. References mo\-TS$<$ M $>$::cont, mo\-TS$<$ M $>$::full\_\-eval, mo\-TS$<$ M $>$::move\_\-expl, and mo\-TS$<$ M $>$::mutex. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps index fd31fc02a..d8324527a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 327.869 +%%BoundingBox: 0 0 500 352.941 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.525 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.41667 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 5 def +/rows 3 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,8 +176,6 @@ boxfont setfont (moTSMoveLoopExpl< M >) cw (moMoveLoopExpl< M >) cw (moMoveExpl< M >) cw -(eoBF< const M::EOType &, M::EOType &, void >) cw -(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -192,8 +190,6 @@ boundx scalefactor div boundy scalefactor div scale (moTSMoveLoopExpl< M >) 0 0 box (moMoveLoopExpl< M >) 0 1 box (moMoveExpl< M >) 0 2 box - (eoBF< const M::EOType &, M::EOType &, void >) 0 3 box - (eoFunctorBase) 0 4 box % ----- relations ----- @@ -205,11 +201,3 @@ solid 0 0 1 out solid 1 0 2 in -solid -0 0 2 out -solid -1 0 3 in -solid -0 0 3 out -solid -1 0 4 in diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex index 40aeadccd..5f7327560 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex @@ -8,7 +8,7 @@ Explorer for a Tabu Search algorithm. Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=5cm]{classmo_t_s_move_loop_expl} +\includegraphics[height=3cm]{classmo_t_s_move_loop_expl} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -83,7 +83,7 @@ References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, and mo\-TSMove\-Loop\ \subsection{Member Function Documentation} \index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}} \index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,8 +97,6 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} -Implements {\bf eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. - Definition at line 69 of file mo\-TSMove\-Loop\-Expl.h. References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, mo\-TSMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-select, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex index 7968975e6..5341527b7 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex @@ -5,12 +5,6 @@ Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. {\tt \#include $<$mo\-Tabu\-List.h$>$} -Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] -\begin{center} -\leavevmode -\includegraphics[height=3cm]{classmo_tabu_list} -\end{center} -\end{figure} \subsection*{Public Types} \begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/docs/latex/doxygen.sty b/trunk/paradiseo-mo/docs/latex/doxygen.sty index 20a334e06..3478fc768 100644 --- a/trunk/paradiseo-mo/docs/latex/doxygen.sty +++ b/trunk/paradiseo-mo/docs/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Dec 21 10:49:58 2006 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Apr 18 10:15:03 2007 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/docs/latex/hierarchy.tex b/trunk/paradiseo-mo/docs/latex/hierarchy.tex index 4c6ee27b0..d6a58bf5a 100644 --- a/trunk/paradiseo-mo/docs/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/docs/latex/hierarchy.tex @@ -1,23 +1,25 @@ \section{PARADISEO-MO Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} \item \contentsline{section}{Empty\-Selection}{\pageref{class_empty_selection}}{} -\item eo\-Functor\-Base{\tt [external]}\begin{CompactList} -\item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} +\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} +\end{CompactList} \item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \begin{CompactList} \item \contentsline{section}{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} \item \contentsline{section}{mo\-No\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} \end{CompactList} -\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} -\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}}{} +\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} \begin{CompactList} -\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{} +\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{} \end{CompactList} -\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} -\end{CompactList} -\item eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} +\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} \item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{} \begin{CompactList} \item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} @@ -26,49 +28,22 @@ 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} -\end{CompactList} -\item eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} +\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{} \item \contentsline{section}{mo\-Move\-Select$<$ M $>$}{\pageref{classmo_move_select}}{} \begin{CompactList} \item \contentsline{section}{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 eo\-UF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} \item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} \item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} \end{CompactList} -\end{CompactList} -\item eo\-UF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Cool\-Sched}{\pageref{classmo_cool_sched}}{} -\begin{CompactList} -\item \contentsline{section}{mo\-Easy\-Cool\-Sched}{\pageref{classmo_easy_cool_sched}}{} -\end{CompactList} -\end{CompactList} -\item eo\-UF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} -\end{CompactList} -\end{CompactList} -\item eo\-UF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} -\end{CompactList} -\item eo\-UF$<$ EOType \&, bool $>${\tt [external]}\item eo\-UF$<$ M \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} -\end{CompactList} -\item eo\-UF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} -\begin{CompactList} -\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} -\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} -\end{CompactList} -\end{CompactList} -\end{CompactList} -\end{CompactList} -\item eo\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} -\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\end{CompactList} +\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/docs/latex/main.tex b/trunk/paradiseo-mo/docs/latex/main.tex index 8dba03e9c..3ce1b6114 100644 --- a/trunk/paradiseo-mo/docs/latex/main.tex +++ b/trunk/paradiseo-mo/docs/latex/main.tex @@ -1,5 +1,5 @@ -\section{intro}\label{main_intro} -MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par - It contains classes for almost any kind of one solution based heuristics.\section{tutorial}\label{main_tutorial} -\section{install}\label{main_install} -The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{design}\label{main_design} +\section{Introduction}\label{main_intro} +MO is an extension of the ANSI-C++ compliant evolutionary computation library EO. \par + It contains classes for almost any kind of one solution based heuristics.\section{Tutorial}\label{main_tutorial} +\section{Installation}\label{main_install} +The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree.\section{Overall Design}\label{main_design} diff --git a/trunk/paradiseo-mo/docs/latex/refman.tex b/trunk/paradiseo-mo/docs/latex/refman.tex index 8d5e2a2b2..9f3937ba0 100644 --- a/trunk/paradiseo-mo/docs/latex/refman.tex +++ b/trunk/paradiseo-mo/docs/latex/refman.tex @@ -19,7 +19,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.5.1}\\ \vspace*{0.5cm} -{\small Thu Dec 21 10:49:58 2006}\\ +{\small Wed Apr 18 10:15:03 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -38,14 +38,15 @@ \include{classmo_algo} \include{classmo_aspir_crit} \include{classmo_best_impr_select} -\include{classmo_cool_sched} -\include{classmo_easy_cool_sched} +\include{classmo_cooling_schedule} +\include{classmo_exponential_cooling_schedule} \include{classmo_first_impr_select} \include{classmo_gen_sol_continue} \include{classmo_h_c} \include{classmo_h_c_move_loop_expl} \include{classmo_impr_best_fit_aspir_crit} \include{classmo_it_rand_next_move} +\include{classmo_linear_cooling_schedule} \include{classmo_l_s_check_point} \include{classmo_move} \include{classmo_move_expl} diff --git a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 index 4e5763df0..0f921b82c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 +++ b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 @@ -1,4 +1,4 @@ -.TH "EmptySelection" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 index 772463721..075b788cc 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 @@ -1,4 +1,4 @@ -.TH "moAlgo" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moAlgo \- Description of an algorithm of the paradiseo-mo library. .PP \fC#include \fP .PP -Inherits \fBeoMonOp< EOT >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 index 028e7c5a5..2651c5685 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moAspirCrit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType::Fitness &, bool >\fP. -.PP Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .PP .SS "Public Member Functions" diff --git a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 index 61aa205ae..01cb1515f 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moBestImprSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -88,7 +88,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 47 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. -.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -105,8 +105,6 @@ Procedure which saved the best move and fitness. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 68 of file moBestImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 b/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 deleted file mode 100644 index 360c8af81..000000000 --- a/trunk/paradiseo-mo/docs/man/man3/moCoolSched.3 +++ /dev/null @@ -1,27 +0,0 @@ -.TH "moCoolSched" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- -.ad l -.nh -.SH NAME -moCoolSched \- This class gives the description of a cooling schedule. - -.PP -.SH SYNOPSIS -.br -.PP -\fC#include \fP -.PP -Inherits \fBeoUF< double &, bool >\fP. -.PP -Inherited by \fBmoEasyCoolSched\fP. -.PP -.SH "Detailed Description" -.PP -This class gives the description of a cooling schedule. - -It is only a description... An object that herits from this class is needed to be used in a \fBmoSA\fP. See \fBmoEasyCoolSched\fP for example. -.PP -Definition at line 22 of file moCoolSched.h. - -.SH "Author" -.PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 similarity index 53% rename from trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 rename to trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 index a31c5a84d..2f96c712b 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moEasyCoolSched.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 @@ -1,22 +1,22 @@ -.TH "moEasyCoolSched" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME -moEasyCoolSched \- One of the possible \fBmoCoolSched\fP. +moExponentialCoolingSchedule \- One of the possible \fBmoCoolingSchedule\fP. .PP .SH SYNOPSIS .br .PP -\fC#include \fP +\fC#include \fP .PP -Inherits \fBmoCoolSched\fP. +Inherits \fBmoCoolingSchedule\fP. .PP .SS "Public Member Functions" .in +1c .ti -1c -.RI "\fBmoEasyCoolSched\fP (double __threshold, double __ratio)" +.RI "\fBmoExponentialCoolingSchedule\fP (double __threshold, double __ratio)" .br .RI "\fISimple constructor. \fP" .ti -1c @@ -38,14 +38,14 @@ Inherits \fBmoCoolSched\fP. .in -1c .SH "Detailed Description" .PP -One of the possible \fBmoCoolSched\fP. +One of the possible \fBmoCoolingSchedule\fP. -The simpliest, the temperature decrease according to a ratio until it greater than a threshold. +An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold. .PP -Definition at line 22 of file moEasyCoolSched.h. +Definition at line 22 of file moExponentialCoolingSchedule.h. .SH "Constructor & Destructor Documentation" .PP -.SS "moEasyCoolSched::moEasyCoolSched (double __threshold, double __ratio)\fC [inline]\fP" +.SS "moExponentialCoolingSchedule::moExponentialCoolingSchedule (double __threshold, double __ratio)\fC [inline]\fP" .PP Simple constructor. .PP @@ -58,14 +58,14 @@ Simple constructor. .PP .PP -Definition at line 31 of file moEasyCoolSched.h. +Definition at line 31 of file moExponentialCoolingSchedule.h. .SH "Member Function Documentation" .PP -.SS "bool moEasyCoolSched::operator() (double & __temp)\fC [inline, virtual]\fP" +.SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" .PP Function which proceeds to the cooling. .PP -Decrease the temperature and indicates if it is greater than the threshold. +It decreases the temperature and indicates if it is greater than the threshold. .PP \fBParameters:\fP .RS 4 @@ -79,9 +79,7 @@ if the new temperature (current temperature * ratio) is greater than the thresho .PP .PP -Implements \fBeoUF< double &, bool >\fP. -.PP -Definition at line 44 of file moEasyCoolSched.h. +Definition at line 41 of file moExponentialCoolingSchedule.h. .PP References ratio, and threshold. diff --git a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 index 216c52e83..8d04a0689 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moFirstImprSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -101,7 +101,7 @@ TRUE if the move does not improve the fitness. Definition at line 52 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. -.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP Procedure which saved the best move and fitness. .PP @@ -118,8 +118,6 @@ Procedure which saved the best move and fitness. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 76 of file moFirstImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 index 2540dd451..0ce321bdf 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moGenSolContinue" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -65,7 +65,7 @@ Simple constructor. Definition at line 30 of file moGenSolContinue.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline]\fP" .PP Function that activates the stop criterion. .PP @@ -82,8 +82,6 @@ TRUE or FALSE according to the current generation number. .RE .PP -.PP -Implements \fBeoUF< const EOT &, bool >\fP. .PP Definition at line 44 of file moGenSolContinue.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moHC.3 b/trunk/paradiseo-mo/docs/man/man3/moHC.3 index 1d817d764..426ce9247 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHC.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHC.3 @@ -1,4 +1,4 @@ -.TH "moHC" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoMoveSelect\fP< M > &__move_select, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIFull constructor. \fP" .ti -1c -.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoHC\fP (\fBmoMoveExpl\fP< M > &__move_expl, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fILight constructor. \fP" .ti -1c @@ -48,7 +48,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIComplete exploration of the neighborhood. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -63,7 +63,7 @@ Class which describes the algorithm for a hill climbing. Definition at line 26 of file moHC.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Full constructor. .PP @@ -85,7 +85,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP. .PP Definition at line 53 of file moHC.h. -.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Light constructor. .PP @@ -103,7 +103,7 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM Definition at line 67 of file moHC.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP Function which launches the HC. .PP @@ -120,8 +120,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moHC.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 index 64b83c7cc..e3c737164 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moHCMoveLoopExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -87,7 +87,7 @@ All the boxes have to be specified. Definition at line 43 of file moHCMoveLoopExpl.h. .SH "Member Function Documentation" .PP -.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" +.SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" .PP Procedure which launches the explorer. .PP @@ -101,8 +101,6 @@ The exploration starts from an old solution and provides a new solution. .RE .PP -.PP -Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 59 of file moHCMoveLoopExpl.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 index 33ef6d607..5f5172b03 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moImprBestFitAspirCrit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 index c68b251d9..917b0be43 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 @@ -1,4 +1,4 @@ -.TH "moItRandNextMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 index 0237d254f..67671ca24 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 @@ -1,4 +1,4 @@ -.TH "moLSCheckPoint" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ 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 @@ -20,7 +18,7 @@ Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP. .br .RI "\fIFunction which launches the checkpointing. \fP" .ti -1c -.RI "void \fBadd\fP (\fBeoBF\fP< const M &, const typename M::EOType &, void > &__f)" +.RI "void \fBadd\fP (eoBF< const M &, const typename M::EOType &, void > &__f)" .br .RI "\fIProcedure which add a new function to the function vector. \fP" .in -1c @@ -28,7 +26,7 @@ Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP. .in +1c .ti -1c -.RI "std::vector< \fBeoBF\fP< const M &, const typename M::EOType &, void > * > \fBfunc\fP" +.RI "std::vector< eoBF< const M &, const typename M::EOType &, void > * > \fBfunc\fP" .br .RI "\fIvector of function \fP" .in -1c @@ -61,7 +59,7 @@ Each saved function is used on the current move and the current solution. Definition at line 34 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::func. -.SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" +.SS "template void \fBmoLSCheckPoint\fP< M >::add (eoBF< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" .PP Procedure which add a new function to the function vector. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 new file mode 100644 index 000000000..bdaf31121 --- /dev/null +++ b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 @@ -0,0 +1,88 @@ +.TH "moLinearCoolingSchedule" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.ad l +.nh +.SH NAME +moLinearCoolingSchedule \- One of the possible \fBmoCoolingSchedule\fP. + +.PP +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +Inherits \fBmoCoolingSchedule\fP. +.PP +.SS "Public Member Functions" + +.in +1c +.ti -1c +.RI "\fBmoLinearCoolingSchedule\fP (double __threshold, double __quantity)" +.br +.RI "\fISimple constructor. \fP" +.ti -1c +.RI "bool \fBoperator()\fP (double &__temp)" +.br +.RI "\fIFunction which proceeds to the cooling. \fP" +.in -1c +.SS "Private Attributes" + +.in +1c +.ti -1c +.RI "double \fBthreshold\fP" +.br +.RI "\fIThe temperature threhold. \fP" +.ti -1c +.RI "double \fBquantity\fP" +.br +.RI "\fIThe quantity that allows the temperature to decrease. \fP" +.in -1c +.SH "Detailed Description" +.PP +One of the possible \fBmoCoolingSchedule\fP. + +An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. +.PP +Definition at line 22 of file moLinearCoolingSchedule.h. +.SH "Constructor & Destructor Documentation" +.PP +.SS "moLinearCoolingSchedule::moLinearCoolingSchedule (double __threshold, double __quantity)\fC [inline]\fP" +.PP +Simple constructor. +.PP +\fBParameters:\fP +.RS 4 +\fI__threshold\fP the threshold. +.br +\fI__quantity\fP the quantity used to descrease the temperature. +.RE +.PP + +.PP +Definition at line 31 of file moLinearCoolingSchedule.h. +.SH "Member Function Documentation" +.PP +.SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline]\fP" +.PP +Function which proceeds to the cooling. +.PP +It decreases the temperature and indicates if it is greater than the threshold. +.PP +\fBParameters:\fP +.RS 4 +\fI__temp\fP the current temperature. +.RE +.PP +\fBReturns:\fP +.RS 4 +if the new temperature (current temperature - quantity) is greater than the threshold. +.RE +.PP + +.PP +Definition at line 41 of file moLinearCoolingSchedule.h. +.PP +References quantity, and threshold. + +.SH "Author" +.PP +Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/docs/man/man3/moMove.3 b/trunk/paradiseo-mo/docs/man/man3/moMove.3 index 41ac67dc7..b7390ae29 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMove.3 @@ -1,4 +1,4 @@ -.TH "moMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMove \- Definition of a move. .PP \fC#include \fP .PP -Inherits \fBeoUF< EOT &, void >\fP. -.PP .SS "Public Types" .in +1c diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 index 2b0bde497..c4a3840a8 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveExpl \- Description of a move (\fBmoMove\fP) explorer. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M::EOType &, M::EOType &, void >\fP. -.PP Inherited by \fBmoMoveLoopExpl< M >\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 index f3185451c..0eb298d92 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 @@ -1,4 +1,4 @@ -.TH "moMoveIncrEval" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 index 59a19f5cf..2cb87036e 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 @@ -1,4 +1,4 @@ -.TH "moMoveInit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveInit \- Move (\fBmoMove\fP) initializer. .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, void >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 index eb1908a8a..5e09ada7b 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveLoopExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 index 568b14c14..faa52d0a1 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 @@ -1,4 +1,4 @@ -.TH "moMoveSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moMoveSelect \- Class that describes a move selector (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, M::EOType::Fitness &, void >\fP. -.PP Inherited by \fBmoBestImprSelect< M >\fP, \fBmoFirstImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .PP .SS "Public Types" diff --git a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 index b3d0b7c37..da06276f7 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 @@ -1,4 +1,4 @@ -.TH "moNextMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, bool >\fP. -.PP Inherited by \fBmoItRandNextMove< M >\fP. .PP .SH "Detailed Description" diff --git a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 index f0c8ab561..a20da9d3c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moNoAspirCrit" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 index f76568465..05f0460fc 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moRandImprSelect" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -106,7 +106,7 @@ Implements \fBmoMoveSelect< M >\fP. Definition at line 56 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. -.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" +.SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline]\fP" .PP The move selection. .PP @@ -125,8 +125,6 @@ One the saved move is randomly chosen. .RE .PP -.PP -Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP Definition at line 77 of file moRandImprSelect.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 index 1e08a422c..a54198844 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 @@ -1,4 +1,4 @@ -.TH "moRandMove" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moRandMove \- Random move generator. .PP \fC#include \fP .PP -Inherits \fBeoUF< M &, void >\fP. -.PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSA.3 b/trunk/paradiseo-mo/docs/man/man3/moSA.3 index c44f363d7..5be16a09e 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSA.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSA.3 @@ -1,4 +1,4 @@ -.TH "moSA" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,7 +16,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolSched\fP &__cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoSA\fP (\fBmoRandMove\fP< M > &__move_rand, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, double __init_temp, \fBmoCoolingSchedule\fP &__cool_sched, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fISA constructor. \fP" .ti -1c @@ -56,11 +56,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIInitial temperature. \fP" .ti -1c -.RI "\fBmoCoolSched\fP & \fBcool_sched\fP" +.RI "\fBmoCoolingSchedule\fP & \fBcool_sched\fP" .br .RI "\fIThe cooling schedule. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIA full evaluation function. \fP" .in -1c @@ -75,7 +75,7 @@ Class that describes a Simulated Annealing algorithm. Definition at line 32 of file moSA.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolSched\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP SA constructor. .PP @@ -101,7 +101,7 @@ All the boxes used by a SA need to be given. Definition at line 60 of file moSA.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP function that launches the SA algorithm. .PP @@ -118,8 +118,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 82 of file moSA.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 index dfeadddd6..0300649cc 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSolContinue" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moSolContinue \- Class that describes a stop criterion for a solution-based heur .PP \fC#include \fP .PP -Inherits \fBeoUF< const EOT &, bool >\fP. -.PP Inherited by \fBmoGenSolContinue< EOT >\fP. .PP .SS "Public Member Functions" @@ -28,7 +26,7 @@ Inherited by \fBmoGenSolContinue< EOT >\fP. .SS "template class moSolContinue< EOT >" Class that describes a stop criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). +It allows to add an initialisation procedure to an object that is a unary function (eoUF). .PP Definition at line 22 of file moSolContinue.h. .SH "Member Function Documentation" diff --git a/trunk/paradiseo-mo/docs/man/man3/moTS.3 b/trunk/paradiseo-mo/docs/man/man3/moTS.3 index 726cedc54..6a9435623 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTS.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTS.3 @@ -1,4 +1,4 @@ -.TH "moTS" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,11 +16,11 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveInit\fP< M > &__move_init, \fBmoNextMove\fP< M > &__next_move, \fBmoMoveIncrEval\fP< M > &__incr_eval, \fBmoTabuList\fP< M > &__tabu_list, \fBmoAspirCrit\fP< M > &__aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor of a \fBmoTS\fP specifying all the boxes. \fP" .ti -1c -.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, \fBeoEvalFunc\fP< \fBEOT\fP > &__full_eval)" +.RI "\fBmoTS\fP (\fBmoMoveExpl\fP< M > &__move_expl, \fBmoSolContinue\fP< \fBEOT\fP > &__cont, eoEvalFunc< \fBEOT\fP > &__full_eval)" .br .RI "\fIConstructor with less parameters. \fP" .ti -1c @@ -52,7 +52,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .br .RI "\fIStop criterion. \fP" .ti -1c -.RI "\fBeoEvalFunc\fP< \fBEOT\fP > & \fBfull_eval\fP" +.RI "eoEvalFunc< \fBEOT\fP > & \fBfull_eval\fP" .br .RI "\fIFull evaluation function. \fP" .in -1c @@ -79,7 +79,7 @@ Generic algorithm that describes a tabu search. Definition at line 30 of file moTS.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor of a \fBmoTS\fP specifying all the boxes. .PP @@ -107,7 +107,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. Definition at line 59 of file moTS.h. .PP References moTS< M >::first_time, and moTS< M >::mutex. -.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" +.SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, eoEvalFunc< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor with less parameters. .PP @@ -129,7 +129,7 @@ Definition at line 81 of file moTS.h. References moTS< M >::first_time, and moTS< M >::mutex. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline]\fP" .PP Function which launchs the Tabu Search. .PP @@ -146,8 +146,6 @@ TRUE. .RE .PP -.PP -Implements \fBeoUF< M::EOType &, bool >\fP. .PP Definition at line 104 of file moTS.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 index 456766151..f80192a75 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moTSMoveLoopExpl" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -99,7 +99,7 @@ Definition at line 49 of file moTSMoveLoopExpl.h. References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list. .SH "Member Function Documentation" .PP -.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" +.SS "template void \fBmoTSMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline]\fP" .PP Procedure which lauches the exploration. .PP @@ -113,8 +113,6 @@ The exploration continues while the chosen move is not in the tabu list or the a .RE .PP -.PP -Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP Definition at line 69 of file moTSMoveLoopExpl.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 index 96a8cf631..637fd304f 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 @@ -1,4 +1,4 @@ -.TH "moTabuList" 3 "21 Dec 2006" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "18 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,8 +10,6 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP. -.PP .SS "Public Types" .in +1c diff --git a/trunk/paradiseo-mo/docs/mo.doxytag b/trunk/paradiseo-mo/docs/mo.doxytag index 599248289..f6e35d43f 100644 --- a/trunk/paradiseo-mo/docs/mo.doxytag +++ b/trunk/paradiseo-mo/docs/mo.doxytag @@ -17,13 +17,11 @@ moAlgo classmo_algo.html EOT - eoMonOp< EOT > moAspirCrit classmo_aspir_crit.html M - eoBF virtual void init @@ -88,40 +86,39 @@ - moCoolSched - classmo_cool_sched.html - eoUF< double &, bool > + moCoolingSchedule + classmo_cooling_schedule.html - moEasyCoolSched - classmo_easy_cool_sched.html - moCoolSched + moExponentialCoolingSchedule + classmo_exponential_cooling_schedule.html + moCoolingSchedule - moEasyCoolSched - classmo_easy_cool_sched.html - c556b41343700293bb17e3b20d81e0f2 + moExponentialCoolingSchedule + classmo_exponential_cooling_schedule.html + b01930c1051c0940666c6325bfd036bc (double __threshold, double __ratio) bool operator() - classmo_easy_cool_sched.html - ca08df878417ef1124e6933a9c2d7a0b + classmo_exponential_cooling_schedule.html + 00642b03453b51612a10fcf2280543db (double &__temp) double threshold - classmo_easy_cool_sched.html - 3dd53700390b7bb6428db80e01626c83 + classmo_exponential_cooling_schedule.html + 8d4327c0bb33b7121a322279eea97f84 double ratio - classmo_easy_cool_sched.html - 1f84deff87defafd927e8c323b188f38 + classmo_exponential_cooling_schedule.html + e8f3f87417c1c7253efb938a740846fa @@ -441,11 +438,43 @@ + + moLinearCoolingSchedule + classmo_linear_cooling_schedule.html + moCoolingSchedule + + + moLinearCoolingSchedule + classmo_linear_cooling_schedule.html + 2fdde7b1520d5a41251627e81cc9c13d + (double __threshold, double __quantity) + + + bool + operator() + classmo_linear_cooling_schedule.html + 814b109fdfd9426a92a5444b05014da3 + (double &__temp) + + + double + threshold + classmo_linear_cooling_schedule.html + e7f539f986801ea71392c4a55ba08a76 + + + + double + quantity + classmo_linear_cooling_schedule.html + 6159dc39ceda89b23ffdab3d6ce8d8ed + + + moLSCheckPoint classmo_l_s_check_point.html M - eoBF void operator() @@ -472,7 +501,6 @@ moMove classmo_move.html EOT - eoUF< EOT &, void > EOT EOType @@ -485,19 +513,16 @@ 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 @@ -509,7 +534,6 @@ moMoveSelect classmo_move_select.html M - eoBF< M &, M::EOType::Fitness &, void > M::EOType::Fitness Fitness @@ -536,7 +560,6 @@ moNextMove classmo_next_move.html M - eoBF moNoAspirCrit @@ -617,7 +640,6 @@ moRandMove classmo_rand_move.html M - eoUF< M &, void > moSA @@ -628,8 +650,8 @@ moSA classmo_s_a.html - ef9ffb0d95c599e0a06c78db5f2f4b12 - (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolSched &__cool_sched, eoEvalFunc< EOT > &__full_eval) + 01f6a44483e5a7abbce33eb480b6a9b9 + (moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval) bool @@ -681,10 +703,10 @@ - moCoolSched & + moCoolingSchedule & cool_sched classmo_s_a.html - c7aaf7424aa1b9f889d2ba9c959e5a1d + 11c7d0cab649b7d680dd85bb74cb4ff6 @@ -699,7 +721,6 @@ moSolContinue classmo_sol_continue.html EOT - eoUF< const EOT &, bool > virtual void init @@ -712,7 +733,6 @@ moTabuList classmo_tabu_list.html M - eoBF M::EOType EOT diff --git a/trunk/paradiseo-mo/src/moSA.h b/trunk/paradiseo-mo/src/moSA.h index c3e3de263..aabd5805f 100755 --- a/trunk/paradiseo-mo/src/moSA.h +++ b/trunk/paradiseo-mo/src/moSA.h @@ -20,7 +20,7 @@ #include "moAlgo.h" #include "moRandMove.h" #include "moMoveIncrEval.h" -#include "moCoolSched.h" +#include "moCoolingSchedule.h" #include "moSolContinue.h" #include @@ -61,7 +61,7 @@ public: moMoveIncrEval < M > &__incr_eval, moSolContinue < EOT > &__cont, double __init_temp, - moCoolSched & __cool_sched, eoEvalFunc < EOT > &__full_eval): + moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval): move_rand (__move_rand), incr_eval (__incr_eval), cont (__cont), @@ -144,7 +144,7 @@ private: init_temp; //! The cooling schedule - moCoolSched & cool_sched; + moCoolingSchedule & cool_sched; //! A full evaluation function. eoEvalFunc < EOT > &full_eval; // Full evaluator. diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing index 0b1b7444b..a897e1915 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing and b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search index b3ec6e2f3..8a7d16e2e 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search and b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing index 04294675b..6173c80c2 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing and b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp index 01747f09a..144f714c5 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp @@ -10,7 +10,8 @@ */ #include -#include +#include +#include #include #include @@ -51,7 +52,8 @@ int main (int __argc, char * __argv []) { TwoOpt move ; - moEasyCoolSched cool_sched (0.1, 0.98) ; // Cooling Schedule + moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule + //moLinearCoolingSchedule cool_sched (0.1, 0.5) ; // Linear Cooling Schedule moGenSolContinue cont (1000) ; /* Temperature Descreasing will occur each 1000 diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a index c52018d46..6ebcd867e 100644 Binary files a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a and b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a differ