diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index 9409c33f8..6c8dfc10b 100644 --- a/trunk/paradiseo-mo/doc/html/annotated.html +++ b/trunk/paradiseo-mo/doc/html/annotated.html @@ -38,7 +38,8 @@ 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 + moFitSolContinue< EOT >One possible stop criterion for a solution-based heuristic + moGenSolContinue< EOT >One possible stopping 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 @@ -53,17 +54,19 @@ moMoveSelect< M >Class that describes a move selector (moMove) moNextMove< M >Class which allows to generate a new move (moMove) moNoAspirCrit< M >One of the possible aspiration criterion (moAspirCrit) + moNoFitImprSolContinue< EOT >One possible stop criterion for a solution-based heuristic moRandImprSelect< M >One of the possible moMove selector (moMoveSelect) moRandMove< M >Random move generator moSA< M >Simulated Annealing (SA) moSimpleMoveTabuList< M >Class describing a move tabu list with a limited memory moSimpleSolutionTabuList< M >Class describing a solution tabu list with limited length - moSolContinue< EOT >Class that describes a stop criterion for a solution-based heuristic + moSolContinue< EOT >Class that describes a stopping criterion for a solution-based heuristic + moSteadyFitSolContinue< EOT >One possible stopping criterion for a solution-based heuristic moTabuList< M >Class describing a tabu list that a moTS uses moTS< M >Tabu Search (TS) moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/class_empty_selection.html b/trunk/paradiseo-mo/doc/html/class_empty_selection.html index 27239f582..4b9db688d 100644 --- a/trunk/paradiseo-mo/doc/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/doc/html/class_empty_selection.html @@ -47,7 +47,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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classes.html b/trunk/paradiseo-mo/doc/html/classes.html index 83d6f5416..f554c1dda 100644 --- a/trunk/paradiseo-mo/doc/html/classes.html +++ b/trunk/paradiseo-mo/doc/html/classes.html @@ -33,9 +33,8 @@

PARADISEO-MO Class Index

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

  A  
-		moHC   
  N  
-
moAlgo   moHCMoveLoopExpl   moNextMove   
moAspirCrit   
  I  
-		moNoAspirCrit   
  B  
+		moHC   moNextMove   
moAlgo   moHCMoveLoopExpl   moNoAspirCrit   
moAspirCrit   
  I  
+		moNoFitImprSolContinue   
  B  
moImprBestFitAspirCrit   
  R  
moBestImprSelect   moItRandNextMove   moRandImprSelect   
  C  
  L  
@@ -43,11 +42,12 @@
  E  
moLSCheckPoint   moSA   
EmptySelection   
  M  
moSimpleMoveTabuList   
moExponentialCoolingSchedule   moMove   moSimpleSolutionTabuList   
  F  
-		moMoveExpl   moSolContinue   
moFirstImprSelect   moMoveIncrEval   
  T  
+		moMoveExpl   moSolContinue   
moFirstImprSelect   moMoveIncrEval   moSteadyFitSolContinue   
moFitSolContinue   moMoveInit   
  T  
  G  
-		moMoveInit   moTabuList   
moGenSolContinue   moMoveLoopExpl   moTS   
  H  
-		moMoveSelect   moTSMoveLoopExpl   

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

-

Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +moMoveLoopExpl   moTabuList   moGenSolContinue   moMoveSelect   moTS   
  H  
+
  N  
+moTSMoveLoopExpl   

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

+

Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo-members.html b/trunk/paradiseo-mo/doc/html/classmo_algo-members.html index 69c0b05ed..02b1fcad9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo-members.html @@ -42,7 +42,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< EOT &, bool > [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo.html b/trunk/paradiseo-mo/doc/html/classmo_algo.html index 4df7acbd0..ec94dbc0a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo.html @@ -58,7 +58,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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html index 4c0ce5bab..badb27eeb 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit-members.html @@ -36,7 +36,7 @@ operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html index 50995f59d..349bbbc21 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html @@ -88,7 +88,7 @@ Implemented in moAspirCrit.h -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html index 6ac91d235..787cb76e3 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select-members.html @@ -41,7 +41,7 @@ update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html index 5a03d73aa..22a8ca382 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html @@ -184,7 +184,7 @@ References moBest

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html index 42e61001e..714d89727 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html @@ -35,7 +35,7 @@ operator()(double &)=0eoUF< double &, bool > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< double &, bool > [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html index 52c4b3e6c..5ce588db2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html @@ -55,7 +55,7 @@ It is only a description... An object that herits from this class is needed to b

Definition at line 22 of file moCoolingSchedule.h.

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html index bbe1c3f84..a9c767fee 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule-members.html @@ -38,7 +38,7 @@ thresholdmoExponentialCoolingSchedule [private] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< double &, bool > [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html index d267bc82f..295ff0214 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html @@ -146,7 +146,7 @@ References moExponentialCoolingSchedule.h -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html index 0ce0b988c..0985670be 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select-members.html @@ -43,7 +43,7 @@ validmoFirstImprSelect< M > [private] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html index ad1d1f128..45683c6e9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html @@ -215,7 +215,7 @@ References moFir

The documentation for this class was generated from the following file: -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html new file mode 100644 index 000000000..f59c873ce --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html @@ -0,0 +1,47 @@ + + +PARADISEO-MO: Member List + + + + +
+ +
+
+ +
+

moFitSolContinue< EOT > Member List

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

+ + + + + + + + + +
Fitness typedefmoFitSolContinue< EOT >
fitnessmoFitSolContinue< EOT > [private]
functor_category()eoUF< const EOT &, bool > [static]
init()moFitSolContinue< EOT > [inline, virtual]
maximizationmoFitSolContinue< EOT > [private]
moFitSolContinue(Fitness __fitness, bool __maximization=true)moFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moFitSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html new file mode 100644 index 000000000..fff45bfb1 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html @@ -0,0 +1,192 @@ + + +PARADISEO-MO: moFitSolContinue< EOT > Class Template Reference + + + + +
+ +
+
+ +
+

moFitSolContinue< EOT > Class Template Reference

One possible stop criterion for a solution-based heuristic. +More... +

+#include <moFitSolContinue.h> +

+

Inheritance diagram for moFitSolContinue< EOT >: +

+ +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase + +List of all members. + + + + + + + + + + + + + + + + + + + + + + +

Public Types

+typedef EOT::Fitness Fitness
 Alias for the fitness.

Public Member Functions

 moFitSolContinue (Fitness __fitness, bool __maximization=true)
 Basic constructor.
bool operator() (const EOT &__sol)
 Function that activates the stopping criterion.
+void init ()
 Procedure which allows to initialise all the stuff needed.

Private Attributes

+Fitness fitness
 Fitness target.
bool maximization
 Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value.
+

Detailed Description

+

template<class EOT>
+ class moFitSolContinue< EOT >

+ +One possible stop criterion for a solution-based heuristic. +

+The stop criterion corresponds to a fitness threshold gained. +

+ +

+Definition at line 21 of file moFitSolContinue.h.

Constructor & Destructor Documentation

+ +
+
+
+template<class EOT>
+ + + + + + + + + + + + + + + + + + +
moFitSolContinue< EOT >::moFitSolContinue (Fitness  __fitness,
bool  __maximization = true 
) [inline]
+
+
+ +

+Basic constructor. +

+

Parameters:
+ + + +
__fitness The fitness to reach.
__maximization Indicate if the the aim is to maximize or minimize the fitness.
+
+ +

+Definition at line 34 of file moFitSolContinue.h. +

+

+

Member Function Documentation

+ +
+
+
+template<class EOT>
+ + + + + + + + + +
bool moFitSolContinue< EOT >::operator() (const EOT &  __sol  )  [inline, virtual]
+
+
+ +

+Function that activates the stopping criterion. +

+Indicates if the fitness threshold has not been yet reached.

+

Parameters:
+ + +
__sol the current solution.
+
+
Returns:
true or false according to the value of the fitness.
+ +

+Implements eoUF< const EOT &, bool >. +

+Definition at line 44 of file moFitSolContinue.h. +

+References moFitSolContinue< EOT >::fitness, and moFitSolContinue< EOT >::maximization. +

+

+

Member Data Documentation

+ +
+
+
+template<class EOT>
+ + + + +
bool moFitSolContinue< EOT >::maximization [private]
+
+
+ +

+Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. +

+It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +

+Definition at line 72 of file moFitSolContinue.h. +

+Referenced by moFitSolContinue< EOT >::operator()(). +

+

+

The documentation for this class was generated from the following file: +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  + +doxygen 1.5.2
+ + diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png new file mode 100644 index 000000000..76c36e46c Binary files /dev/null and b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.png differ diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html index 43ed304a6..ded9a0fd8 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue-members.html @@ -39,7 +39,7 @@ operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< const EOT &, bool > [virtual] -
Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html index 970b2bd77..eb05162a2 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html @@ -30,7 +30,7 @@
  • Class Members
    • -

    moGenSolContinue< EOT > Class Template Reference

    One possible stop criterion for a solution-based heuristic. +

    moGenSolContinue< EOT > Class Template Reference

    One possible stopping criterion for a solution-based heuristic. More...

    #include <moGenSolContinue.h> @@ -47,13 +47,14 @@

    Public Member Functions

     moGenSolContinue (unsigned int __maxNumGen) - Simple constructor.
    + Basic constructor.
    bool operator() (const EOT &__sol)  Function that activates the stop criterion.
    -void init () + +void init () - Procedure which allows to initialise the generation counter.
    + Procedure which allows to initialise all the stuff needed.

    Private Attributes

    unsigned int maxNumGen @@ -68,9 +69,9 @@ unsigned int template<class EOT>
    class moGenSolContinue< EOT > -One possible stop criterion for a solution-based heuristic. +One possible stopping criterion for a solution-based heuristic.

    -The stop criterion corresponds to a maximum number of iteration. +The stopping criterion corresponds to a maximum number of iteration.

    @@ -94,7 +95,7 @@ template<class EOT>

    -Simple constructor. +Basic constructor.

    Parameters:
    @@ -128,54 +129,25 @@ template<class EOT>

    Function that activates the stop criterion.

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

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

    Parameters:
    __sol the current solution.
    -
    Returns:
    TRUE or FALSE according to the current generation number.
    +
    Returns:
    true or false according to the current generation number.

    Implements eoUF< const EOT &, bool >.

    -Definition at line 44 of file moGenSolContinue.h. +Definition at line 42 of file moGenSolContinue.h.

    -References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. -

    -

    - -

    -
    -
    -template<class EOT>
    - - - - - - - - -
    void moGenSolContinue< EOT >::init (  )  [inline, virtual]
    -
    -
    - -

    -Procedure which allows to initialise the generation counter. -

    -It can also be used to reset the iteration counter. -

    -Implements moSolContinue< EOT >. -

    -Definition at line 54 of file moGenSolContinue.h. -

    -References moGenSolContinue< EOT >::numGen. +References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html index 8e5e253e6..a7ba62c3f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html @@ -48,7 +48,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< M::EOType &, bool > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.html b/trunk/paradiseo-mo/doc/html/classmo_h_c.html index a1bc3b7c6..13221c464 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c.html @@ -231,7 +231,7 @@ References moHC< M >::fu

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html index a4f1a3e32..b1e5d7d72 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl-members.html @@ -42,7 +42,7 @@ operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline, virtual] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html index 8aa678cef..0cbb71cad 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c_move_loop_expl.html @@ -193,7 +193,7 @@ References moHC

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html index e909f3e3c..cb16268c7 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit-members.html @@ -40,7 +40,7 @@ operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline, virtual] ~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html index fbeb074e1..f1a936ee4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.html @@ -131,7 +131,7 @@ References moImprBestFitAspirCrit.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html index 80a84b55f..597c7f9b8 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move-members.html @@ -40,7 +40,7 @@ rand_movemoItRandNextMove< M > [private] ~eoBF()eoBF< M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html index fbb1ed73b..91209b626 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.html @@ -173,7 +173,7 @@ References moItR

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html index d0503e705..1cf18f5c5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point-members.html @@ -38,7 +38,7 @@ eoBF< const M &, const M::EOType &, void >::operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, void > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html index 81bbaba42..3a06e6765 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.html @@ -148,7 +148,7 @@ References moLSChe

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html index 826f6c3b3..f745b3c94 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule-members.html @@ -38,7 +38,7 @@ thresholdmoLinearCoolingSchedule [private] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< double &, bool > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html index 11bb16691..3044ae900 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html @@ -146,7 +146,7 @@ References

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_move-members.html index 0922e3c76..83aa77a1b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move-members.html @@ -36,7 +36,7 @@ operator()(EOT &)=0eoUF< EOT &, void > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< EOT &, void > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move.html b/trunk/paradiseo-mo/doc/html/classmo_move.html index 774bacf35..1663b3bed 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move.html @@ -61,7 +61,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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html index d295a7e6b..f64ed9524 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html @@ -35,7 +35,7 @@ operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html index 4048a2ac2..e59c6a6b1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html @@ -59,7 +59,7 @@ Only a description...See Definition at line 21 of file moMoveExpl.h.
    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html index 2a50d55b5..7c2beb224 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval-members.html @@ -35,7 +35,7 @@ operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, M::EOType::Fitness > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType &, M::EOType::Fitness > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html index c718ea0c3..7ce49e0ba 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html @@ -56,7 +56,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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html index ea141dfb3..a24fa41e9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html @@ -35,7 +35,7 @@ operator()(M &, const M::EOType &)=0eoBF< M &, const M::EOType &, void > [pure virtual] ~eoBF()eoBF< M &, const M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init.html b/trunk/paradiseo-mo/doc/html/classmo_move_init.html index d06901e1b..27f007776 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init.html @@ -56,7 +56,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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html index 0ff5e9398..e772f30a0 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl-members.html @@ -35,7 +35,7 @@ operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html index eba8839e0..e459563e4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html @@ -59,7 +59,7 @@ Only a description... Definition at line 21 of file moMoveLoopExpl.h.
    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html index 90df95364..7f8d55ec5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html @@ -38,7 +38,7 @@ update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.html b/trunk/paradiseo-mo/doc/html/classmo_move_select.html index a3267f9d4..ae815bc81 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select.html @@ -146,7 +146,7 @@ Implemented in moMoveSelect.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html index c4de9b31d..13d1c4de0 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html @@ -35,7 +35,7 @@ operator()(M &, const M::EOType &)=0eoBF< M &, const M::EOType &, bool > [pure virtual] ~eoBF()eoBF< M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_next_move.html index d2491174b..aea416f9c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move.html @@ -57,7 +57,7 @@ Useful for the explorer (for 22 of file moNextMove.h.
    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html index ebd48b22a..91fc5c920 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit-members.html @@ -37,7 +37,7 @@ moAspirCrit::operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html index 4040f2fe9..4b49e981b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html @@ -135,7 +135,7 @@ Definition at line 4

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html new file mode 100644 index 000000000..71faa5cbc --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue-members.html @@ -0,0 +1,50 @@ + + +PARADISEO-MO: Member List + + + + +
    + +
    +
    + +
    +

    moNoFitImprSolContinue< EOT > Member List

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

    + + + + + + + + + + + + +
    countermoNoFitImprSolContinue< EOT > [private]
    firstFitnessSavedmoNoFitImprSolContinue< EOT > [private]
    fitnessmoNoFitImprSolContinue< EOT > [private]
    Fitness typedefmoNoFitImprSolContinue< EOT >
    functor_category()eoUF< const EOT &, bool > [static]
    init()moNoFitImprSolContinue< EOT > [inline, virtual]
    maximizationmoNoFitImprSolContinue< EOT > [private]
    maxNumberOfIterationsWithoutImprovmentmoNoFitImprSolContinue< EOT > [private]
    moNoFitImprSolContinue(unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)moNoFitImprSolContinue< EOT > [inline]
    operator()(const EOT &__sol)moNoFitImprSolContinue< EOT > [inline, virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< const EOT &, bool > [virtual]

    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html new file mode 100644 index 000000000..163013b77 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.html @@ -0,0 +1,203 @@ + + +PARADISEO-MO: moNoFitImprSolContinue< EOT > Class Template Reference + + + + +
    + +
    +
    + +
    +

    moNoFitImprSolContinue< EOT > Class Template Reference

    One possible stop criterion for a solution-based heuristic. +More... +

    +#include <moNoFitImprSolContinue.h> +

    +

    Inheritance diagram for moNoFitImprSolContinue< EOT >: +

    + +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase + +List of all members. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Public Types

    +typedef EOT::Fitness Fitness
     Alias for the fitness.

    Public Member Functions

     moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)
     Basic constructor.
    bool operator() (const EOT &__sol)
     Function that activates the stopping criterion.
    +void init ()
     Procedure which allows to initialise all the stuff needed.

    Private Attributes

    +unsigned int maxNumberOfIterationsWithoutImprovment
     Maximum number of iterations without improvment allowed.
    +bool firstFitnessSaved
     Flag that this is the first time that the fitness is used.
    +Fitness fitness
     Current Fitness.
    bool maximization
     Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value.
    +unsigned int counter
     The iteration couter.
    +

    Detailed Description

    +

    template<class EOT>
    + class moNoFitImprSolContinue< EOT >

    + +One possible stop criterion for a solution-based heuristic. +

    +The stop criterion corresponds to a maximum number of iterations without improvement. +

    + +

    +Definition at line 21 of file moNoFitImprSolContinue.h.

    Constructor & Destructor Documentation

    + +
    +
    +
    +template<class EOT>
    + + + + + + + + + + + + + + + + + + +
    moNoFitImprSolContinue< EOT >::moNoFitImprSolContinue (unsigned int  __maxNumberOfIterationWithoutImprovment,
    bool  __maximization = true 
    ) [inline]
    +
    +
    + +

    +Basic constructor. +

    +

    Parameters:
    + + + +
    __maxNumberOfIterationWithoutImprovment The number of iterations without fitness improvment to reach for stop.
    __maximization Indicate if the the aim is to maximize or minimize the fitness.
    +
    + +

    +Definition at line 34 of file moNoFitImprSolContinue.h. +

    +

    +

    Member Function Documentation

    + +
    +
    +
    +template<class EOT>
    + + + + + + + + + +
    bool moNoFitImprSolContinue< EOT >::operator() (const EOT &  __sol  )  [inline, virtual]
    +
    +
    + +

    +Function that activates the stopping criterion. +

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

    Parameters:
    + + +
    __sol the current solution.
    +
    +
    Returns:
    true or false.
    + +

    +Implements eoUF< const EOT &, bool >. +

    +Definition at line 45 of file moNoFitImprSolContinue.h. +

    +References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, moNoFitImprSolContinue< EOT >::maximization, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovment. +

    +

    +

    Member Data Documentation

    + +
    +
    +
    +template<class EOT>
    + + + + +
    bool moNoFitImprSolContinue< EOT >::maximization [private]
    +
    +
    + +

    +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. +

    +It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +

    +Definition at line 96 of file moNoFitImprSolContinue.h. +

    +Referenced by moNoFitImprSolContinue< EOT >::operator()(). +

    +

    +

    The documentation for this class was generated from the following file: +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png new file mode 100644 index 000000000..a727d6003 Binary files /dev/null and b/trunk/paradiseo-mo/doc/html/classmo_no_fit_impr_sol_continue.png differ diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html index 29b47e0db..4db1670aa 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select-members.html @@ -41,7 +41,7 @@ vect_better_movesmoRandImprSelect< M > [private] ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html index 26fe7037e..e58c078c5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html @@ -220,7 +220,7 @@ References moRandImprSelect.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html index 83b3b5110..2eee170f5 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html @@ -35,7 +35,7 @@ operator()(M &)=0eoUF< M &, void > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< M &, void > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html index cce34df23..8fa1fbf9a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html @@ -56,7 +56,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 Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html index ccf4cade6..2db1bb7e1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html @@ -51,7 +51,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< M::EOType &, bool > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.html b/trunk/paradiseo-mo/doc/html/classmo_s_a.html index 54f948215..e546553cf 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a.html @@ -209,7 +209,7 @@ References moSA< M >::co

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html index 14f7fa72c..2dab49153 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list-members.html @@ -44,7 +44,7 @@ update()moSimpleMoveTabuList< M > [inline, virtual] ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html index 9d4d0a917..69da5bf49 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.html @@ -276,7 +276,7 @@ Referenced by moSimpleMoveTabuList.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html index 3cee0a6fd..4eaf4b186 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list-members.html @@ -44,7 +44,7 @@ update()moSimpleSolutionTabuList< M > [inline, virtual] ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html index fba8d5fd1..c05e11682 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.html @@ -309,7 +309,7 @@ Referenced by moSimpleSolutionTabuList.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html index 3e6ee3c2e..a918f8a3f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html @@ -36,7 +36,7 @@ operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual] ~eoFunctorBase()eoFunctorBase [virtual] ~eoUF()eoUF< const EOT &, bool > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html index 8381967c5..1067fc725 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html @@ -30,7 +30,7 @@
  • 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 stopping criterion for a solution-based heuristic. More...

    #include <moSolContinue.h> @@ -38,22 +38,25 @@

    Inheritance diagram for moSolContinue< EOT >:

    -eoUF< const EOT &, bool > -eoFunctorBase -moGenSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase +moFitSolContinue< EOT > +moGenSolContinue< EOT > +moNoFitImprSolContinue< EOT > +moSteadyFitSolContinue< EOT > List of all members. - +

    Public Member Functions

    virtual void init ()=0
     Procedure which initialises all that the stop criterion needs.
     Procedure which initialises all that the stopping criterion needs.

    Detailed Description

    template<class EOT>
    class moSolContinue< EOT >

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

    It allows to add an initialisation procedure to an object that is a unary function (eoUF).

    @@ -78,16 +81,16 @@ template<class EOT>

    -Procedure which initialises all that the stop criterion needs. +Procedure which initialises all that the stopping criterion needs.

    Generally, it allocates some data structures or initialises some counters.

    -Implemented in moGenSolContinue< EOT >. +Implemented in moFitSolContinue< EOT >, moGenSolContinue< EOT >, moNoFitImprSolContinue< EOT >, and moSteadyFitSolContinue< EOT >.

    The documentation for this class was generated from the following file: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png index 345d1b66d..71ed9397d 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png and b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.png differ diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html new file mode 100644 index 000000000..01f95edce --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue-members.html @@ -0,0 +1,52 @@ + + +PARADISEO-MO: Member List + + + + +
    + +
    +
    + +
    +

    moSteadyFitSolContinue< EOT > Member List

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

    + + + + + + + + + + + + + + +
    countermoSteadyFitSolContinue< EOT > [private]
    firstFitnessSavedmoSteadyFitSolContinue< EOT > [private]
    Fitness typedefmoSteadyFitSolContinue< EOT >
    fitnessmoSteadyFitSolContinue< EOT > [private]
    functor_category()eoUF< const EOT &, bool > [static]
    init()moSteadyFitSolContinue< EOT > [inline, virtual]
    maximizationmoSteadyFitSolContinue< EOT > [private]
    maxNumberOfIterationsmoSteadyFitSolContinue< EOT > [private]
    maxNumberOfIterationsReachedmoSteadyFitSolContinue< EOT > [private]
    maxNumberOfIterationsWithoutImprovmentmoSteadyFitSolContinue< EOT > [private]
    moSteadyFitSolContinue(unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)moSteadyFitSolContinue< EOT > [inline]
    operator()(const EOT &__sol)moSteadyFitSolContinue< EOT > [inline, virtual]
    ~eoFunctorBase()eoFunctorBase [virtual]
    ~eoUF()eoUF< const EOT &, bool > [virtual]

    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html new file mode 100644 index 000000000..707be4486 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html @@ -0,0 +1,219 @@ + + +PARADISEO-MO: moSteadyFitSolContinue< EOT > Class Template Reference + + + + +
    + +
    +
    + +
    +

    moSteadyFitSolContinue< EOT > Class Template Reference

    One possible stopping criterion for a solution-based heuristic. +More... +

    +#include <moSteadyFitSolContinue.h> +

    +

    Inheritance diagram for moSteadyFitSolContinue< EOT >: +

    + +moSolContinue< EOT > +eoUF< const EOT &, bool > +eoFunctorBase + +List of all members. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Public Types

    +typedef EOT::Fitness Fitness
     Alias for the fitness.

    Public Member Functions

     moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)
     Basic constructor.
    bool operator() (const EOT &__sol)
     Function that activates the stopping criterion.
    +void init ()
     Procedure which allows to initialise the stuff needed.

    Private Attributes

    +unsigned int maxNumberOfIterations
     Maximum number of iterations before considering the fitness.
    +unsigned int maxNumberOfIterationsWithoutImprovment
     Maximum number of iterations without improvment allowed.
    +bool maxNumberOfIterationsReached
     Flag that indicates that the maxNumberIteration have been reached.
    +bool firstFitnessSaved
     Flag that this is the first time that the fitness is used.
    +Fitness fitness
     Current Fitness.
    bool maximization
     Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value.
    +unsigned int counter
     The iteration couter.
    +

    Detailed Description

    +

    template<class EOT>
    + class moSteadyFitSolContinue< EOT >

    + +One possible stopping criterion for a solution-based heuristic. +

    +The stop criterion corresponds to a maximum number of iterations without improvement (after a minimum number of iterations). +

    + +

    +Definition at line 21 of file moSteadyFitSolContinue.h.

    Constructor & Destructor Documentation

    + +
    +
    +
    +template<class EOT>
    + + + + + + + + + + + + + + + + + + + + + + + + +
    moSteadyFitSolContinue< EOT >::moSteadyFitSolContinue (unsigned int  __maxNumberOfIterations,
    unsigned int  __maxNumberOfIterationWithoutImprovment,
    bool  __maximization = true 
    ) [inline]
    +
    +
    + +

    +Basic constructor. +

    +

    Parameters:
    + + + + +
    __maxNumberOfIterations The number of iterations to reach before looking for the fitness.
    __maxNumberOfIterationWithoutImprovment The number of iterations without fitness improvment to reach for stop.
    __maximization Indicate if the the aim is to maximize or minimize the fitness.
    +
    + +

    +Definition at line 35 of file moSteadyFitSolContinue.h. +

    +

    +

    Member Function Documentation

    + +
    +
    +
    +template<class EOT>
    + + + + + + + + + +
    bool moSteadyFitSolContinue< EOT >::operator() (const EOT &  __sol  )  [inline, virtual]
    +
    +
    + +

    +Function that activates the stopping criterion. +

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

    +

    Parameters:
    + + +
    __sol the current solution.
    +
    +
    Returns:
    true or false.
    + +

    +Implements eoUF< const EOT &, bool >. +

    +Definition at line 47 of file moSteadyFitSolContinue.h. +

    +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maximization, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovment. +

    +

    +

    Member Data Documentation

    + +
    +
    +
    +template<class EOT>
    + + + + +
    bool moSteadyFitSolContinue< EOT >::maximization [private]
    +
    +
    + +

    +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. +

    +It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +

    +Definition at line 114 of file moSteadyFitSolContinue.h. +

    +Referenced by moSteadyFitSolContinue< EOT >::operator()(). +

    +

    +

    The documentation for this class was generated from the following file: +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png new file mode 100644 index 000000000..702e690a2 Binary files /dev/null and b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.png differ diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html index d3e59f14f..02151acfa 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html @@ -49,7 +49,7 @@ ~eoFunctorBase()eoFunctorBase [virtual] ~eoOp()eoOp< EOType > [virtual] ~eoUF()eoUF< M::EOType &, bool > [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.html b/trunk/paradiseo-mo/doc/html/classmo_t_s.html index 805893b65..85b5fbc89 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s.html @@ -256,7 +256,7 @@ References moTS< M >::co

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html index f2ed58970..7f02a6f01 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl-members.html @@ -44,7 +44,7 @@ tabu_listmoTSMoveLoopExpl< M > [private] ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html index aba10a4f5..29f89c6ad 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s_move_loop_expl.html @@ -211,7 +211,7 @@ References moTS

    The documentation for this class was generated from the following file:     -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html index b954223fd..afc66426a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html @@ -39,7 +39,7 @@ update()=0moTabuList< M > [pure virtual] ~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual] ~eoFunctorBase()eoFunctorBase [virtual] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html index 5be13c44d..53bec1f90 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html @@ -166,7 +166,7 @@ Implemented in moTabuList.h -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/files.html b/trunk/paradiseo-mo/doc/html/files.html index 980c498ef..08e577aa3 100644 --- a/trunk/paradiseo-mo/doc/html/files.html +++ b/trunk/paradiseo-mo/doc/html/files.html @@ -31,6 +31,7 @@ moCoolingSchedule.h [code] moExponentialCoolingSchedule.h [code] moFirstImprSelect.h [code] + moFitSolContinue.h [code] moGenSolContinue.h [code] moHC.h [code] moHCMoveLoopExpl.h [code] @@ -46,17 +47,19 @@ moMoveSelect.h [code] moNextMove.h [code] moNoAspirCrit.h [code] + moNoFitImprSolContinue.h [code] moRandImprSelect.h [code] moRandMove.h [code] moSA.h [code] moSimpleMoveTabuList.h [code] moSimpleSolutionTabuList.h [code] moSolContinue.h [code] + moSteadyFitSolContinue.h [code] moTabuList.h [code] moTS.h [code] moTSMoveLoopExpl.h [code] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions.html b/trunk/paradiseo-mo/doc/html/functions.html index 73c5af995..16b2e9831 100644 --- a/trunk/paradiseo-mo/doc/html/functions.html +++ b/trunk/paradiseo-mo/doc/html/functions.html @@ -88,6 +88,9 @@ Here is a list of all documented class members with links to the class documenta , moTS< M >
  • cool_sched : moSA< M > +
  • counter +: moNoFitImprSolContinue< EOT > +, moSteadyFitSolContinue< EOT >
  • currentSize : moSimpleMoveTabuList< M > , moSimpleSolutionTabuList< M > @@ -112,23 +115,40 @@ Here is a list of all documented class members with links to the class documenta
  • first_time : moBestImprSelect< M > , moImprBestFitAspirCrit< M > +
  • firstFitnessSaved +: moSteadyFitSolContinue< EOT > +, moNoFitImprSolContinue< EOT >
  • Fitness : moTSMoveLoopExpl< M > -, moTS< M > -, moBestImprSelect< M > -, moSA< M > +
  • fitness +: moSteadyFitSolContinue< EOT > +
  • Fitness +: moFitSolContinue< EOT > +, moSteadyFitSolContinue< EOT > +, moHCMoveLoopExpl< M > , moRandImprSelect< M > +, moSA< M > +
  • fitness +: moNoFitImprSolContinue< EOT > +
  • Fitness +: moImprBestFitAspirCrit< M > +, moNoFitImprSolContinue< EOT > +, moBestImprSelect< M > +
  • fitness +: moFitSolContinue< EOT > +
  • Fitness +: moTS< M > , moHC< M > , moMoveSelect< M > , moFirstImprSelect< M > -, moImprBestFitAspirCrit< M > -, moHCMoveLoopExpl< M >
  • full_eval : moHC< M > , moTS< M > , moSA< M >
  • func : moLSCheckPoint< M > +
  • moFitSolContinue() +: moFitSolContinue< EOT >

    - g -

    - t -

    • moTS() @@ -275,7 +316,7 @@ Here is a list of all documented class members with links to the class documenta
    • vect_better_moves : moRandImprSelect< M >
    -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions_func.html b/trunk/paradiseo-mo/doc/html/functions_func.html index 68da73fdb..253a7d06b 100644 --- a/trunk/paradiseo-mo/doc/html/functions_func.html +++ b/trunk/paradiseo-mo/doc/html/functions_func.html @@ -42,10 +42,12 @@ +

    - f -

    - g -

    - t -

    -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions_type.html b/trunk/paradiseo-mo/doc/html/functions_type.html index e849e52f9..c1bb9fb02 100644 --- a/trunk/paradiseo-mo/doc/html/functions_type.html +++ b/trunk/paradiseo-mo/doc/html/functions_type.html @@ -57,15 +57,18 @@ : moBestImprSelect< M > , moTSMoveLoopExpl< M > , moTS< M > +, moSteadyFitSolContinue< EOT > , moSA< M > , moRandImprSelect< M > +, moNoFitImprSolContinue< EOT > , moMoveSelect< M > , moImprBestFitAspirCrit< M > , moHCMoveLoopExpl< M > , moHC< M > +, moFitSolContinue< EOT > , moFirstImprSelect< M > -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/functions_vars.html b/trunk/paradiseo-mo/doc/html/functions_vars.html index d026828c5..e55b17673 100644 --- a/trunk/paradiseo-mo/doc/html/functions_vars.html +++ b/trunk/paradiseo-mo/doc/html/functions_vars.html @@ -76,6 +76,9 @@ , moTS< M >
  • cool_sched : moSA< M > +
  • counter +: moNoFitImprSolContinue< EOT > +, moSteadyFitSolContinue< EOT >
  • currentSize : moSimpleMoveTabuList< M > , moSimpleSolutionTabuList< M > @@ -84,10 +87,17 @@
  • first_time : moBestImprSelect< M > , moImprBestFitAspirCrit< M > +
  • firstFitnessSaved +: moSteadyFitSolContinue< EOT > +, moNoFitImprSolContinue< EOT > +
  • fitness +: moFitSolContinue< EOT > +, moSteadyFitSolContinue< EOT > +, moNoFitImprSolContinue< EOT >
  • full_eval -: moSA< M > +: moTS< M > +, moSA< M > , moHC< M > -, moTS< M >
  • func : moLSCheckPoint< M > @@ -105,6 +115,17 @@

    - m -

    -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/hierarchy.html b/trunk/paradiseo-mo/doc/html/hierarchy.html index 5f0e69005..7f3147364 100644 --- a/trunk/paradiseo-mo/doc/html/hierarchy.html +++ b/trunk/paradiseo-mo/doc/html/hierarchy.html @@ -93,7 +93,10 @@ [external]
  • eoUF< double &, bool > @@ -139,7 +142,7 @@ [external]
  • eoMonOp< M::EOType > [external] -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/index_8h-source.html b/trunk/paradiseo-mo/doc/html/index_8h-source.html index 94c4646f2..2e3b51eae 100644 --- a/trunk/paradiseo-mo/doc/html/index_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/index_8h-source.html @@ -28,7 +28,7 @@ 00024 // c-file-style: "Stroustrup" 00025 // fill-column: 80 00026 // End: -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/main.html b/trunk/paradiseo-mo/doc/html/main.html index 2feabe590..992ab8b21 100644 --- a/trunk/paradiseo-mo/doc/html/main.html +++ b/trunk/paradiseo-mo/doc/html/main.html @@ -33,7 +33,7 @@ tutorial install The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.

    design

    -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_8h-source.html index 425a4b266..7e4255550 100644 --- a/trunk/paradiseo-mo/doc/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_8h-source.html @@ -42,33 +42,36 @@ 00018 #include "moCoolingSchedule.h" 00019 #include "moExponentialCoolingSchedule.h" 00020 #include "moFirstImprSelect.h" -00021 #include "moGenSolContinue.h" -00022 #include "moHC.h" -00023 #include "moHCMoveLoopExpl.h" -00024 #include "moImprBestFitAspirCrit.h" -00025 #include "moItRandNextMove.h" -00026 #include "moLinearCoolingSchedule.h" -00027 #include "moLSCheckPoint.h" -00028 #include "moMoveExpl.h" -00029 #include "moMove.h" -00030 #include "moMoveIncrEval.h" -00031 #include "moMoveInit.h" -00032 #include "moMoveLoopExpl.h" -00033 #include "moMoveSelect.h" -00034 #include "moNextMove.h" -00035 #include "moNoAspirCrit.h" -00036 #include "moRandImprSelect.h" -00037 #include "moRandMove.h" -00038 #include "moSA.h" -00039 #include "moSimpleMoveTabuList.h" -00040 #include "moSimpleSolutionTabuList.h" -00041 #include "moSolContinue.h" -00042 #include "moTabuList.h" -00043 #include "moTS.h" -00044 #include "moTSMoveLoopExpl.h" -00045 -00046 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +00021 #include "moFitSolContinue.h" +00022 #include "moGenSolContinue.h" +00023 #include "moHC.h" +00024 #include "moHCMoveLoopExpl.h" +00025 #include "moImprBestFitAspirCrit.h" +00026 #include "moItRandNextMove.h" +00027 #include "moLinearCoolingSchedule.h" +00028 #include "moLSCheckPoint.h" +00029 #include "moMoveExpl.h" +00030 #include "moMove.h" +00031 #include "moMoveIncrEval.h" +00032 #include "moMoveInit.h" +00033 #include "moMoveLoopExpl.h" +00034 #include "moMoveSelect.h" +00035 #include "moNextMove.h" +00036 #include "moNoAspirCrit.h" +00037 #include "moNoFitImprSolContinue.h" +00038 #include "moRandImprSelect.h" +00039 #include "moRandMove.h" +00040 #include "moSA.h" +00041 #include "moSimpleMoveTabuList.h" +00042 #include "moSimpleSolutionTabuList.h" +00043 #include "moSolContinue.h" +00044 #include "moSteadyFitSolContinue.h" +00045 #include "moTabuList.h" +00046 #include "moTS.h" +00047 #include "moTSMoveLoopExpl.h" +00048 +00049 #endif +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html index 427264468..dfc6d66a4 100644 --- a/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html @@ -45,7 +45,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html index b64b658bf..b124eecc9 100644 --- a/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_aspir_crit_8h-source.html @@ -52,7 +52,7 @@ 00035 }; 00036 00037 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html index 708582241..03083b08d 100644 --- a/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_best_impr_select_8h-source.html @@ -93,7 +93,7 @@ 00091 }; 00092 00093 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html index 9840b9fdb..b3e9d2a26 100644 --- a/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_cooling_schedule_8h-source.html @@ -45,7 +45,7 @@ 00025 }; 00026 00027 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html index e37f3b8e7..51e6aef53 100644 --- a/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_exponential_cooling_schedule_8h-source.html @@ -61,7 +61,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html index a64e0c516..cc0e9773e 100644 --- a/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_first_impr_select_8h-source.html @@ -100,7 +100,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html new file mode 100644 index 000000000..2da46c9fc --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/mo_fit_sol_continue_8h-source.html @@ -0,0 +1,84 @@ + + +PARADISEO-MO: moFitSolContinue.h Source File + + + + +
    + +
    +

    moFitSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moFitSolContinue.h"
+00004 
+00005 // (c) OPAC Team (LIFL), Dolphin project (INRIA), 2003-2007
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moFitSolContinue_h
+00013 #define __moFitSolContinue_h
+00014 
+00015 #include "moSolContinue.h"
+00016 
+00018 
+00021 template < class EOT > class moFitSolContinue:public moSolContinue < EOT >
+00022 {
+00023 
+00024 public:
+00025 
+00027   typedef typename EOT::Fitness Fitness;
+00028 
+00030 
+00034   moFitSolContinue (Fitness __fitness, bool __maximization=true): fitness (__fitness), maximization(__maximization)
+00035   {}
+00036 
+00038 
+00044   bool operator   () (const EOT & __sol)
+00045   {
+00046     if(__sol.invalid())
+00047       {
+00048         return true;
+00049       }
+00050 
+00051     if(maximization)
+00052       {
+00053         return __sol.fitness()<fitness;
+00054       }
+00055     return __sol.fitness()>fitness;
+00056   }
+00057 
+00059   void init ()
+00060   {}
+00061 
+00062 private:
+00063 
+00065   Fitness fitness;
+00066 
+00068 
+00072   bool maximization;
+00073 };
+00074 
+00075 #endif
+
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html index fa7c02efa..60baaa8d0 100644 --- a/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_gen_sol_continue_8h-source.html @@ -24,7 +24,7 @@

    moGenSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
-00003 // "eoGenSolContinue.h"
+00003 // "moGenSolContinue.h"
 00004 
 00005 // (c) OPAC Team, LIFL, 2003-2006
 00006 
@@ -39,40 +39,33 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
 00027 
-00030   moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
-00031   {
+00030   moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
+00031   {}
 00032 
-00033   }
 00034 
-00036 
-00044   bool operator   () (const EOT & __sol)
-00045   {
+00042   bool operator () (const EOT & __sol)
+00043   {
+00044     return (++numGen < maxNumGen);
+00045   }
 00046 
-00047     return (++numGen < maxNumGen);
-00048   }
-00049 
-00051 
-00054   void init ()
-00055   {
-00056 
-00057     numGen = 0;
-00058   }
+00048   void init ()
+00049   {}
+00050 
+00051 private:
+00052 
+00054   unsigned int maxNumGen;
+00055 
+00057   unsigned int numGen;
+00058 };
 00059 
-00060 private:
-00061 
-00063   unsigned int maxNumGen;
-00064 
-00066   unsigned int numGen;
-00067 };
-00068 
-00069 #endif
-
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +00060 #endif +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html index e27490ad1..09aabbfa3 100644 --- a/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_h_c_8h-source.html @@ -126,7 +126,7 @@ 00131 }; 00132 00133 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html index 2bb7dea2c..1979eeda8 100644 --- a/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_h_c_move_loop_expl_8h-source.html @@ -109,7 +109,7 @@ 00106 }; 00107 00108 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html index 7c45e8c0d..55778f2b7 100644 --- a/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -90,7 +90,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html index e9dcdd82a..4039c86a5 100644 --- a/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_it_rand_next_move_8h-source.html @@ -86,7 +86,7 @@ 00082 }; 00083 00084 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html index 87fe11bc9..be03ad852 100644 --- a/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_l_s_check_point_8h-source.html @@ -74,7 +74,7 @@ 00064 }; 00065 00066 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html index b4350f947..b1d9fb522 100644 --- a/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_linear_cooling_schedule_8h-source.html @@ -61,7 +61,7 @@ 00053 }; 00054 00055 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html index d7cf4fe67..e880ab671 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html @@ -48,7 +48,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html index 220136ef2..8d90c5fa2 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_expl_8h-source.html @@ -48,7 +48,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html index ca863d2b6..c9ab999b0 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_incr_eval_8h-source.html @@ -48,7 +48,7 @@ 00030 }; 00031 00032 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html index f136fa12b..91ffe683d 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_init_8h-source.html @@ -46,7 +46,7 @@ 00026 }; 00027 00028 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html index 0bb9f770a..91601d83a 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_loop_expl_8h-source.html @@ -45,7 +45,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html index 3f066af39..90ac35e52 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_select_8h-source.html @@ -66,7 +66,7 @@ 00063 }; 00064 00065 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html index 7020d03de..35f248f97 100644 --- a/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_next_move_8h-source.html @@ -47,7 +47,7 @@ 00027 }; 00028 00029 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html index dd38ac219..3ef95ebc4 100644 --- a/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_no_aspir_crit_8h-source.html @@ -57,7 +57,7 @@ 00046 }; 00047 00048 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html new file mode 100644 index 000000000..7c83d2d88 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/mo_no_fit_impr_sol_continue_8h-source.html @@ -0,0 +1,109 @@ + + +PARADISEO-MO: moNoFitImprSolContinue.h Source File + + + + +
    + +
    +

    moNoFitImprSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moNoFitImprSolContinue.h"
+00004 
+00005 // (c) OPAC Team (LIFL), Dolphin project (INRIA), 2003-2007
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moNoFitImprSolContinue_h
+00013 #define __moNoFitImprSolContinue_h
+00014 
+00015 #include "moSolContinue.h"
+00016 
+00018 
+00021 template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
+00022 {
+00023 
+00024 public:
+00025 
+00027   typedef typename EOT::Fitness Fitness;
+00028 
+00030 
+00034   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)
+00035     : maxNumberOfIterationsWithoutImprovment(__maxNumberOfIterationWithoutImprovment),maximization(__maximization), 
+00036       firstFitnessSaved(true), counter(0) 
+00037   {}
+00038 
+00040 
+00045   bool operator   () (const EOT & __sol)
+00046   {
+00047     if(__sol.invalid())
+00048       {
+00049         return true;
+00050       }
+00051 
+00052     if(firstFitnessSaved)
+00053       {
+00054         fitness=__sol.fitness();
+00055         counter=0;
+00056         FirstFitnessSaved=false;
+00057         return true;
+00058       }
+00059     
+00060     counter++;
+00061 
+00062     if( ((maximization) && (__sol.fitness() > fitness)) || 
+00063         ((!maximization) && (__sol.fitness() < fitness)) )
+00064       {
+00065         fitness=__sol.fitness();
+00066         counter=0;
+00067       }
+00068   
+00069     if(counter==maxNumberOfIterationsWithoutImprovment)
+00070       {
+00071         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00072       }
+00073     return counter!=maxNumberOfIterationsWithoutImprovment;
+00074   }
+00075 
+00077   void init ()
+00078   {}
+00079 
+00080 private:
+00081 
+00083   unsigned int maxNumberOfIterationsWithoutImprovment;
+00084 
+00086   bool firstFitnessSaved;
+00087 
+00089   Fitness fitness;
+00090 
+00092 
+00096   bool maximization;
+00097 
+00099   unsigned int counter;
+00100 };
+00101 
+00102 #endif
+
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html index cbaa03028..1ef3e33b2 100644 --- a/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_rand_impr_select_8h-source.html @@ -97,7 +97,7 @@ 00102 }; 00103 00104 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html index 208a467ad..1b271486c 100644 --- a/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_rand_move_8h-source.html @@ -45,7 +45,7 @@ 00024 }; 00025 00026 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html index 73280805a..a25f3acee 100644 --- a/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_s_a_8h-source.html @@ -144,7 +144,7 @@ 00147 }; 00148 00149 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html index 920e30ae3..d2eac2d09 100644 --- a/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_simple_move_tabu_list_8h-source.html @@ -134,7 +134,7 @@ 00124 }; 00125 00126 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html index 82d9c6b5e..ebb9e665d 100644 --- a/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_simple_solution_tabu_list_8h-source.html @@ -141,7 +141,7 @@ 00133 }; 00134 00135 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html index 708556b1c..c92e42245 100644 --- a/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_sol_continue_8h-source.html @@ -39,16 +39,16 @@ 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: 00027 -00030 virtual void init () = 0; +00030 virtual void init () = 0; 00031 }; 00032 00033 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html new file mode 100644 index 000000000..34d28e2b8 --- /dev/null +++ b/trunk/paradiseo-mo/doc/html/mo_steady_fit_sol_continue_8h-source.html @@ -0,0 +1,123 @@ + + +PARADISEO-MO: moSteadyFitSolContinue.h Source File + + + + +
    + +
    +

    moSteadyFitSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+00002 
+00003 // "moSteadyFitSolContinue.h"
+00004 
+00005 // (c) OPAC Team (LIFL), Dolphin project (INRIA), 2003-2007
+00006 
+00007 /* LICENCE TEXT
+00008    
+00009    Contact: paradiseo-help@lists.gforge.inria.fr
+00010 */
+00011 
+00012 #ifndef __moSteadyFitSolContinue_h
+00013 #define __moSteadyFitSolContinue_h
+00014 
+00015 #include "moSolContinue.h"
+00016 
+00018 
+00021 template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT >
+00022 {
+00023 
+00024 public:
+00025 
+00027   typedef typename EOT::Fitness Fitness;
+00028 
+00030 
+00035   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)
+00036     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovment(__maxNumberOfIterationWithoutImprovment),
+00037       maximization(__maximization), maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
+00038   {}
+00039 
+00041 
+00047   bool operator   () (const EOT & __sol)
+00048   {
+00049     if(!maxNumberOfIterationsReached)
+00050       {
+00051         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
+00052         if(maxNumberOfIterationsReached)
+00053           {
+00054             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
+00055           }
+00056         return true;
+00057       }
+00058 
+00059     if(__sol.invalid())
+00060       {
+00061         return true;
+00062       }
+00063 
+00064     if(firstFitnessSaved)
+00065       {
+00066         fitness=__sol.fitness();
+00067         counter=0;
+00068         FirstFitnessSaved=false;
+00069         return true;
+00070       }
+00071     
+00072     counter++;
+00073 
+00074     if( ((maximization) && (__sol.fitness() > fitness)) || 
+00075         ((!maximization) && (__sol.fitness() < fitness)) )
+00076       {
+00077         fitness=__sol.fitness();
+00078         counter=0;
+00079       }
+00080   
+00081     if(counter==maxNumberOfIterationsWithoutImprovment)
+00082       {
+00083         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00084       }
+00085     return counter!=maxNumberOfIterationsWithoutImprovment;
+00086   }
+00087 
+00089   void init ()
+00090   {}
+00091 
+00092 private:
+00093 
+00095   unsigned int maxNumberOfIterations;
+00096 
+00098   unsigned int maxNumberOfIterationsWithoutImprovment;
+00099 
+00101   bool maxNumberOfIterationsReached;
+00102 
+00104   bool firstFitnessSaved;
+00105 
+00107   Fitness fitness;
+00108 
+00110 
+00114   bool maximization;
+00115 
+00117   unsigned int counter;
+00118 };
+00119 
+00120 #endif
+
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  + +doxygen 1.5.2
    + + diff --git a/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html index f32f7b68f..c7fc7764b 100644 --- a/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_t_s_8h-source.html @@ -132,7 +132,7 @@ 00142 }; 00143 00144 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html index 1edcee1e1..314ad48c5 100644 --- a/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_t_s_move_loop_expl_8h-source.html @@ -128,7 +128,7 @@ 00130 }; 00131 00132 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html index a7843d915..3b0cb0c6b 100644 --- a/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_tabu_list_8h-source.html @@ -61,7 +61,7 @@ 00054 }; 00055 00056 #endif -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/search.idx b/trunk/paradiseo-mo/doc/html/search.idx index f5121b3f3..989cbbcaa 100644 Binary files a/trunk/paradiseo-mo/doc/html/search.idx and b/trunk/paradiseo-mo/doc/html/search.idx differ diff --git a/trunk/paradiseo-mo/doc/html/search.php b/trunk/paradiseo-mo/doc/html/search.php index 20bf8b6aa..ea14d1caf 100644 --- a/trunk/paradiseo-mo/doc/html/search.php +++ b/trunk/paradiseo-mo/doc/html/search.php @@ -374,7 +374,7 @@ main(); ?> -
    Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by  +
    Generated on Tue Jul 31 13:43:23 2007 for PARADISEO-MO by  doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/doc/html/tree.html b/trunk/paradiseo-mo/doc/html/tree.html index 14d9c2e8e..b8960b17b 100644 --- a/trunk/paradiseo-mo/doc/html/tree.html +++ b/trunk/paradiseo-mo/doc/html/tree.html @@ -73,6 +73,7 @@

    |o*moCoolingSchedule

    |o*moExponentialCoolingSchedule

    |o*moFirstImprSelect< M >

    +

    |o*moFitSolContinue< EOT >

    |o*moGenSolContinue< EOT >

    |o*moHC< M >

    |o*moHCMoveLoopExpl< M >

    @@ -88,12 +89,14 @@

    |o*moMoveSelect< M >

    |o*moNextMove< M >

    |o*moNoAspirCrit< M >

    +

    |o*moNoFitImprSolContinue< EOT >

    |o*moRandImprSelect< M >

    |o*moRandMove< M >

    |o*moSA< M >

    |o*moSimpleMoveTabuList< M >

    |o*moSimpleSolutionTabuList< M >

    |o*moSolContinue< EOT >

    +

    |o*moSteadyFitSolContinue< EOT >

    |o*moTabuList< M >

    |o*moTS< M >

    |\*moTSMoveLoopExpl< M >

    @@ -162,7 +165,10 @@

    ||o+eoUF< double &, bool > [external]

    @@ -219,6 +225,7 @@

     o*moCoolingSchedule.h

     o*moExponentialCoolingSchedule.h

     o*moFirstImprSelect.h

    +

     o*moFitSolContinue.h

     o*moGenSolContinue.h

     o*moHC.h

     o*moHCMoveLoopExpl.h

    @@ -234,12 +241,14 @@

     o*moMoveSelect.h

     o*moNextMove.h

     o*moNoAspirCrit.h

    +

     o*moNoFitImprSolContinue.h

     o*moRandImprSelect.h

     o*moRandMove.h

     o*moSA.h

     o*moSimpleMoveTabuList.h

     o*moSimpleSolutionTabuList.h

     o*moSolContinue.h

    +

     o*moSteadyFitSolContinue.h

     o*moTabuList.h

     o*moTS.h

     \*moTSMoveLoopExpl.h

    diff --git a/trunk/paradiseo-mo/doc/latex/annotated.tex b/trunk/paradiseo-mo/doc/latex/annotated.tex index d9ae06077..32bd0f949 100644 --- a/trunk/paradiseo-mo/doc/latex/annotated.tex +++ b/trunk/paradiseo-mo/doc/latex/annotated.tex @@ -7,7 +7,8 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be \item\contentsline{section}{{\bf moCoolingSchedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} \item\contentsline{section}{{\bf moExponentialCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} \item\contentsline{section}{{\bf moFirstImprSelect$<$ M $>$} (One possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} -\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} +\item\contentsline{section}{{\bf moFitSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{} +\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} \item\contentsline{section}{{\bf moHC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} \item\contentsline{section}{{\bf moHCMoveLoopExpl$<$ M $>$} (Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} \item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} @@ -22,12 +23,14 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be \item\contentsline{section}{{\bf moMoveSelect$<$ M $>$} (Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} \item\contentsline{section}{{\bf moNextMove$<$ M $>$} (Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} \item\contentsline{section}{{\bf moNoAspirCrit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} +\item\contentsline{section}{{\bf moNoFitImprSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{} \item\contentsline{section}{{\bf moRandImprSelect$<$ M $>$} (One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} \item\contentsline{section}{{\bf moRandMove$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} \item\contentsline{section}{{\bf moSA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} \item\contentsline{section}{{\bf moSimpleMoveTabuList$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} \item\contentsline{section}{{\bf moSimpleSolutionTabuList$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} -\item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stopping criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{{\bf moSteadyFitSolContinue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_sol_continue}}{} \item\contentsline{section}{{\bf moTabuList$<$ M $>$} (Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} \item\contentsline{section}{{\bf moTS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} \item\contentsline{section}{{\bf moTSMoveLoopExpl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps new file mode 100644 index 000000000..020df214d --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.eps @@ -0,0 +1,209 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 441.989 +%%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 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 4 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 +(moFitSolContinue< EOT >) cw +(moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/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 ----- + + (moFitSolContinue< EOT >) 0 0 box + (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box + +% ----- relations ----- + +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/doc/latex/classmo_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex new file mode 100644 index 000000000..a62b6440c --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex @@ -0,0 +1,109 @@ +\section{moFitSolContinue$<$ EOT $>$ Class Template Reference} +\label{classmo_fit_sol_continue}\index{moFitSolContinue@{moFitSolContinue}} +One possible stop criterion for a solution-based heuristic. + + +{\tt \#include $<$moFitSolContinue.h$>$} + +Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{classmo_fit_sol_continue} +\end{center} +\end{figure} +\subsection*{Public Types} +\begin{CompactItemize} +\item +typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f} + +\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf moFitSolContinue} ({\bf Fitness} \_\-\_\-fitness, bool \_\-\_\-maximization=true) +\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item +bool {\bf operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item +void {\bf init} ()\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} + +\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +{\bf Fitness} {\bf fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} + +\begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\item +bool {\bf maximization} +\begin{CompactList}\small\item\em Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class EOT$>$ class moFitSolContinue$<$ EOT $>$} + +One possible stop criterion for a solution-based heuristic. + +The stop criterion corresponds to a fitness threshold gained. + + + +Definition at line 21 of file moFitSolContinue.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}} +\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{moFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moFitSolContinue}$<$ EOT $>$::{\bf moFitSolContinue} ({\bf Fitness} {\em \_\-\_\-fitness}, bool {\em \_\-\_\-maximization} = {\tt true})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_5af29ede3794a7a73d8f6b0d9ebccc80} + + +Basic constructor. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-fitness}]The fitness to reach. \item[{\em \_\-\_\-maximization}]Indicate if the the aim is to maximize or minimize the fitness. \end{description} +\end{Desc} + + +Definition at line 34 of file moFitSolContinue.h. + +\subsection{Member Function Documentation} +\index{moFitSolContinue@{moFitSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moFitSolContinue@{moFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27} + + +Function that activates the stopping criterion. + +Indicates if the fitness threshold has not been yet reached. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-sol}]the current solution. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]true or false according to the value of the fitness. \end{Desc} + + +Implements {\bf eoUF$<$ const EOT \&, bool $>$}. + +Definition at line 44 of file moFitSolContinue.h. + +References moFitSolContinue$<$ EOT $>$::fitness, and moFitSolContinue$<$ EOT $>$::maximization. + +\subsection{Member Data Documentation} +\index{moFitSolContinue@{moFitSolContinue}!maximization@{maximization}} +\index{maximization@{maximization}!moFitSolContinue@{moFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moFitSolContinue}$<$ EOT $>$::{\bf maximization}\hspace{0.3cm}{\tt [private]}}\label{classmo_fit_sol_continue_d686a52cbcaa57924a585c7c90456612} + + +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. + +It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). + +Definition at line 72 of file moFitSolContinue.h. + +Referenced by moFitSolContinue$<$ EOT $>$::operator()(). + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +moFitSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex index 19c044b84..97c2f7744 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -1,6 +1,6 @@ \section{moGenSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_gen_sol_continue}\index{moGenSolContinue@{moGenSolContinue}} -One possible stop criterion for a solution-based heuristic. +One possible stopping criterion for a solution-based heuristic. {\tt \#include $<$moGenSolContinue.h$>$} @@ -15,11 +15,12 @@ Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{CompactItemize} \item {\bf moGenSolContinue} (unsigned int \_\-\_\-maxNumGen) -\begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item +\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item -void {\bf init} () -\begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize} +void {\bf init} ()\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} + +\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item @@ -34,9 +35,9 @@ unsigned int {\bf numGen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc2 \subsection{Detailed Description} \subsubsection*{template$<$class EOT$>$ class moGenSolContinue$<$ EOT $>$} -One possible stop criterion for a solution-based heuristic. +One possible stopping criterion for a solution-based heuristic. -The stop criterion corresponds to a maximum number of iteration. +The stopping criterion corresponds to a maximum number of iteration. @@ -48,7 +49,7 @@ Definition at line 21 of file moGenSolContinue.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moGenSolContinue}$<$ EOT $>$::{\bf moGenSolContinue} (unsigned int {\em \_\-\_\-maxNumGen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b} -Simple constructor. +Basic constructor. \begin{Desc} \item[Parameters:] @@ -67,7 +68,7 @@ Definition at line 30 of file moGenSolContinue.h. Function that activates the stop criterion. -Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations. +Increments the counter and returns true if the current number of iteration is lower than the given maximum number of iterations. \begin{Desc} \item[Parameters:] @@ -75,27 +76,14 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[{\em \_\-\_\-sol}]the current solution. \end{description} \end{Desc} \begin{Desc} -\item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc} +\item[Returns:]true or false according to the current generation number. \end{Desc} Implements {\bf eoUF$<$ const EOT \&, bool $>$}. -Definition at line 44 of file moGenSolContinue.h. +Definition at line 42 of file moGenSolContinue.h. -References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}} -\index{init@{init}!moGenSolContinue@{moGenSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moGenSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} - - -Procedure which allows to initialise the generation counter. - -It can also be used to reset the iteration counter. - -Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. - -Definition at line 54 of file moGenSolContinue.h. - -References moGenSolContinue$<$ EOT $>$::numGen. +References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps new file mode 100644 index 000000000..67d7d5048 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.eps @@ -0,0 +1,209 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 386.473 +%%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 1.29375 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 4 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 +(moNoFitImprSolContinue< EOT >) cw +(moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/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 ----- + + (moNoFitImprSolContinue< EOT >) 0 0 box + (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box + +% ----- relations ----- + +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/doc/latex/classmo_no_fit_impr_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex new file mode 100644 index 000000000..e5ad48091 --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_fit_impr_sol_continue.tex @@ -0,0 +1,116 @@ +\section{moNoFitImprSolContinue$<$ EOT $>$ Class Template Reference} +\label{classmo_no_fit_impr_sol_continue}\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}} +One possible stop criterion for a solution-based heuristic. + + +{\tt \#include $<$moNoFitImprSolContinue.h$>$} + +Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{classmo_no_fit_impr_sol_continue} +\end{center} +\end{figure} +\subsection*{Public Types} +\begin{CompactItemize} +\item +typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3} + +\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf moNoFitImprSolContinue} (unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovment, bool \_\-\_\-maximization=true) +\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item +bool {\bf operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item +void {\bf init} ()\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} + +\begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +unsigned int {\bf maxNumberOfIterationsWithoutImprovment}\label{classmo_no_fit_impr_sol_continue_9dbd725a2dab787f9f7b159b759e4834} + +\begin{CompactList}\small\item\em Maximum number of iterations without improvment allowed. \item\end{CompactList}\item +bool {\bf firstFitnessSaved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef} + +\begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item +{\bf Fitness} {\bf fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} + +\begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item +bool {\bf maximization} +\begin{CompactList}\small\item\em Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. \item\end{CompactList}\item +unsigned int {\bf counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb} + +\begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class EOT$>$ class moNoFitImprSolContinue$<$ EOT $>$} + +One possible stop criterion for a solution-based heuristic. + +The stop criterion corresponds to a maximum number of iterations without improvement. + + + +Definition at line 21 of file moNoFitImprSolContinue.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moNoFitImprSolContinue}$<$ EOT $>$::{\bf moNoFitImprSolContinue} (unsigned int {\em \_\-\_\-maxNumberOfIterationWithoutImprovment}, bool {\em \_\-\_\-maximization} = {\tt true})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_979c991cbae53e1fd596964837c8d32d} + + +Basic constructor. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovment}]The number of iterations without fitness improvment to reach for stop. \item[{\em \_\-\_\-maximization}]Indicate if the the aim is to maximize or minimize the fitness. \end{description} +\end{Desc} + + +Definition at line 34 of file moNoFitImprSolContinue.h. + +\subsection{Member Function Documentation} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed} + + +Function that activates the stopping criterion. + +Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). \begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-sol}]the current solution. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]true or false. \end{Desc} + + +Implements {\bf eoUF$<$ const EOT \&, bool $>$}. + +Definition at line 45 of file moNoFitImprSolContinue.h. + +References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, moNoFitImprSolContinue$<$ EOT $>$::maximization, and moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovment. + +\subsection{Member Data Documentation} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!maximization@{maximization}} +\index{maximization@{maximization}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moNoFitImprSolContinue}$<$ EOT $>$::{\bf maximization}\hspace{0.3cm}{\tt [private]}}\label{classmo_no_fit_impr_sol_continue_73295d6a4ad437b0ab06848ac24698c4} + + +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. + +It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). + +Definition at line 96 of file moNoFitImprSolContinue.h. + +Referenced by moNoFitImprSolContinue$<$ EOT $>$::operator()(). + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +moNoFitImprSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps index c2a7fb9ca..3914bf1d9 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.eps +++ b/trunk/paradiseo-mo/doc/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 96.6184 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.13125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 5.175 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def /rows 4 def -/cols 1 def +/cols 4 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,7 +176,10 @@ boxfont setfont (moSolContinue< EOT >) cw (eoUF< const EOT &, bool >) cw (eoFunctorBase) cw +(moFitSolContinue< EOT >) cw (moGenSolContinue< EOT >) cw +(moNoFitImprSolContinue< EOT >) cw +(moSteadyFitSolContinue< EOT >) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,22 +191,33 @@ 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 + (moSolContinue< EOT >) 1.5 1 box + (eoUF< const EOT &, bool >) 1.5 2 box + (eoFunctorBase) 1.5 3 box + (moFitSolContinue< EOT >) 0 0 box + (moGenSolContinue< EOT >) 1 0 box + (moNoFitImprSolContinue< EOT >) 2 0 box + (moSteadyFitSolContinue< EOT >) 3 0 box % ----- relations ----- solid -0 0 1 out +0 1.5 1 out solid -1 0 2 in +1 1.5 2 in solid -0 0 2 out +0 1.5 2 out solid -1 0 3 in +1 1.5 3 in solid -1 0 0.25 out +1 1.5 0.25 out +solid +0 3 1 conn solid 0 0 0.75 in +solid +0 1 0.75 in +solid +0 2 0.75 in +solid +0 3 0.75 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex index bc98d68d9..262dbc62e 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex @@ -1,6 +1,6 @@ \section{moSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_sol_continue}\index{moSolContinue@{moSolContinue}} -Class that describes a stop criterion for a solution-based heuristic. +Class that describes a stopping criterion for a solution-based heuristic. {\tt \#include $<$moSolContinue.h$>$} @@ -8,20 +8,20 @@ Class that describes a stop criterion for a solution-based heuristic. Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_sol_continue} +\includegraphics[height=2.70531cm]{classmo_sol_continue} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item virtual void {\bf init} ()=0 -\begin{CompactList}\small\item\em Procedure which initialises all that the stop criterion needs. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em Procedure which initialises all that the stopping criterion needs. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} \subsubsection*{template$<$class EOT$>$ class moSolContinue$<$ EOT $>$} -Class that describes a stop criterion for a solution-based heuristic. +Class that describes a stopping criterion for a solution-based heuristic. It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}). @@ -35,11 +35,11 @@ Definition at line 22 of file moSolContinue.h. \subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void {\bf moSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7} -Procedure which initialises all that the stop criterion needs. +Procedure which initialises all that the stopping criterion needs. Generally, it allocates some data structures or initialises some counters. -Implemented in {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}. +Implemented in {\bf moFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, {\bf moNoFitImprSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and {\bf moSteadyFitSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps new file mode 100644 index 000000000..944e80b1e --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.eps @@ -0,0 +1,209 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Title: ClassName +%%Creator: Doxygen +%%CreationDate: Time +%%For: +%Magnification: 1.00 +%%Orientation: Portrait +%%BoundingBox: 0 0 500 388.35 +%%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 1.2875 def % aspect ratio of the BoundingBox (width/height) +/boundx 500 def +/boundy boundx boundaspect div def +/xspacing 0 def +/yspacing 0 def +/rows 4 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 +(moSteadyFitSolContinue< EOT >) cw +(moSolContinue< EOT >) cw +(eoUF< const EOT &, bool >) cw +(eoFunctorBase) cw +/boxwidth boxwidth marginwidth 2 mul add def +/xspacing boxwidth distx add def +/yspacing boxheight disty add def +/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 ----- + + (moSteadyFitSolContinue< EOT >) 0 0 box + (moSolContinue< EOT >) 0 1 box + (eoUF< const EOT &, bool >) 0 2 box + (eoFunctorBase) 0 3 box + +% ----- relations ----- + +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/doc/latex/classmo_steady_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex new file mode 100644 index 000000000..407ce21ed --- /dev/null +++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex @@ -0,0 +1,124 @@ +\section{moSteadyFitSolContinue$<$ EOT $>$ Class Template Reference} +\label{classmo_steady_fit_sol_continue}\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}} +One possible stopping criterion for a solution-based heuristic. + + +{\tt \#include $<$moSteadyFitSolContinue.h$>$} + +Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{classmo_steady_fit_sol_continue} +\end{center} +\end{figure} +\subsection*{Public Types} +\begin{CompactItemize} +\item +typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007} + +\begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} +\subsection*{Public Member Functions} +\begin{CompactItemize} +\item +{\bf moSteadyFitSolContinue} (unsigned int \_\-\_\-maxNumberOfIterations, unsigned int \_\-\_\-maxNumberOfIterationWithoutImprovment, bool \_\-\_\-maximization=true) +\begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item +bool {\bf operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em Function that activates the stopping criterion. \item\end{CompactList}\item +void {\bf init} ()\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} + +\begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize} +\subsection*{Private Attributes} +\begin{CompactItemize} +\item +unsigned int {\bf maxNumberOfIterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8} + +\begin{CompactList}\small\item\em Maximum number of iterations before considering the fitness. \item\end{CompactList}\item +unsigned int {\bf maxNumberOfIterationsWithoutImprovment}\label{classmo_steady_fit_sol_continue_92a3ea5b6752938b159257f8c6c62580} + +\begin{CompactList}\small\item\em Maximum number of iterations without improvment allowed. \item\end{CompactList}\item +bool {\bf maxNumberOfIterationsReached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887} + +\begin{CompactList}\small\item\em Flag that indicates that the maxNumberIteration have been reached. \item\end{CompactList}\item +bool {\bf firstFitnessSaved}\label{classmo_steady_fit_sol_continue_025bf2789e470fdde989eee9121035c3} + +\begin{CompactList}\small\item\em Flag that this is the first time that the fitness is used. \item\end{CompactList}\item +{\bf Fitness} {\bf fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} + +\begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item +bool {\bf maximization} +\begin{CompactList}\small\item\em Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. \item\end{CompactList}\item +unsigned int {\bf counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} + +\begin{CompactList}\small\item\em The iteration couter. \item\end{CompactList}\end{CompactItemize} + + +\subsection{Detailed Description} +\subsubsection*{template$<$class EOT$>$ class moSteadyFitSolContinue$<$ EOT $>$} + +One possible stopping criterion for a solution-based heuristic. + +The stop criterion corresponds to a maximum number of iterations without improvement (after a minimum number of iterations). + + + +Definition at line 21 of file moSteadyFitSolContinue.h. + +\subsection{Constructor \& Destructor Documentation} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moSteadyFitSolContinue}$<$ EOT $>$::{\bf moSteadyFitSolContinue} (unsigned int {\em \_\-\_\-maxNumberOfIterations}, unsigned int {\em \_\-\_\-maxNumberOfIterationWithoutImprovment}, bool {\em \_\-\_\-maximization} = {\tt true})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_bde46266638f645d409cf1afb7190c19} + + +Basic constructor. + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-maxNumberOfIterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovment}]The number of iterations without fitness improvment to reach for stop. \item[{\em \_\-\_\-maximization}]Indicate if the the aim is to maximize or minimize the fitness. \end{description} +\end{Desc} + + +Definition at line 35 of file moSteadyFitSolContinue.h. + +\subsection{Member Function Documentation} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3} + + +Function that activates the stopping criterion. + +Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations). + +\begin{Desc} +\item[Parameters:] +\begin{description} +\item[{\em \_\-\_\-sol}]the current solution. \end{description} +\end{Desc} +\begin{Desc} +\item[Returns:]true or false. \end{Desc} + + +Implements {\bf eoUF$<$ const EOT \&, bool $>$}. + +Definition at line 47 of file moSteadyFitSolContinue.h. + +References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, moSteadyFitSolContinue$<$ EOT $>$::fitness, moSteadyFitSolContinue$<$ EOT $>$::maximization, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterations, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovment. + +\subsection{Member Data Documentation} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!maximization@{maximization}} +\index{maximization@{maximization}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moSteadyFitSolContinue}$<$ EOT $>$::{\bf maximization}\hspace{0.3cm}{\tt [private]}}\label{classmo_steady_fit_sol_continue_cc54de2c6f32b650e5a7ee36efc1ba73} + + +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. + +It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). + +Definition at line 114 of file moSteadyFitSolContinue.h. + +Referenced by moSteadyFitSolContinue$<$ EOT $>$::operator()(). + +The documentation for this class was generated from the following file:\begin{CompactItemize} +\item +moSteadyFitSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty index cca9cf2eb..c6036e2f2 100644 --- a/trunk/paradiseo-mo/doc/latex/doxygen.sty +++ b/trunk/paradiseo-mo/doc/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Jul 6 17:23:18 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Jul 31 13:43:22 2007 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/doc/latex/hierarchy.tex b/trunk/paradiseo-mo/doc/latex/hierarchy.tex index 66deba8dc..cc114dc6a 100644 --- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/doc/latex/hierarchy.tex @@ -52,7 +52,10 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg \item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} \item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} +\item \contentsline{section}{moFitSolContinue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{} \item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} +\item \contentsline{section}{moNoFitImprSolContinue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{} +\item \contentsline{section}{moSteadyFitSolContinue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{} \end{CompactList} \end{CompactList} \item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex index 8bfca074c..81998982c 100644 --- a/trunk/paradiseo-mo/doc/latex/refman.tex +++ b/trunk/paradiseo-mo/doc/latex/refman.tex @@ -20,7 +20,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.5.2}\\ \vspace*{0.5cm} -{\small Fri Jul 6 17:23:18 2007}\\ +{\small Tue Jul 31 13:43:22 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -42,6 +42,7 @@ \include{classmo_cooling_schedule} \include{classmo_exponential_cooling_schedule} \include{classmo_first_impr_select} +\include{classmo_fit_sol_continue} \include{classmo_gen_sol_continue} \include{classmo_h_c} \include{classmo_h_c_move_loop_expl} @@ -57,12 +58,14 @@ \include{classmo_move_select} \include{classmo_next_move} \include{classmo_no_aspir_crit} +\include{classmo_no_fit_impr_sol_continue} \include{classmo_rand_impr_select} \include{classmo_rand_move} \include{classmo_s_a} \include{classmo_simple_move_tabu_list} \include{classmo_simple_solution_tabu_list} \include{classmo_sol_continue} +\include{classmo_steady_fit_sol_continue} \include{classmo_tabu_list} \include{classmo_t_s} \include{classmo_t_s_move_loop_expl} diff --git a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 index 775ecd2a0..9c9947252 100644 --- a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 +++ b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 @@ -1,4 +1,4 @@ -.TH "EmptySelection" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 index 5f53fcb2f..558786d90 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 @@ -1,4 +1,4 @@ -.TH "moAlgo" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 index 2b6d6d7b9..f05886f41 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moAspirCrit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index d8749d1a2..89810a924 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moBestImprSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index 1a4aa6538..e7d128d30 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moCoolingSchedule" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index 0879a5d03..1fc4f7f00 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moExponentialCoolingSchedule" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index 718b000a1..8124c7956 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moFirstImprSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 new file mode 100644 index 000000000..be6560730 --- /dev/null +++ b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 @@ -0,0 +1,115 @@ +.TH "moFitSolContinue" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.ad l +.nh +.SH NAME +moFitSolContinue \- One possible stop criterion for a solution-based heuristic. + +.PP +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +Inherits \fBmoSolContinue< EOT >< EOT >\fP. +.PP +.SS "Public Types" + +.in +1c +.ti -1c +.RI "typedef EOT::Fitness \fBFitness\fP" +.br +.RI "\fIAlias for the fitness. \fP" +.in -1c +.SS "Public Member Functions" + +.in +1c +.ti -1c +.RI "\fBmoFitSolContinue\fP (\fBFitness\fP __fitness, bool __maximization=true)" +.br +.RI "\fIBasic constructor. \fP" +.ti -1c +.RI "bool \fBoperator()\fP (const EOT &__sol)" +.br +.RI "\fIFunction that activates the stopping criterion. \fP" +.ti -1c +.RI "void \fBinit\fP ()" +.br +.RI "\fIProcedure which allows to initialise all the stuff needed. \fP" +.in -1c +.SS "Private Attributes" + +.in +1c +.ti -1c +.RI "\fBFitness\fP \fBfitness\fP" +.br +.RI "\fIFitness target. \fP" +.ti -1c +.RI "bool \fBmaximization\fP" +.br +.RI "\fIFlag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. \fP" +.in -1c +.SH "Detailed Description" +.PP + +.SS "template class moFitSolContinue< EOT >" +One possible stop criterion for a solution-based heuristic. + +The stop criterion corresponds to a fitness threshold gained. +.PP +Definition at line 21 of file moFitSolContinue.h. +.SH "Constructor & Destructor Documentation" +.PP +.SS "template \fBmoFitSolContinue\fP< EOT >::\fBmoFitSolContinue\fP (\fBFitness\fP __fitness, bool __maximization = \fCtrue\fP)\fC [inline]\fP" +.PP +Basic constructor. +.PP +\fBParameters:\fP +.RS 4 +\fI__fitness\fP The fitness to reach. +.br +\fI__maximization\fP Indicate if the the aim is to maximize or minimize the fitness. +.RE +.PP + +.PP +Definition at line 34 of file moFitSolContinue.h. +.SH "Member Function Documentation" +.PP +.SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.PP +Function that activates the stopping criterion. +.PP +Indicates if the fitness threshold has not been yet reached. +.PP +\fBParameters:\fP +.RS 4 +\fI__sol\fP the current solution. +.RE +.PP +\fBReturns:\fP +.RS 4 +true or false according to the value of the fitness. +.RE +.PP + +.PP +Implements \fBeoUF< const EOT &, bool >\fP. +.PP +Definition at line 44 of file moFitSolContinue.h. +.PP +References moFitSolContinue< EOT >::fitness, and moFitSolContinue< EOT >::maximization. +.SH "Member Data Documentation" +.PP +.SS "template bool \fBmoFitSolContinue\fP< EOT >::\fBmaximization\fP\fC [private]\fP" +.PP +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. +.PP +It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +.PP +Definition at line 72 of file moFitSolContinue.h. +.PP +Referenced by moFitSolContinue< EOT >::operator()(). + +.SH "Author" +.PP +Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 index 9f61aa6ed..576685d4a 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 @@ -1,8 +1,8 @@ -.TH "moGenSolContinue" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME -moGenSolContinue \- One possible stop criterion for a solution-based heuristic. +moGenSolContinue \- One possible stopping criterion for a solution-based heuristic. .PP .SH SYNOPSIS @@ -18,7 +18,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "\fBmoGenSolContinue\fP (unsigned int __maxNumGen)" .br -.RI "\fISimple constructor. \fP" +.RI "\fIBasic constructor. \fP" .ti -1c .RI "bool \fBoperator()\fP (const EOT &__sol)" .br @@ -26,7 +26,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .ti -1c .RI "void \fBinit\fP ()" .br -.RI "\fIProcedure which allows to initialise the generation counter. \fP" +.RI "\fIProcedure which allows to initialise all the stuff needed. \fP" .in -1c .SS "Private Attributes" @@ -44,16 +44,16 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .PP .SS "template class moGenSolContinue< EOT >" -One possible stop criterion for a solution-based heuristic. +One possible stopping criterion for a solution-based heuristic. -The stop criterion corresponds to a maximum number of iteration. +The stopping criterion corresponds to a maximum number of iteration. .PP Definition at line 21 of file moGenSolContinue.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoGenSolContinue\fP< EOT >::\fBmoGenSolContinue\fP (unsigned int __maxNumGen)\fC [inline]\fP" .PP -Simple constructor. +Basic constructor. .PP \fBParameters:\fP .RS 4 @@ -69,7 +69,7 @@ Definition at line 30 of file moGenSolContinue.h. .PP Function that activates the stop criterion. .PP -Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations. +Increments the counter and returns true if the current number of iteration is lower than the given maximum number of iterations. .PP \fBParameters:\fP .RS 4 @@ -78,27 +78,16 @@ Increments the counter and returns TRUE if the current number of iteration is lo .PP \fBReturns:\fP .RS 4 -TRUE or FALSE according to the current generation number. +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. +Definition at line 42 of file moGenSolContinue.h. .PP References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. -.SS "template void \fBmoGenSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" -.PP -Procedure which allows to initialise the generation counter. -.PP -It can also be used to reset the iteration counter. -.PP -Implements \fBmoSolContinue< EOT >\fP. -.PP -Definition at line 54 of file moGenSolContinue.h. -.PP -References moGenSolContinue< EOT >::numGen. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3 index 70f1222c8..b7078db1f 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moHC.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moHC.3 @@ -1,4 +1,4 @@ -.TH "moHC" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index fe9ac40f4..d8e8b57b9 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moHCMoveLoopExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index fd6fbbde8..2a47d0e43 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moImprBestFitAspirCrit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 index 056367846..299fe73b3 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 @@ -1,4 +1,4 @@ -.TH "moItRandNextMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 index cb9dcfc4e..6bdb92f06 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 @@ -1,4 +1,4 @@ -.TH "moLSCheckPoint" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index d0879534f..fbb186adc 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moLinearCoolingSchedule" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3 index 3232ee1ce..dc24e6b20 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMove.3 @@ -1,4 +1,4 @@ -.TH "moMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 index 6090b07c8..6237353ba 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index e6263650a..e996a406f 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 @@ -1,4 +1,4 @@ -.TH "moMoveIncrEval" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 index c96403f6b..a22ccbf61 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 @@ -1,4 +1,4 @@ -.TH "moMoveInit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 index 3c53f0b3a..fec93623b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveLoopExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 index f01d62530..1168ba46b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 @@ -1,4 +1,4 @@ -.TH "moMoveSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 index 4b70f19a3..7ddbbf561 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 @@ -1,4 +1,4 @@ -.TH "moNextMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index 854cccf66..53b9aff10 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moNoAspirCrit" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 new file mode 100644 index 000000000..bc9db5b8b --- /dev/null +++ b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 @@ -0,0 +1,127 @@ +.TH "moNoFitImprSolContinue" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.ad l +.nh +.SH NAME +moNoFitImprSolContinue \- One possible stop criterion for a solution-based heuristic. + +.PP +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +Inherits \fBmoSolContinue< EOT >< EOT >\fP. +.PP +.SS "Public Types" + +.in +1c +.ti -1c +.RI "typedef EOT::Fitness \fBFitness\fP" +.br +.RI "\fIAlias for the fitness. \fP" +.in -1c +.SS "Public Member Functions" + +.in +1c +.ti -1c +.RI "\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)" +.br +.RI "\fIBasic constructor. \fP" +.ti -1c +.RI "bool \fBoperator()\fP (const EOT &__sol)" +.br +.RI "\fIFunction that activates the stopping criterion. \fP" +.ti -1c +.RI "void \fBinit\fP ()" +.br +.RI "\fIProcedure which allows to initialise all the stuff needed. \fP" +.in -1c +.SS "Private Attributes" + +.in +1c +.ti -1c +.RI "unsigned int \fBmaxNumberOfIterationsWithoutImprovment\fP" +.br +.RI "\fIMaximum number of iterations without improvment allowed. \fP" +.ti -1c +.RI "bool \fBfirstFitnessSaved\fP" +.br +.RI "\fIFlag that this is the first time that the fitness is used. \fP" +.ti -1c +.RI "\fBFitness\fP \fBfitness\fP" +.br +.RI "\fICurrent Fitness. \fP" +.ti -1c +.RI "bool \fBmaximization\fP" +.br +.RI "\fIFlag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. \fP" +.ti -1c +.RI "unsigned int \fBcounter\fP" +.br +.RI "\fIThe iteration couter. \fP" +.in -1c +.SH "Detailed Description" +.PP + +.SS "template class moNoFitImprSolContinue< EOT >" +One possible stop criterion for a solution-based heuristic. + +The stop criterion corresponds to a maximum number of iterations without improvement. +.PP +Definition at line 21 of file moNoFitImprSolContinue.h. +.SH "Constructor & Destructor Documentation" +.PP +.SS "template \fBmoNoFitImprSolContinue\fP< EOT >::\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization = \fCtrue\fP)\fC [inline]\fP" +.PP +Basic constructor. +.PP +\fBParameters:\fP +.RS 4 +\fI__maxNumberOfIterationWithoutImprovment\fP The number of iterations without fitness improvment to reach for stop. +.br +\fI__maximization\fP Indicate if the the aim is to maximize or minimize the fitness. +.RE +.PP + +.PP +Definition at line 34 of file moNoFitImprSolContinue.h. +.SH "Member Function Documentation" +.PP +.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.PP +Function that activates the stopping criterion. +.PP +Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). +.PP +\fBParameters:\fP +.RS 4 +\fI__sol\fP the current solution. +.RE +.PP +\fBReturns:\fP +.RS 4 +true or false. +.RE +.PP + +.PP +Implements \fBeoUF< const EOT &, bool >\fP. +.PP +Definition at line 45 of file moNoFitImprSolContinue.h. +.PP +References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, moNoFitImprSolContinue< EOT >::maximization, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovment. +.SH "Member Data Documentation" +.PP +.SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::\fBmaximization\fP\fC [private]\fP" +.PP +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. +.PP +It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +.PP +Definition at line 96 of file moNoFitImprSolContinue.h. +.PP +Referenced by moNoFitImprSolContinue< EOT >::operator()(). + +.SH "Author" +.PP +Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 index 76197a989..b72ace225 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moRandImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moRandImprSelect" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 index 567e72041..80a16910b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 @@ -1,4 +1,4 @@ -.TH "moRandMove" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3 index b21d90d0c..9ed1a765e 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSA.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSA.3 @@ -1,4 +1,4 @@ -.TH "moSA" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index 1e47ab9ae..5c346412b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleMoveTabuList" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 index 560960857..c75f4ea09 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleSolutionTabuList" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 index 1d8d40e8a..9c4c989ac 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 @@ -1,8 +1,8 @@ -.TH "moSolContinue" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME -moSolContinue \- Class that describes a stop criterion for a solution-based heuristic. +moSolContinue \- Class that describes a stopping criterion for a solution-based heuristic. .PP .SH SYNOPSIS @@ -12,7 +12,7 @@ moSolContinue \- Class that describes a stop criterion for a solution-based heur .PP Inherits \fBeoUF< const EOT &, bool >\fP. .PP -Inherited by \fBmoGenSolContinue< EOT >\fP. +Inherited by \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP. .PP .SS "Public Member Functions" @@ -20,13 +20,13 @@ Inherited by \fBmoGenSolContinue< EOT >\fP. .ti -1c .RI "virtual void \fBinit\fP ()=0" .br -.RI "\fIProcedure which initialises all that the stop criterion needs. \fP" +.RI "\fIProcedure which initialises all that the stopping criterion needs. \fP" .in -1c .SH "Detailed Description" .PP .SS "template class moSolContinue< EOT >" -Class that describes a stop criterion for a solution-based heuristic. +Class that describes a stopping criterion for a solution-based heuristic. It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). .PP @@ -35,11 +35,11 @@ Definition at line 22 of file moSolContinue.h. .PP .SS "template virtual void \fBmoSolContinue\fP< EOT >::init ()\fC [pure virtual]\fP" .PP -Procedure which initialises all that the stop criterion needs. +Procedure which initialises all that the stopping criterion needs. .PP Generally, it allocates some data structures or initialises some counters. .PP -Implemented in \fBmoGenSolContinue< EOT >\fP. +Implemented in \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fBmoNoFitImprSolContinue< EOT >\fP, and \fBmoSteadyFitSolContinue< EOT >\fP. .SH "Author" .PP diff --git a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 new file mode 100644 index 000000000..df098d996 --- /dev/null +++ b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 @@ -0,0 +1,137 @@ +.TH "moSteadyFitSolContinue" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.ad l +.nh +.SH NAME +moSteadyFitSolContinue \- One possible stopping criterion for a solution-based heuristic. + +.PP +.SH SYNOPSIS +.br +.PP +\fC#include \fP +.PP +Inherits \fBmoSolContinue< EOT >< EOT >\fP. +.PP +.SS "Public Types" + +.in +1c +.ti -1c +.RI "typedef EOT::Fitness \fBFitness\fP" +.br +.RI "\fIAlias for the fitness. \fP" +.in -1c +.SS "Public Member Functions" + +.in +1c +.ti -1c +.RI "\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true)" +.br +.RI "\fIBasic constructor. \fP" +.ti -1c +.RI "bool \fBoperator()\fP (const EOT &__sol)" +.br +.RI "\fIFunction that activates the stopping criterion. \fP" +.ti -1c +.RI "void \fBinit\fP ()" +.br +.RI "\fIProcedure which allows to initialise the stuff needed. \fP" +.in -1c +.SS "Private Attributes" + +.in +1c +.ti -1c +.RI "unsigned int \fBmaxNumberOfIterations\fP" +.br +.RI "\fIMaximum number of iterations before considering the fitness. \fP" +.ti -1c +.RI "unsigned int \fBmaxNumberOfIterationsWithoutImprovment\fP" +.br +.RI "\fIMaximum number of iterations without improvment allowed. \fP" +.ti -1c +.RI "bool \fBmaxNumberOfIterationsReached\fP" +.br +.RI "\fIFlag that indicates that the maxNumberIteration have been reached. \fP" +.ti -1c +.RI "bool \fBfirstFitnessSaved\fP" +.br +.RI "\fIFlag that this is the first time that the fitness is used. \fP" +.ti -1c +.RI "\fBFitness\fP \fBfitness\fP" +.br +.RI "\fICurrent Fitness. \fP" +.ti -1c +.RI "bool \fBmaximization\fP" +.br +.RI "\fIFlag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. \fP" +.ti -1c +.RI "unsigned int \fBcounter\fP" +.br +.RI "\fIThe iteration couter. \fP" +.in -1c +.SH "Detailed Description" +.PP + +.SS "template class moSteadyFitSolContinue< EOT >" +One possible stopping criterion for a solution-based heuristic. + +The stop criterion corresponds to a maximum number of iterations without improvement (after a minimum number of iterations). +.PP +Definition at line 21 of file moSteadyFitSolContinue.h. +.SH "Constructor & Destructor Documentation" +.PP +.SS "template \fBmoSteadyFitSolContinue\fP< EOT >::\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization = \fCtrue\fP)\fC [inline]\fP" +.PP +Basic constructor. +.PP +\fBParameters:\fP +.RS 4 +\fI__maxNumberOfIterations\fP The number of iterations to reach before looking for the fitness. +.br +\fI__maxNumberOfIterationWithoutImprovment\fP The number of iterations without fitness improvment to reach for stop. +.br +\fI__maximization\fP Indicate if the the aim is to maximize or minimize the fitness. +.RE +.PP + +.PP +Definition at line 35 of file moSteadyFitSolContinue.h. +.SH "Member Function Documentation" +.PP +.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" +.PP +Function that activates the stopping criterion. +.PP +Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations). +.PP +\fBParameters:\fP +.RS 4 +\fI__sol\fP the current solution. +.RE +.PP +\fBReturns:\fP +.RS 4 +true or false. +.RE +.PP + +.PP +Implements \fBeoUF< const EOT &, bool >\fP. +.PP +Definition at line 47 of file moSteadyFitSolContinue.h. +.PP +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maximization, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovment. +.SH "Member Data Documentation" +.PP +.SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::\fBmaximization\fP\fC [private]\fP" +.PP +Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. +.PP +It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that is worse that the best known fitness (in this case, the counter is not reinitialized). +.PP +Definition at line 114 of file moSteadyFitSolContinue.h. +.PP +Referenced by moSteadyFitSolContinue< EOT >::operator()(). + +.SH "Author" +.PP +Generated automatically by Doxygen for PARADISEO-MO from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moTS.3 b/trunk/paradiseo-mo/doc/man/man3/moTS.3 index aa81de64e..d79503e47 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moTS.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moTS.3 @@ -1,4 +1,4 @@ -.TH "moTS" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index ae467fe08..01a292042 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moTSMoveLoopExpl" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 index 19fa9d5b7..29f704a0b 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 @@ -1,4 +1,4 @@ -.TH "moTabuList" 3 "6 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "31 Jul 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index 58476ce6b..6b87e3608 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -18,6 +18,7 @@ #include "moCoolingSchedule.h" #include "moExponentialCoolingSchedule.h" #include "moFirstImprSelect.h" +#include "moFitSolContinue.h" #include "moGenSolContinue.h" #include "moHC.h" #include "moHCMoveLoopExpl.h" @@ -33,12 +34,14 @@ #include "moMoveSelect.h" #include "moNextMove.h" #include "moNoAspirCrit.h" +#include "moNoFitImprSolContinue.h" #include "moRandImprSelect.h" #include "moRandMove.h" #include "moSA.h" #include "moSimpleMoveTabuList.h" #include "moSimpleSolutionTabuList.h" #include "moSolContinue.h" +#include "moSteadyFitSolContinue.h" #include "moTabuList.h" #include "moTS.h" #include "moTSMoveLoopExpl.h" diff --git a/trunk/paradiseo-mo/src/moFitSolContinue.h b/trunk/paradiseo-mo/src/moFitSolContinue.h new file mode 100644 index 000000000..72c5bca46 --- /dev/null +++ b/trunk/paradiseo-mo/src/moFitSolContinue.h @@ -0,0 +1,75 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moFitSolContinue.h" + +// (c) OPAC Team (LIFL), Dolphin project (INRIA), 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moFitSolContinue_h +#define __moFitSolContinue_h + +#include "moSolContinue.h" + +//! One possible stop criterion for a solution-based heuristic. +/*! + The stop criterion corresponds to a fitness threshold gained. + */ +template < class EOT > class moFitSolContinue:public moSolContinue < EOT > +{ + +public: + + //! Alias for the fitness. + typedef typename EOT::Fitness Fitness; + + //! Basic constructor. + /*! + \param __fitness The fitness to reach. + \param __maximization Indicate if the the aim is to maximize or minimize the fitness. + */ + moFitSolContinue (Fitness __fitness, bool __maximization=true): fitness (__fitness), maximization(__maximization) + {} + + //! Function that activates the stopping criterion. + /*! + Indicates if the fitness threshold has not been yet reached. + + \param __sol the current solution. + \return true or false according to the value of the fitness. + */ + bool operator () (const EOT & __sol) + { + if(__sol.invalid()) + { + return true; + } + + if(maximization) + { + return __sol.fitness()fitness; + } + + //! Procedure which allows to initialise all the stuff needed. + void init () + {} + +private: + + //! Fitness target. + Fitness fitness; + + //! Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. + /*! + It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that + is worse that the best known fitness (in this case, the counter is not reinitialized). + */ + bool maximization; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/moGenSolContinue.h b/trunk/paradiseo-mo/src/moGenSolContinue.h index 2bd8ba4e5..7a5bca6b1 100755 --- a/trunk/paradiseo-mo/src/moGenSolContinue.h +++ b/trunk/paradiseo-mo/src/moGenSolContinue.h @@ -1,6 +1,6 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- -// "eoGenSolContinue.h" +// "moGenSolContinue.h" // (c) OPAC Team, LIFL, 2003-2006 @@ -14,48 +14,39 @@ #include "moSolContinue.h" -//! One possible stop criterion for a solution-based heuristic. +//! One possible stopping criterion for a solution-based heuristic. /*! - The stop criterion corresponds to a maximum number of iteration. + The stopping criterion corresponds to a maximum number of iteration. */ template < class EOT > class moGenSolContinue:public moSolContinue < EOT > { public: - //! Simple constructor. + //! Basic constructor. /*! \param __maxNumGen the maximum number of generation. */ moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0) - { - - } + {} //! Function that activates the stop criterion. /*! - Increments the counter and returns TRUE if the + Increments the counter and returns true if the current number of iteration is lower than the given maximum number of iterations. \param __sol the current solution. - \return TRUE or FALSE according to the current generation number. + \return true or false according to the current generation number. */ - bool operator () (const EOT & __sol) + bool operator () (const EOT & __sol) { - return (++numGen < maxNumGen); } - //! Procedure which allows to initialise the generation counter. - /*! - It can also be used to reset the iteration counter. - */ + //! Procedure which allows to initialise all the stuff needed. void init () - { - - numGen = 0; - } + {} private: diff --git a/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h b/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h new file mode 100644 index 000000000..5ca55b16e --- /dev/null +++ b/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h @@ -0,0 +1,102 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moNoFitImprSolContinue.h" + +// (c) OPAC Team (LIFL), Dolphin project (INRIA), 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moNoFitImprSolContinue_h +#define __moNoFitImprSolContinue_h + +#include "moSolContinue.h" + +//! One possible stop criterion for a solution-based heuristic. +/*! + The stop criterion corresponds to a maximum number of iterations without improvement. + */ +template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT > +{ + +public: + + //! Alias for the fitness. + typedef typename EOT::Fitness Fitness; + + //! Basic constructor. + /*! + \param __maxNumberOfIterationWithoutImprovment The number of iterations without fitness improvment to reach for stop. + \param __maximization Indicate if the the aim is to maximize or minimize the fitness. + */ + moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true) + : maxNumberOfIterationsWithoutImprovment(__maxNumberOfIterationWithoutImprovment),maximization(__maximization), + firstFitnessSaved(true), counter(0) + {} + + //! Function that activates the stopping criterion. + /*! + Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). + \param __sol the current solution. + \return true or false. + */ + bool operator () (const EOT & __sol) + { + if(__sol.invalid()) + { + return true; + } + + if(firstFitnessSaved) + { + fitness=__sol.fitness(); + counter=0; + FirstFitnessSaved=false; + return true; + } + + counter++; + + if( ((maximization) && (__sol.fitness() > fitness)) || + ((!maximization) && (__sol.fitness() < fitness)) ) + { + fitness=__sol.fitness(); + counter=0; + } + + if(counter==maxNumberOfIterationsWithoutImprovment) + { + std::cout << "moNoFitImrpSolContinue: Done [" << counter << "] iterations without improvement." << std::endl; + } + return counter!=maxNumberOfIterationsWithoutImprovment; + } + + //! Procedure which allows to initialise all the stuff needed. + void init () + {} + +private: + + //! Maximum number of iterations without improvment allowed. + unsigned int maxNumberOfIterationsWithoutImprovment; + + //! Flag that this is the first time that the fitness is used. + bool firstFitnessSaved; + + //! Current Fitness. + Fitness fitness; + + //! Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. + /*! + It can be interesting to know this information because some solution-based metaheuristics can generate solutions wiht a fitness that + is worse that the best known fitness (in this case, the counter is not reinitialized). + */ + bool maximization; + + //! The iteration couter. + unsigned int counter; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/moSolContinue.h b/trunk/paradiseo-mo/src/moSolContinue.h index 44efdd969..285f6df40 100755 --- a/trunk/paradiseo-mo/src/moSolContinue.h +++ b/trunk/paradiseo-mo/src/moSolContinue.h @@ -14,7 +14,7 @@ #include -//! Class that describes a stop criterion for a solution-based heuristic +//! Class that describes a stopping criterion for a solution-based heuristic /*! It allows to add an initialisation procedure to an object that is a unary function (eoUF). @@ -23,7 +23,7 @@ template < class EOT > class moSolContinue:public eoUF < const EOT &, bool > { public: - //! Procedure which initialises all that the stop criterion needs + //! Procedure which initialises all that the stopping criterion needs /*! Generally, it allocates some data structures or initialises some counters. */ diff --git a/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h b/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h new file mode 100644 index 000000000..45184995a --- /dev/null +++ b/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h @@ -0,0 +1,120 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +// "moSteadyFitSolContinue.h" + +// (c) OPAC Team (LIFL), Dolphin project (INRIA), 2003-2007 + +/* LICENCE TEXT + + Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef __moSteadyFitSolContinue_h +#define __moSteadyFitSolContinue_h + +#include "moSolContinue.h" + +//! One possible stopping criterion for a solution-based heuristic. +/*! + The stop criterion corresponds to a maximum number of iterations without improvement (after a minimum number of iterations). + */ +template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT > +{ + +public: + + //! Alias for the fitness. + typedef typename EOT::Fitness Fitness; + + //! Basic constructor. + /*! + \param __maxNumberOfIterations The number of iterations to reach before looking for the fitness. + \param __maxNumberOfIterationWithoutImprovment The number of iterations without fitness improvment to reach for stop. + \param __maximization Indicate if the the aim is to maximize or minimize the fitness. + */ + moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovment, bool __maximization=true) + : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovment(__maxNumberOfIterationWithoutImprovment), + maximization(__maximization), maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) + {} + + //! Function that activates the stopping criterion. + /*! + Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations). + + \param __sol the current solution. + \return true or false. + */ + bool operator () (const EOT & __sol) + { + if(!maxNumberOfIterationsReached) + { + maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations); + if(maxNumberOfIterationsReached) + { + std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl; + } + return true; + } + + if(__sol.invalid()) + { + return true; + } + + if(firstFitnessSaved) + { + fitness=__sol.fitness(); + counter=0; + FirstFitnessSaved=false; + return true; + } + + counter++; + + if( ((maximization) && (__sol.fitness() > fitness)) || + ((!maximization) && (__sol.fitness() < fitness)) ) + { + fitness=__sol.fitness(); + counter=0; + } + + if(counter==maxNumberOfIterationsWithoutImprovment) + { + std::cout << "moSteadyFitSolContinue: Done [" << counter << "] iterations without improvement." << std::endl; + } + return counter!=maxNumberOfIterationsWithoutImprovment; + } + + //! Procedure which allows to initialise the stuff needed. + void init () + {} + +private: + + //! Maximum number of iterations before considering the fitness. + unsigned int maxNumberOfIterations; + + //! Maximum number of iterations without improvment allowed. + unsigned int maxNumberOfIterationsWithoutImprovment; + + //! Flag that indicates that the maxNumberIteration have been reached. + bool maxNumberOfIterationsReached; + + //! Flag that this is the first time that the fitness is used. + bool firstFitnessSaved; + + //! Current Fitness. + Fitness fitness; + + //! Flag that indicate if there is a maximization (true) or a minimization (false) of the fitness value. + /*! + It can be interesting to know this information because some solution-based metaheuristics can generate solution with a fitness that + is worse that the best known fitness (in this case, the counter is not reinitialized). + */ + bool maximization; + + //! The iteration couter. + unsigned int counter; +}; + +#endif diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp index 13913bdb7..00604fce9 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp @@ -59,6 +59,9 @@ main (int __argc, char * __argv []) moNoAspirCrit aspir_crit ; // Aspiration Criterion moGenSolContinue cont (10000) ; // Continuator + //moFitSolContinue cont (-700); + //moSteadyFitSolContinue cont (1000, 2000); + //moNoFitImprSolContinue cont (1000); moTS tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ; tabu_search (route) ;