diff --git a/trunk/LICENCE b/trunk/LICENSE similarity index 100% rename from trunk/LICENCE rename to trunk/LICENSE diff --git a/trunk/installParadiseo.sh b/trunk/installParadiseo.sh index f35499253..16f1bbbf9 100755 --- a/trunk/installParadiseo.sh +++ b/trunk/installParadiseo.sh @@ -433,7 +433,7 @@ function run_install_step() RETURN=$? execute_cmd " echo \"cmake ../ -G$BUILD_PROCESS_TYPE \" -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE" $SPY - cmake ../ -G"$BUILD_PROCESS_TYPE" -DEOdir=$installKitPath/paradiseo-eo -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE >> ${SPY} 2>> ${SPY} + cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" >> ${SPY} 2>> ${SPY} RETURN=`expr $RETURN + $?` if [ "$COMPILE_PARADISEO" = "1" ] @@ -465,7 +465,7 @@ function run_install_step() RETURN=$? execute_cmd " echo \"cmake ../ -G$BUILD_PROCESS_TYPE \" -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE" $SPY - cmake ../ -G"$BUILD_PROCESS_TYPE" -DEOdir=$installKitPath/paradiseo-eo -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE >> ${SPY} 2>> ${SPY} + cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" >> ${SPY} 2>> ${SPY} RETURN=`expr $RETURN + $?` if [ "$COMPILE_PARADISEO" = "1" ] @@ -716,7 +716,7 @@ function run_install_step() RETURN=$? execute_cmd " echo \"cmake ../ -G$BUILD_PROCESS_TYPE \" -DEOdir=$installKitPath/paradiseo-eo -DMOdir=$installKitPath/paradiseo-mo" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE" $SPY - cmake ../ -G"$BUILD_PROCESS_TYPE" -DEOdir=$installKitPath/paradiseo-eo -DMOdir=$installKitPath/paradiseo-mo -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE >> ${SPY} 2>> ${SPY} + cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" >> ${SPY} 2>> ${SPY} RETURN=`expr $RETURN + $?` if [ "$COMPILE_PARADISEO" = "1" ] diff --git a/trunk/paradiseo-mo/README b/trunk/paradiseo-mo/README index 2ec907692..089902ff4 100644 --- a/trunk/paradiseo-mo/README +++ b/trunk/paradiseo-mo/README @@ -12,7 +12,7 @@ The basic installation procedure goes the following: To compile paradiseo-mo in the default directory, go to paradiseo-mo/build/ and run: - > cmake ../ -DEOdir=$(EO) + > cmake ../ -Dconfig= > make // for an easy-use of the provided lessons > make install @@ -20,15 +20,14 @@ go to paradiseo-mo/build/ and run: > make doc To compile paradiseo-mo anywhere else, simply run: - > cmake $(MO) -DEOdir=$(EO) + > cmake $(MO) -Dconfig= > make // for an easy-use of the provided lessons > make install // optional (if the documentation is not already available) > make doc -where $(EO) is the top-level directory of PARADISEO-EO, - and $(MO) is the top-level directory of PARADISEO-MO. +where $(MO) is the top-level directory of PARADISEO-MO. To clean everything, simply run > make clean diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index fe1b7e021..99a544a36 100644 --- a/trunk/paradiseo-mo/doc/html/annotated.html +++ b/trunk/paradiseo-mo/doc/html/annotated.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Class List + +ParadisEO-MOMovingObjects: Class List - +
-
+
-
-

PARADISEO-MO Class List

Here are the classes, structs, unions and interfaces with brief descriptions: + +

ParadisEO-MOMovingObjects Class List

Here are the classes, structs, unions and interfaces with brief descriptions:
+ + - - + - - - + + - - - - - + + + + - + - + - - - + + + - + - + + + + + + + + + + + + + +
CitySwapIts swaps two vertices randomly choosen
EdgeXoverEdge Crossover
EmptySelectionSpecial class that describes the case of no selection
moAlgo< EOT >Description of an algorithm of the paradiseo-mo library
moAspirCrit< M >Description of the conditions in which a tabu move could be accepted
moBestImprSelect< M >One of the possible moMoveSelect
moComparator< EOT >Template for classes which need to compare two EOT and indicate if the first is "better" than the second
moBestImprSelect< M >One of the possible moMoveSelect
moCoolingScheduleThis class gives the description of a cooling schedule
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moFitComparator< EOT >Comparison according to the fitness
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moFitSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moGenSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moHC< M >Hill Climbing (HC)
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moILS< M >Iterated Local Search (ILS)
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moLSCheckPoint< M >Class which allows a checkpointing system
moMove< EOT >Definition of a move
moMoveExpl< M >Description of a move (moMove) explorer
moMoveExpl< M >Description of a move (moMove) explorer
moMoveIncrEval< M >(generally) Efficient evaluation function based a move and a solution
moMoveInit< M >Move (moMove) initializer
moMoveInit< M >Move (moMove) initializer
moMoveLoopExpl< M >Class which describes an iterative explorer
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)
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)
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
moSteadyFitSolContinue< EOT >One possible stopping criterion for a solution-based heuristic
moTabuList< M >Class describing a tabu list that a moTS uses
moTabuList< M >Class describing a tabu list that a moTS uses
moTS< M >Tabu Search (TS)
moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm
OrderXoverOrder Crossover
PartialMappedXoverPartial Mapped Crossover
PartRouteEvalRoute Evaluator
PartTwoOptInitIt sets the first couple of edges
PartTwoOptNextIt updates a couple of edges
RouteEvalRoute Evaluator
RouteInit
TwoOpt
TwoOptIncrEval
TwoOptInitIt sets the first couple of edges
TwoOptNextIt updates a couple of edges
TwoOptRand
TwoOptTabuListThe table of tabu movements, i.e
-
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html b/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html index e0b1a7e09..451415c89 100644 --- a/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/city__swap_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: city_swap.cpp Source File - +
-
-

city_swap.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "city_swap.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2002-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <utils/eoRNG.h>
-00013 
-00014 #include "city_swap.h"
-00015 
-00016 bool CitySwap :: operator () (Route & __route) {
-00017   
-00018   std :: swap (__route [rng.random (__route.size ())],
-00019                __route [rng.random (__route.size ())]) ;
-00020     
-00021   __route.invalidate () ;
-00022   
-00023   return true ;
-00024 }
-
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

city_swap.cpp

00001 /* 
+00002 * <city_swap.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <utils/eoRNG.h>
+00038 
+00039 #include "city_swap.h"
+00040 
+00041 bool CitySwap :: operator () (Route & __route) {
+00042   
+00043   std :: swap (__route [rng.random (__route.size ())],
+00044                __route [rng.random (__route.size ())]) ;
+00045     
+00046   __route.invalidate () ;
+00047   
+00048   return true ;
+00049 }
+
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html b/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html index 3cd00292e..109169fad 100644 --- a/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/city__swap_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: city_swap.h Source File - +
-
-

city_swap.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "city_swap.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2002-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef city_swap_h
-00013 #define city_swap_h
-00014 
-00015 #include <eoOp.h>
-00016 
-00017 #include "route.h"
-00018 
-00021 class CitySwap : public eoMonOp <Route> {
-00022   
-00023 public :
-00024   
-00025   bool operator () (Route & __route) ;
-00026     
-00027 } ;
-00028 
-00029 #endif
-
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

city_swap.h

00001 /* 
+00002 * <city_swap.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef city_swap_h
+00038 #define city_swap_h
+00039 
+00040 #include <eoOp.h>
+00041 
+00042 #include "route.h"
+00043 
+00046 class CitySwap : public eoMonOp <Route> {
+00047   
+00048 public :
+00049   
+00050   bool operator () (Route & __route) ;
+00051     
+00052 } ;
+00053 
+00054 #endif
+
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_city_swap-members.html b/trunk/paradiseo-mo/doc/html/class_city_swap-members.html index 485ee47fa..1850d9b17 100644 --- a/trunk/paradiseo-mo/doc/html/class_city_swap-members.html +++ b/trunk/paradiseo-mo/doc/html/class_city_swap-members.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

CitySwap Member List

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

+ + + + + + -
className() const eoMonOp< EOType > [virtual]
eoMonOp()eoMonOp< EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
functor_category()eoUF< EOType &, bool > [static]
getType() const eoOp< EOType >
operator()(Route &__route)CitySwap

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + eoMonOp::operator()(EOType &)=0eoUF< EOType &, bool > [pure virtual] + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< EOType &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_city_swap.html b/trunk/paradiseo-mo/doc/html/class_city_swap.html index 765bf1059..7ad8b3322 100644 --- a/trunk/paradiseo-mo/doc/html/class_city_swap.html +++ b/trunk/paradiseo-mo/doc/html/class_city_swap.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: CitySwap Class Reference - +
-
+
-
-

CitySwap Class Reference

Its swaps two vertices randomly choosen. + +

CitySwap Class Reference

Its swaps two vertices randomly choosen. More...

#include <city_swap.h>

+

Inheritance diagram for CitySwap: +

+ +eoMonOp< EOType > +eoOp< EOType > +eoUF< EOType &, bool > +eoFunctorBase + List of all members. +bool 

Public Member Functions

-bool operator() (Route &__route)
operator() (Route &__route)

Detailed Description

@@ -48,10 +54,10 @@ Its swaps two vertices randomly choosen.

-Definition at line 21 of file city_swap.h.

The documentation for this class was generated from the following files:
-
+

EdgeXover Member List

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

+ + + + + + + + -
_mapEdgeXover [private]
add_vertex(unsigned int __vertex, Route &__child)EdgeXover [private]
build_map(const Route &__par1, const Route &__par2)EdgeXover [private]
className() const eoQuadOp< EOType > [virtual]
cross(const Route &__par1, const Route &__par2, Route &__child)EdgeXover [private]
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
eoQuadOp()eoQuadOp< EOType >
functor_category()eoBF< EOType &, EOType &, bool > [static]
getType() const eoOp< EOType >
operator()(Route &__route1, Route &__route2)EdgeXover
eoQuadOp::operator()(EOType &, EOType &)=0eoBF< EOType &, EOType &, bool > [pure virtual]
OpType enum nameeoOp< EOType >
visitedEdgeXover [private]

Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + ~eoBF()eoBF< EOType &, EOType &, bool > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_edge_xover.html b/trunk/paradiseo-mo/doc/html/class_edge_xover.html index e052fb730..d76d151a4 100644 --- a/trunk/paradiseo-mo/doc/html/class_edge_xover.html +++ b/trunk/paradiseo-mo/doc/html/class_edge_xover.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: EdgeXover Class Reference - +
-
+
-
-

EdgeXover Class Reference

Edge Crossover. + +

EdgeXover Class Reference

Edge Crossover. More...

#include <edge_xover.h>

+

Inheritance diagram for EdgeXover: +

+ +eoQuadOp< EOType > +eoOp< EOType > +eoBF< EOType &, EOType &, bool > +eoFunctorBase + List of all members. +bool  +void  +void  +void 

Public Member Functions

-bool operator() (Route &__route1, Route &__route2)
operator() (Route &__route1, Route &__route2)

Private Member Functions

-void cross (const Route &__par1, const Route &__par2, Route &__child)
cross (const Route &__par1, const Route &__par2, Route &__child)
-void build_map (const Route &__par1, const Route &__par2)
build_map (const Route &__par1, const Route &__par2)
-void add_vertex (unsigned int __vertex, Route &__child)
add_vertex (unsigned int __vertex, Route &__child)

Private Attributes

@@ -66,10 +72,10 @@ Edge Crossover.

-Definition at line 23 of file edge_xover.h.

The documentation for this class was generated from the following files:
    +Definition at line 48 of file edge_xover.h.
    The documentation for this class was generated from the following files: -
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/class_empty_selection.html b/trunk/paradiseo-mo/doc/html/class_empty_selection.html index 01d0129f7..ab15dd535 100644 --- a/trunk/paradiseo-mo/doc/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/doc/html/class_empty_selection.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: EmptySelection Class Reference + +ParadisEO-MOMovingObjects: EmptySelection Class Reference - +
- - +
-
+

EmptySelection Class Reference

Special class that describes the case of no selection. More...

@@ -45,10 +44,10 @@ 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:
-
+

OrderXover Member List

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

+ + + + + + -
className() const eoQuadOp< EOType > [virtual]
cross(const Route &__par1, const Route &__par2, Route &__child)OrderXover [private]
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
eoQuadOp()eoQuadOp< EOType >
functor_category()eoBF< EOType &, EOType &, bool > [static]
getType() const eoOp< EOType >
operator()(Route &__route1, Route &__route2)OrderXover

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + eoQuadOp::operator()(EOType &, EOType &)=0eoBF< EOType &, EOType &, bool > [pure virtual] + OpType enum nameeoOp< EOType > + ~eoBF()eoBF< EOType &, EOType &, bool > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_order_xover.html b/trunk/paradiseo-mo/doc/html/class_order_xover.html index c7e4617ae..a3f7bdfe7 100644 --- a/trunk/paradiseo-mo/doc/html/class_order_xover.html +++ b/trunk/paradiseo-mo/doc/html/class_order_xover.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: OrderXover Class Reference - +
-
+
-
-

OrderXover Class Reference

Order Crossover. + +

OrderXover Class Reference

Order Crossover. More...

#include <order_xover.h>

+

Inheritance diagram for OrderXover: +

+ +eoQuadOp< EOType > +eoOp< EOType > +eoBF< EOType &, EOType &, bool > +eoFunctorBase + List of all members. +bool  +void 

Public Member Functions

-bool operator() (Route &__route1, Route &__route2)
operator() (Route &__route1, Route &__route2)

Private Member Functions

-void cross (const Route &__par1, const Route &__par2, Route &__child)
cross (const Route &__par1, const Route &__par2, Route &__child)

Detailed Description

@@ -52,10 +58,10 @@ Order Crossover.

-Definition at line 20 of file order_xover.h.

The documentation for this class was generated from the following files:
-
+

PartRouteEval Member List

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

+ + + + -
EOFitT typedefeoEvalFunc< EOT >
EOType typedefeoEvalFunc< EOT >
fromPartRouteEval [private]
functor_category()eoUF< A1, R > [static]
operator()(Route &__route)PartRouteEval
eoEvalFunc::operator()(A1)=0eoUF< A1, R > [pure virtual]
PartRouteEval(float __from, float __to)PartRouteEval
toPartRouteEval [private]

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< A1, R > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_part_route_eval.html b/trunk/paradiseo-mo/doc/html/class_part_route_eval.html index 9cbb0d16a..f6ffb18ef 100644 --- a/trunk/paradiseo-mo/doc/html/class_part_route_eval.html +++ b/trunk/paradiseo-mo/doc/html/class_part_route_eval.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: PartRouteEval Class Reference - +
-
+
-
-

PartRouteEval Class Reference

Route Evaluator. + +

PartRouteEval Class Reference

Route Evaluator. More...

#include <part_route_eval.h>

+

Inheritance diagram for PartRouteEval: +

+ +eoEvalFunc< EOT > +eoUF< A1, R > +eoFunctorBase + List of all members. @@ -44,7 +49,7 @@ +void 

Public Member Functions

 Constructor.
-void operator() (Route &__route)
operator() (Route &__route)

Private Attributes

@@ -59,10 +64,10 @@ Route Evaluator.

-Definition at line 20 of file part_route_eval.h.

The documentation for this class was generated from the following files:
    +Definition at line 45 of file part_route_eval.h.
    The documentation for this class was generated from the following files: -
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html index 0237867ea..e1a85bf51 100644 --- a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init-members.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

PartTwoOptInit Member List

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

+ -
functor_category()eoBF< A1, A2, R > [static]
operator()(TwoOpt &__move, const Route &__route)PartTwoOptInit

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + moMoveInit< TwoOpt >::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html index 43d20724c..c329a31f7 100644 --- a/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_init.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: PartTwoOptInit Class Reference - +
-
+
-
+

PartTwoOptInit Class Reference

It sets the first couple of edges. More...

@@ -39,13 +37,15 @@

Inheritance diagram for PartTwoOptInit:

-moMoveInit< TwoOpt > +moMoveInit< TwoOpt > +eoBF< A1, A2, R > +eoFunctorBase List of all members. +void 

Public Member Functions

-void operator() (TwoOpt &__move, const Route &__route)
operator() (TwoOpt &__move, const Route &__route)

Detailed Description

@@ -53,10 +53,10 @@ It sets the first couple of edges.

-Definition at line 20 of file part_two_opt_init.h.

The documentation for this class was generated from the following files:
-
+

PartTwoOptNext Member List

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

-

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + functor_category()eoBF< A1, A2, R > [static] + moNextMove< TwoOpt >::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html index 43c15c38d..b43fafa42 100644 --- a/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html +++ b/trunk/paradiseo-mo/doc/html/class_part_two_opt_next.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: PartTwoOptNext Class Reference - +
-
+
-
+

PartTwoOptNext Class Reference

It updates a couple of edges. More...

@@ -39,7 +37,9 @@

Inheritance diagram for PartTwoOptNext:

-moNextMove< TwoOpt > +moNextMove< TwoOpt > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -49,10 +49,10 @@ It updates a couple of edges.

-Definition at line 19 of file part_two_opt_next.h.

The documentation for this class was generated from the following file:
- - +
-
+

PartialMappedXover Member List

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

+ + + + + + + + -
className() const eoQuadOp< EOType > [virtual]
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
eoQuadOp()eoQuadOp< EOType >
functor_category()eoBF< EOType &, EOType &, bool > [static]
getType() const eoOp< EOType >
operator()(Route &__route1, Route &__route2)PartialMappedXover
eoQuadOp::operator()(EOType &, EOType &)=0eoBF< EOType &, EOType &, bool > [pure virtual]
OpType enum nameeoOp< EOType >
repair(Route &__route, unsigned __cut1, unsigned __cut2)PartialMappedXover [private]

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + ~eoBF()eoBF< EOType &, EOType &, bool > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html b/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html index 9f24eb0c7..35a7d75f4 100644 --- a/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html +++ b/trunk/paradiseo-mo/doc/html/class_partial_mapped_xover.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: PartialMappedXover Class Reference - +
-
+
-
-

PartialMappedXover Class Reference

Partial Mapped Crossover. + +

PartialMappedXover Class Reference

Partial Mapped Crossover. More...

#include <partial_mapped_xover.h>

+

Inheritance diagram for PartialMappedXover: +

+ +eoQuadOp< EOType > +eoOp< EOType > +eoBF< EOType &, EOType &, bool > +eoFunctorBase + List of all members. +bool  +void 

Public Member Functions

-bool operator() (Route &__route1, Route &__route2)
operator() (Route &__route1, Route &__route2)

Private Member Functions

-void repair (Route &__route, unsigned __cut1, unsigned __cut2)
repair (Route &__route, unsigned __cut1, unsigned __cut2)

Detailed Description

@@ -52,10 +58,10 @@ Partial Mapped Crossover.

-Definition at line 20 of file partial_mapped_xover.h.

The documentation for this class was generated from the following files:
-
+

RouteEval Member List

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

+ + + -
EOFitT typedefeoEvalFunc< EOT >
EOType typedefeoEvalFunc< EOT >
functor_category()eoUF< A1, R > [static]
operator()(Route &__route)RouteEval

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + eoEvalFunc::operator()(A1)=0eoUF< A1, R > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< A1, R > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_route_eval.html b/trunk/paradiseo-mo/doc/html/class_route_eval.html index 0cb37ea1d..b676340bc 100644 --- a/trunk/paradiseo-mo/doc/html/class_route_eval.html +++ b/trunk/paradiseo-mo/doc/html/class_route_eval.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: RouteEval Class Reference - +
-
+
-
-

RouteEval Class Reference

Route Evaluator. + +

RouteEval Class Reference

Route Evaluator. More...

#include <route_eval.h>

+

Inheritance diagram for RouteEval: +

+ +eoEvalFunc< EOT > +eoUF< A1, R > +eoFunctorBase + List of all members. +void 

Public Member Functions

-void operator() (Route &__route)
operator() (Route &__route)

Detailed Description

@@ -48,10 +53,10 @@ Route Evaluator.

-Definition at line 20 of file route_eval.h.

The documentation for this class was generated from the following files:
-
+

RouteInit Member List

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

+ + -
className(void) const eoInit< EOT > [virtual]
functor_category()eoUF< A1, R > [static]
operator()(Route &__route)RouteInit

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + eoInit::operator()(A1)=0eoUF< A1, R > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< A1, R > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_route_init.html b/trunk/paradiseo-mo/doc/html/class_route_init.html index 3a7487bf0..31e2e8854 100644 --- a/trunk/paradiseo-mo/doc/html/class_route_init.html +++ b/trunk/paradiseo-mo/doc/html/class_route_init.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: RouteInit Class Reference - +
-
+
-
-

RouteInit Class Reference

List of all members. + +

RouteInit Class Reference

Inheritance diagram for RouteInit: +

+ +eoInit< EOT > +eoUF< A1, R > +eoFunctorBase + +List of all members.
+void 

Public Member Functions

-void operator() (Route &__route)
operator() (Route &__route)

Detailed Description

@@ -43,10 +48,10 @@ void 19 of file route_init.h.
The documentation for this class was generated from the following files:
-
+

TwoOpt Member List

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

- - + + + - - -
EOType typedefmoMove< Route >
operator!() constTwoOpt
EOType typedefmoMove< EOT >
functor_category()eoUF< EOT &, void > [static]
operator!() const TwoOpt
operator()(Route &__route)TwoOpt
printOn(std::ostream &__os) constTwoOpt
readFrom(std::istream &__is)TwoOpt

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + moMove::operator()(EOT &)=0eoUF< EOT &, void > [pure virtual] + printOn(std::ostream &__os) const TwoOpt [virtual] + readFrom(std::istream &__is)TwoOpt [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoPersistent()eoPersistent [virtual] + ~eoPrintable()eoPrintable [virtual] + ~eoUF()eoUF< EOT &, void > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt.html b/trunk/paradiseo-mo/doc/html/class_two_opt.html index 451cd6c54..fa9dc2ca0 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: TwoOpt Class Reference - +
-
+
-
-

TwoOpt Class Reference

Inheritance diagram for TwoOpt: + +

TwoOpt Class Reference

Inheritance diagram for TwoOpt:

-moMove< Route > +moMove< EOT > +eoPersistent +eoUF< EOT &, void > +eoPrintable +eoFunctorBase List of all members. - + +void  - +

Public Member Functions

-TwoOpt operator! () const
+TwoOpt operator! () const
-void operator() (Route &__route)
operator() (Route &__route)
void readFrom (std::istream &__is)
-void printOn (std::ostream &__os) const
+void printOn (std::ostream &__os) const

Detailed Description

@@ -57,10 +59,10 @@ void 22 of file two_opt.h.
The documentation for this class was generated from the following files:
-
+

TwoOptIncrEval Member List

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

+ -
functor_category()eoBF< A1, A2, R > [static]
operator()(const TwoOpt &__move, const Route &__route)TwoOptIncrEval

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + moMoveIncrEval< TwoOpt >::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html index caeb82faa..a5a60034c 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_incr_eval.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: TwoOptIncrEval Class Reference - +
-
+
-
+

TwoOptIncrEval Class Reference

Inheritance diagram for TwoOptIncrEval:

-moMoveIncrEval< TwoOpt > +moMoveIncrEval< TwoOpt > +eoBF< A1, A2, R > +eoFunctorBase List of all members. +float 

Public Member Functions

-float operator() (const TwoOpt &__move, const Route &__route)
operator() (const TwoOpt &__move, const Route &__route)

Detailed Description

@@ -48,10 +48,10 @@ float 18 of file two_opt_incr_eval.h.
The documentation for this class was generated from the following files:
-
+

TwoOptInit Member List

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

+ -
functor_category()eoBF< A1, A2, R > [static]
operator()(TwoOpt &__move, const Route &__route)TwoOptInit

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + moMoveInit< TwoOpt >::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_init.html b/trunk/paradiseo-mo/doc/html/class_two_opt_init.html index 274805872..eaa748275 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt_init.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_init.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: TwoOptInit Class Reference - +
-
+
-
+

TwoOptInit Class Reference

It sets the first couple of edges. More...

@@ -39,13 +37,15 @@

Inheritance diagram for TwoOptInit:

-moMoveInit< TwoOpt > +moMoveInit< TwoOpt > +eoBF< A1, A2, R > +eoFunctorBase List of all members. +void 

Public Member Functions

-void operator() (TwoOpt &__move, const Route &__route)
operator() (TwoOpt &__move, const Route &__route)

Detailed Description

@@ -53,10 +53,10 @@ It sets the first couple of edges.

-Definition at line 20 of file two_opt_init.h.

The documentation for this class was generated from the following files:
-
+

TwoOptNext Member List

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

+ -
functor_category()eoBF< A1, A2, R > [static]
operator()(TwoOpt &__move, const Route &__route)TwoOptNext

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + moNextMove< TwoOpt >::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_next.html b/trunk/paradiseo-mo/doc/html/class_two_opt_next.html index 1947769e9..1cc0ddc39 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt_next.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_next.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: TwoOptNext Class Reference - +
-
+
-
+

TwoOptNext Class Reference

It updates a couple of edges. More...

@@ -39,13 +37,15 @@

Inheritance diagram for TwoOptNext:

-moNextMove< TwoOpt > +moNextMove< TwoOpt > +eoBF< A1, A2, R > +eoFunctorBase List of all members. +bool 

Public Member Functions

-bool operator() (TwoOpt &__move, const Route &__route)
operator() (TwoOpt &__move, const Route &__route)

Detailed Description

@@ -53,10 +53,10 @@ It updates a couple of edges.

-Definition at line 19 of file two_opt_next.h.

The documentation for this class was generated from the following files:
-
+

TwoOptRand Member List

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

- -
operator()(TwoOpt &__move)TwoOptRand

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + functor_category()eoUF< TwoOpt &, void > [static] + operator()(TwoOpt &__move)TwoOptRand [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< TwoOpt &, void > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html index c679ebf61..fbae56cd3 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: TwoOptRand Class Reference - +
-
+
-
+

TwoOptRand Class Reference

Inheritance diagram for TwoOptRand:

-moRandMove< TwoOpt > +moRandMove< TwoOpt > +eoUF< TwoOpt &, void > +eoFunctorBase List of all members. @@ -48,10 +48,10 @@ void 
19 of file two_opt_rand.h.
The documentation for this class was generated from the following files:
    +Definition at line 44 of file two_opt_rand.h.
    The documentation for this class was generated from the following files: -
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_rand.png b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.png index 9d084fe7c..7f7a65af1 100644 Binary files a/trunk/paradiseo-mo/doc/html/class_two_opt_rand.png and b/trunk/paradiseo-mo/doc/html/class_two_opt_rand.png differ diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list-members.html b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list-members.html index 3b1f7ac10..3317948a6 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list-members.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

TwoOptTabuList Member List

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

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

Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html index c424d0e07..78c4e4630 100644 --- a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.html @@ -1,15 +1,15 @@ - + ParadisEO-MOMovingObjects: TwoOptTabuList Class Reference - +
-
+
-
+

TwoOptTabuList Class Reference

The table of tabu movements, i.e. More...

@@ -39,16 +37,18 @@

Inheritance diagram for TwoOptTabuList:

-moTabuList< TwoOpt > +moTabuList< TwoOpt > +eoBF< A1, A2, R > +eoFunctorBase List of all members. +bool  +void  @@ -69,7 +69,7 @@ forbidden edges

-Definition at line 20 of file two_opt_tabu_list.h.

Member Function Documentation

+Definition at line 45 of file two_opt_tabu_list.h.

Member Function Documentation

@@ -92,9 +92,9 @@ Generally, a counter associated to each saved move is decreased by one.

Implements moTabuList< TwoOpt >.

-Definition at line 46 of file two_opt_tabu_list.cpp. +Definition at line 71 of file two_opt_tabu_list.cpp.

-References tabu_span. +References tabu_span.

@@ -119,15 +119,15 @@ Can be useful if the data structure needs to be allocated before being used.

Implements moTabuList< TwoOpt >.

-Definition at line 17 of file two_opt_tabu_list.cpp. +Definition at line 42 of file two_opt_tabu_list.cpp.

-References Graph::size(), and tabu_span. +References Graph::size(), and tabu_span.

The documentation for this class was generated from the following files: -
Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png index 3f6c82910..923d269f3 100644 Binary files a/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png and b/trunk/paradiseo-mo/doc/html/class_two_opt_tabu_list.png differ diff --git a/trunk/paradiseo-mo/doc/html/classes.html b/trunk/paradiseo-mo/doc/html/classes.html index 74edae18d..44f523cea 100644 --- a/trunk/paradiseo-mo/doc/html/classes.html +++ b/trunk/paradiseo-mo/doc/html/classes.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Alphabetical List + +ParadisEO-MOMovingObjects: Alphabetical List - +

Public Member Functions

-bool operator() (const TwoOpt &__move, const Route &__sol)
operator() (const TwoOpt &__move, const Route &__sol)
-void add (const TwoOpt &__move, const Route &__sol)
add (const TwoOpt &__move, const Route &__sol)
void update ()
- - +
-
-

PARADISEO-MO Class Index

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

+ +

ParadisEO-MOMovingObjects Class Index

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

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

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

-

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +moItRandNextMove   
  R  
+moAlgo   
  L  
+moRandImprSelect   moAspirCrit   moLinearCoolingSchedule   moRandMove   
  B  
+moLSCheckPoint   RouteEval   moBestImprSelect   
  M  
+RouteInit   
  C  
+moMove   
  S  
+CitySwap   moMoveExpl   moSA   moCoolingSchedule   moMoveIncrEval   moSimpleMoveTabuList   
  E  
+moMoveInit   moSimpleSolutionTabuList   EdgeXover   moMoveLoopExpl   moSolContinue   EmptySelection   moMoveSelect   moSteadyFitSolContinue   moExponentialCoolingSchedule   
  N  
+
  T  
+
  F  
+moNextMove   moTabuList   moFirstImprSelect   moNoAspirCrit   moTS   moFitSolContinue   moNoFitImprSolContinue   moTSMoveLoopExpl   
  G  
+
  O  
+TwoOpt   moGenSolContinue   OrderXover   TwoOptIncrEval   
  H  
+
  P  
+TwoOptInit   moHC   PartialMappedXover   TwoOptNext   moHCMoveLoopExpl   PartRouteEval   TwoOptRand   
  I  
+PartTwoOptInit   TwoOptTabuList   moImprBestFitAspirCrit   PartTwoOptNext   

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

+

Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo-members.html b/trunk/paradiseo-mo/doc/html/classmo_algo-members.html index 538e7de45..3a1a842c3 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moAlgo< EOT > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + className() const eoMonOp< EOT > [virtual] + eoMonOp()eoMonOp< EOT > + eoOp(OpType _type)eoOp< EOType > + eoOp(const eoOp &_eop)eoOp< EOType > + functor_category()eoUF< EOT &, bool > [static] + getType() const eoOp< EOType > + operator()(EOT &)=0eoUF< EOT &, bool > [pure virtual] + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< EOT &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_algo.html b/trunk/paradiseo-mo/doc/html/classmo_algo.html index c405ab1a0..7e9bfd156 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_algo.html +++ b/trunk/paradiseo-mo/doc/html/classmo_algo.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moAlgo< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moAlgo< EOT > Class Template Reference - +
-
+
-
+

moAlgo< EOT > Class Template Reference

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

@@ -38,10 +37,10 @@

Inheritance diagram for moAlgo< EOT >:

-eoMonOp< EOT > -eoOp< EOType > -eoUF< EOT &, bool > -eoFunctorBase +eoMonOp< EOT > +eoOp< EOType > +eoUF< EOT &, bool > +eoFunctorBase List of all members. @@ -52,14 +51,14 @@ Description of an algorithm of the paradiseo-mo library.

-moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library. +moHC, moTS and moSA are 3 examples of 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:
- - +
-
+

moAspirCrit< M > Member List

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

- + - - - -
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()=0moAspirCrit< M > [pure virtual]
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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html index 386dc5c56..c4e6414d1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moAspirCrit< M > Class Template Reference + +ParadisEO-MOMovingObjects: moAspirCrit< M > Class Template Reference - +
-
+
-
-

moAspirCrit< M > Class Template Reference

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

moAspirCrit< M > Class Template Reference

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

#include <moAspirCrit.h> @@ -38,10 +37,10 @@

Inheritance diagram for moAspirCrit< M >:

-eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -56,11 +55,11 @@ Description of the conditions in which a tabu move could be accepted.

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

-Definition at line 22 of file moAspirCrit.h.

Member Function Documentation

+Definition at line 47 of file moAspirCrit.h.

Member Function Documentation

@@ -88,8 +87,8 @@ Implemented in moAspirCrit.h -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png index b57b87786..e6cefe1bf 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png and b/trunk/paradiseo-mo/doc/html/classmo_aspir_crit.png differ 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 dda8c3717..af366fdfc 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moBestImprSelect< M > Member List

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

- + - - -
best_fitmoBestImprSelect< M > [private]
best_movemoBestImprSelect< M > [private]
first_timemoBestImprSelect< M > [private]
Fitness typedefmoBestImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
operator()(M &__move, Fitness &__fit)moBestImprSelect< M > [inline, virtual]
update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 acbe3812b..6d54771af 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_best_impr_select.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moBestImprSelect< M > Class Template Reference + +ParadisEO-MOMovingObjects: moBestImprSelect< M > Class Template Reference - +
-
+
-
-

moBestImprSelect< M > Class Template Reference

One of the possible moMoveSelect. + +

moBestImprSelect< M > Class Template Reference

One of the possible moMoveSelect. More...

#include <moBestImprSelect.h> @@ -39,8 +38,8 @@

moMoveSelect< M > -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -56,7 +55,7 @@ void  - + @@ -78,13 +77,13 @@ M 
 Procedure which initialise the exploration.
bool update (const M &__move, const Fitness &__fit)
 Function that indicates if the current move has not improved the fitness.
 Function that indicates if the current move has not improved the fitness.
void operator() (M &__move, Fitness &__fit) throw (EmptySelection)
 Procedure which saved the best move and fitness.
moMoveSelect. +One of the possible moMoveSelect.

All neighbors are considered, and the movement which enables the best improvement is selected.

-Definition at line 22 of file moBestImprSelect.h.

Member Function Documentation

+Definition at line 47 of file moBestImprSelect.h.

Member Function Documentation

@@ -113,23 +112,23 @@ template<class M>

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

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

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

Parameters:
__move a move.
__fit a fitness linked to the move.
-
Returns:
TRUE if the move does not improve the fitness.
+
Returns:
TRUE if the move does not improve the fitness.

Implements moMoveSelect< M >.

-Definition at line 47 of file moBestImprSelect.h. +Definition at line 72 of file moBestImprSelect.h.

-References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. +References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.

@@ -170,22 +169,22 @@ Procedure which saved the best move and fitness.

Exceptions:
- +
EmptySelection if no move has improved the fitness.
EmptySelection if no move has improved the fitness.

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

-Definition at line 68 of file moBestImprSelect.h. +Definition at line 93 of file moBestImprSelect.h.

-References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. +References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 65d3780ef..c103f8b1c 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moCoolingSchedule Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoUF< double &, bool > [static] + operator()(double &)=0eoUF< double &, bool > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html index 1afecba9a..2812f4296 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_cooling_schedule.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moCoolingSchedule Class Reference + +ParadisEO-MOMovingObjects: moCoolingSchedule Class Reference - +
-
+
-
+

moCoolingSchedule Class Reference

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

@@ -38,8 +37,8 @@

Inheritance diagram for moCoolingSchedule:

-eoUF< double &, bool > -eoFunctorBase +eoUF< double &, bool > +eoFunctorBase moExponentialCoolingSchedule moLinearCoolingSchedule @@ -49,14 +48,14 @@

Detailed Description

This class gives the description of a cooling schedule.

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

-Definition at line 22 of file moCoolingSchedule.h.

The documentation for this class was generated from the following file:
-
+

moExponentialCoolingSchedule Member List

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

- + - - -
functor_category()eoUF< double &, bool > [static]
functor_category()eoUF< double &, bool > [static]
moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
operator()(double &__temp)moExponentialCoolingSchedule [inline, virtual]
ratiomoExponentialCoolingSchedule [private]
thresholdmoExponentialCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 5d7a212d3..b950dcfff 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_exponential_cooling_schedule.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moExponentialCoolingSchedule Class Reference + +ParadisEO-MOMovingObjects: moExponentialCoolingSchedule Class Reference - +
-
+
-
-

moExponentialCoolingSchedule Class Reference

One of the possible moCoolingSchedule. + +

moExponentialCoolingSchedule Class Reference

One of the possible moCoolingSchedule. More...

#include <moExponentialCoolingSchedule.h> @@ -39,8 +38,8 @@

moCoolingSchedule -eoUF< double &, bool > -eoFunctorBase +eoUF< double &, bool > +eoFunctorBase List of all members. @@ -50,7 +49,7 @@ - + @@ -62,13 +61,13 @@ double 
 Simple constructor.
bool operator() (double &__temp)
 Function which proceeds to the cooling.
 Function which proceeds to the cooling.

Private Attributes

double threshold
 The decreasing factor of the temperature.

Detailed Description

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

An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.

-Definition at line 22 of file moExponentialCoolingSchedule.h.

Constructor & Destructor Documentation

+Definition at line 47 of file moExponentialCoolingSchedule.h.

Constructor & Destructor Documentation

@@ -105,7 +104,7 @@ Simple constructor.

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

Member Function Documentation

@@ -126,7 +125,7 @@ Definition at line

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

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

Parameters:
@@ -134,20 +133,20 @@ It decreases the temperature and indicates if it is greater than the threshold.< __temp the current temperature.
-
Returns:
if the new temperature (current temperature * ratio) is greater than the threshold.
+
Returns:
if the new temperature (current temperature * ratio) is greater than the threshold.

-Implements eoUF< double &, bool >. +Implements eoUF< double &, bool >.

-Definition at line 41 of file moExponentialCoolingSchedule.h. +Definition at line 66 of file moExponentialCoolingSchedule.h.

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

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 87e9465a1..b03e54e7a 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moFirstImprSelect< M > Member List

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

- + - - -
best_fitmoFirstImprSelect< M > [private]
best_movemoFirstImprSelect< M > [private]
Fitness typedefmoFirstImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moFirstImprSelect< M > [inline, virtual]
init_fitmoFirstImprSelect< M > [private]
operator()(M &__move, Fitness &__fit)moFirstImprSelect< M > [inline, virtual]
update(const M &__move, const typename M::EOType::Fitness &__fit)moFirstImprSelect< M > [inline]
moMoveSelect::update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
validmoFirstImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 4e82a87ac..f13ab78ec 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_first_impr_select.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moFirstImprSelect< M > Class Template Reference + +ParadisEO-MOMovingObjects: moFirstImprSelect< M > Class Template Reference - +
-
+
-
-

moFirstImprSelect< M > Class Template Reference

One possible moMoveSelect. + +

moFirstImprSelect< M > Class Template Reference

One possible moMoveSelect. More...

#include <moFirstImprSelect.h> @@ -39,8 +38,8 @@

moMoveSelect< M > -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -55,7 +54,7 @@ typedef M::EOType::Fitness  - + @@ -81,13 +80,13 @@ M 
 Procedure which initialise the exploration.
bool update (const M &__move, const typename M::EOType::Fitness &__fit)
 Function that indicates if the current move has not improved the fitness.
 Function that indicates if the current move has not improved the fitness.
void operator() (M &__move, Fitness &__fit) throw (EmptySelection)
 Procedure which saved the best move and fitness.
moMoveSelect. +One possible moMoveSelect.

The neighborhood is explored until a move enables an improvment of the current solution.

-Definition at line 23 of file moFirstImprSelect.h.

Member Function Documentation

+Definition at line 48 of file moFirstImprSelect.h.

Member Function Documentation

@@ -113,9 +112,9 @@ It save the current fitness as the initial value for the fitness.

Implements moMoveSelect< M >.

-Definition at line 35 of file moFirstImprSelect.h. +Definition at line 60 of file moFirstImprSelect.h.

-References moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. +References moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid.

@@ -146,21 +145,21 @@ template<class M>

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

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

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

Parameters:
__move a move.
__fit a fitness linked to the move.
-
Returns:
TRUE if the move does not improve the fitness.
+
Returns:
TRUE if the move does not improve the fitness.

-Definition at line 52 of file moFirstImprSelect.h. +Definition at line 77 of file moFirstImprSelect.h.

-References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. +References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid.

@@ -201,22 +200,22 @@ Procedure which saved the best move and fitness.

Exceptions:
- +
EmptySelection if no move has improved the fitness.
EmptySelection if no move has improved the fitness.

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

-Definition at line 76 of file moFirstImprSelect.h. +Definition at line 101 of file moFirstImprSelect.h.

-References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, and moFirstImprSelect< M >::valid. +References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, and moFirstImprSelect< M >::valid.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 index 7ec9df149..41c7709a0 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: 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]
functor_category()eoUF< const EOT &, bool > [static]
init()moFitSolContinue< EOT > [inline, virtual]
moFitSolContinue(Fitness __fitness)moFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moFitSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html index 82c78e27e..959dc22a1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_fit_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moFitSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moFitSolContinue< EOT > Class Template Reference - +
-
+
-
+

moFitSolContinue< EOT > Class Template Reference

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

@@ -39,8 +38,8 @@

moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -55,7 +54,7 @@ typedef EOT::Fitness  - + @@ -75,7 +74,7 @@ The stop criterion corresponds to a fitness threshold gained.

-Definition at line 21 of file moFitSolContinue.h.

Constructor & Destructor Documentation

+Definition at line 46 of file moFitSolContinue.h.

Constructor & Destructor Documentation

@@ -104,7 +103,7 @@ Basic constructor.

-Definition at line 33 of file moFitSolContinue.h. +Definition at line 58 of file moFitSolContinue.h.

Member Function Documentation

@@ -127,7 +126,7 @@ template<class EOT>

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

Indicates if the fitness threshold has not yet been reached.

Parameters:
@@ -135,14 +134,14 @@ Indicates if the fitness threshold has not yet been reached.

 Basic constructor.
bool operator() (const EOT &__sol)
 Function that activates the stopping criterion.
 Function that activates the stopping criterion.
void init ()
 Procedure which allows to initialise all the stuff needed.
__sol the current solution.
-
Returns:
true or false according to the value of the fitness.
+
Returns:
true or false according to the value of the fitness.

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

-Definition at line 43 of file moFitSolContinue.h. +Definition at line 68 of file moFitSolContinue.h.

-References moFitSolContinue< EOT >::fitness. +References moFitSolContinue< EOT >::fitness.

@@ -169,13 +168,13 @@ It can be also used to reinitialize all the needed things.

Implements moSolContinue< EOT >.

-Definition at line 57 of file moFitSolContinue.h. +Definition at line 82 of file moFitSolContinue.h.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 44505edd0..f6b39fdb3 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moGenSolContinue< EOT > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 1d892269d..71874ed31 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_gen_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moGenSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moGenSolContinue< EOT > Class Template Reference - +
-
+
-
+

moGenSolContinue< EOT > Class Template Reference

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

@@ -39,8 +38,8 @@

moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -50,7 +49,7 @@ - + @@ -74,7 +73,7 @@ The stop criterion corresponds to a maximum number of iteration.

-Definition at line 21 of file moGenSolContinue.h.

Constructor & Destructor Documentation

+Definition at line 46 of file moGenSolContinue.h.

Constructor & Destructor Documentation

@@ -103,7 +102,7 @@ Simple constructor.

-Definition at line 30 of file moGenSolContinue.h. +Definition at line 55 of file moGenSolContinue.h.

Member Function Documentation

@@ -126,7 +125,7 @@ template<class EOT>

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

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

Parameters:
@@ -134,14 +133,14 @@ Increments the counter and returns TRUE if the current number of iteration is lo
 Simple constructor.
bool operator() (const EOT &__sol)
 Function that activates the stop criterion.
 Function that activates the stop criterion.
void init ()
 Procedure which allows to initialise the generation counter.
__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 >. +Implements eoUF< const EOT &, bool >.

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

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

@@ -168,15 +167,15 @@ It can also be used to reset the iteration counter.

Implements moSolContinue< EOT >.

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

-References moGenSolContinue< EOT >::numGen. +References moGenSolContinue< EOT >::numGen.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 620330c4a..8901b4611 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moHC< M > Member List

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

- - - - - + + + + - - - + + - - - - - - -
binaryeoOp< EOType >
className() consteoMonOp< M::EOType > [virtual]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
className() const eoMonOp< M::EOType > [virtual]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoHC< M > [private]
Fitness typedefmoHC< M > [private]
full_evalmoHC< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
generaleoOp< EOType >
getType() consteoOp< EOType >
functor_category()eoUF< M::EOType &, bool > [static]
getType() const eoOp< EOType >
moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
move_explmoHC< M > [private]
operator()(EOT &__sol)moHC< M > [inline, virtual]
OpType enum nameeoOp< EOType >
quadraticeoOp< EOType >
unaryeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_h_c.html b/trunk/paradiseo-mo/doc/html/classmo_h_c.html index 6b34208c4..846415de6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/doc/html/classmo_h_c.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moHC< M > Class Template Reference + +ParadisEO-MOMovingObjects: moHC< M > Class Template Reference - +
-
+
-
+

moHC< M > Class Template Reference

Hill Climbing (HC). More...

@@ -39,23 +38,23 @@

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

Public Member Functions

 moHC (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
 moHC (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)
 Full constructor.
 moHC (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)
 moHC (moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)
 Light constructor.
bool operator() (EOT &__sol)
 Function which launches the HC.
 Function which launches the HC.

Private Types

typedef M::EOType EOT
 Complete exploration of the neighborhood.
-eoEvalFunc< EOT > & full_eval
full_eval
 A full evaluation function.
@@ -85,7 +84,7 @@ Class which describes the algorithm for a hill climbing.

-Definition at line 25 of file moHC.h.

Constructor & Destructor Documentation

+Definition at line 50 of file moHC.h.

Constructor & Destructor Documentation

@@ -119,7 +118,7 @@ template<class M>
- eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -134,7 +133,7 @@ template<class M>

Full constructor.

-All the boxes are given in order the HC to use a moHCMoveLoopExpl.

+All the boxes are given in order the HC to use a moHCMoveLoopExpl.

Parameters:
@@ -146,7 +145,7 @@ All the boxes are given in order the HC to use a 52 of file moHC.h. +Definition at line 77 of file moHC.h.

@@ -164,7 +163,7 @@ template<class M>

- + @@ -179,7 +178,7 @@ template<class M>

Light constructor.

-This constructor allow to use another moMoveExpl (generally not a moHCMoveLoopExpl).

+This constructor allow to use another moMoveExpl (generally not a moHCMoveLoopExpl).

Parameters:
__move_init a move initialiser.
eoEvalFunc< EOT > & eoEvalFunc< EOT > &  __full_eval 
@@ -188,7 +187,7 @@ This constructor allow to use another 66 of file moHC.h. +Definition at line 91 of file moHC.h.

Member Function Documentation

@@ -211,28 +210,28 @@ template<class M>

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

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

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

Parameters:
__move_expl a complete explorer.
__sol a current solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.

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

-Definition at line 81 of file moHC.h. +Definition at line 106 of file moHC.h.

-References moHC< M >::full_eval, and moHC< M >::move_expl. +References moHC< M >::full_eval, and moHC< M >::move_expl.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 fffa123ef..44cc45bea 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moHCMoveLoopExpl< M > Member List

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

- + - - -
EOT typedefmoHCMoveLoopExpl< M > [private]
Fitness typedefmoHCMoveLoopExpl< M > [private]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
incr_evalmoHCMoveLoopExpl< M > [private]
moHCMoveLoopExpl(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select)moHCMoveLoopExpl< M > [inline]
move_initmoHCMoveLoopExpl< M > [private]
move_selectmoHCMoveLoopExpl< M > [private]
next_movemoHCMoveLoopExpl< M > [private]
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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 fe4bbebb8..46f1d0fa9 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moHCMoveLoopExpl< M > Class Template Reference + +ParadisEO-MOMovingObjects: moHCMoveLoopExpl< M > Class Template Reference - +
-
+
-
-

moHCMoveLoopExpl< M > Class Template Reference

Iterative explorer used by a moHC. + +

moHCMoveLoopExpl< M > Class Template Reference

Iterative explorer used by a moHC. More...

#include <moHCMoveLoopExpl.h> @@ -40,8 +39,8 @@ moMoveLoopExpl< M > moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase List of all members. @@ -83,11 +82,11 @@ typedef M::EOType::Fitness 
template<class M>
class moHCMoveLoopExpl< M > -Iterative explorer used by a moHC. +Iterative explorer used by a moHC.

-Definition at line 23 of file moHCMoveLoopExpl.h.

Constructor & Destructor Documentation

+Definition at line 48 of file moHCMoveLoopExpl.h.

Constructor & Destructor Documentation

@@ -141,7 +140,7 @@ All the boxes have to be specified.

-Definition at line 43 of file moHCMoveLoopExpl.h. +Definition at line 68 of file moHCMoveLoopExpl.h.

Member Function Documentation

@@ -184,17 +183,17 @@ The exploration starts from an old solution and provides a new solution.

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

-Definition at line 59 of file moHCMoveLoopExpl.h. +Definition at line 84 of file moHCMoveLoopExpl.h.

-References moHCMoveLoopExpl< M >::incr_eval, moHCMoveLoopExpl< M >::move_init, moHCMoveLoopExpl< M >::move_select, and moHCMoveLoopExpl< M >::next_move. +References moHCMoveLoopExpl< M >::incr_eval, moHCMoveLoopExpl< M >::move_init, moHCMoveLoopExpl< M >::move_select, and moHCMoveLoopExpl< M >::next_move.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 be4e89168..92fc0dc33 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +

-
+

moImprBestFitAspirCrit< M > Member List

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

- + - - - -
best_fitmoImprBestFitAspirCrit< M > [private]
first_timemoImprBestFitAspirCrit< M > [private]
Fitness typedefmoImprBestFitAspirCrit< M >
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moImprBestFitAspirCrit< M > [inline, virtual]
moImprBestFitAspirCrit()moImprBestFitAspirCrit< M > [inline]
operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline] + moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 6f670a27f..0f701ea76 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moImprBestFitAspirCrit< M > Class Template Reference + +ParadisEO-MOMovingObjects: moImprBestFitAspirCrit< M > Class Template Reference - +
-
+
-
-

moImprBestFitAspirCrit< M > Class Template Reference

One of the possible moAspirCrit. + +

moImprBestFitAspirCrit< M > Class Template Reference

One of the possible moAspirCrit. More...

#include <moImprBestFitAspirCrit.h> @@ -38,9 +37,9 @@

Inheritance diagram for moImprBestFitAspirCrit< M >:

-moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -60,7 +59,7 @@ void  - + @@ -75,13 +74,13 @@ bool  - +
 Initialisation procedure.
bool operator() (const M &__move, const Fitness &__fit)
 Function that indicates if the fit is better that the already saved fit.
 Function that indicates if the fit is better that the already saved fit.

Private Attributes

Fitness best_fit
moAspirCrit. +One of the possible moAspirCrit.

This criterion is satisfied when a given fitness is the best ever considered.

-Definition at line 22 of file moImprBestFitAspirCrit.h.

Member Function Documentation

+Definition at line 47 of file moImprBestFitAspirCrit.h.

Member Function Documentation

@@ -103,14 +102,14 @@ template<class M>
) [inline, virtual] [inline]

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

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

Parameters:
@@ -119,20 +118,18 @@ The first time, the function only saved the current move and fitness.

__fit a fitnes linked to the move.

-
Returns:
TRUE the first time and if __fit > best_fit, else FALSE.
+
Returns:
TRUE the first time and if __fit > best_fit, else FALSE.

-Implements eoBF< const M &, const M::EOType::Fitness &, bool >. +Definition at line 77 of file moImprBestFitAspirCrit.h.

-Definition at line 52 of file moImprBestFitAspirCrit.h. -

-References moImprBestFitAspirCrit< M >::best_fit, and moImprBestFitAspirCrit< M >::first_time. +References moImprBestFitAspirCrit< M >::best_fit, and moImprBestFitAspirCrit< M >::first_time.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png index 9cb9fec17..76e0473f0 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png and b/trunk/paradiseo-mo/doc/html/classmo_impr_best_fit_aspir_crit.png differ 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 65c9affff..2bfe06b6b 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moItRandNextMove< M > Member List

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

- + - + + - - -
EOT typedefmoItRandNextMove< M > [private]
functor_category()eoBF< M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
max_itermoItRandNextMove< M > [private]
moItRandNextMove(moRandMove< M > &__rand_move, unsigned int __max_iter)moItRandNextMove< M > [inline]
num_itermoItRandNextMove< M > [private]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline, virtual]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
moNextMove::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
rand_movemoItRandNextMove< M > [private]
~eoBF()eoBF< M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 745bdbaf2..7d63713d7 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moItRandNextMove< M > Class Template Reference + +ParadisEO-MOMovingObjects: moItRandNextMove< M > Class Template Reference - +
-
+
-
-

moItRandNextMove< M > Class Template Reference

One of the possible moNextMove. + +

moItRandNextMove< M > Class Template Reference

One of the possible moNextMove. More...

#include <moItRandNextMove.h> @@ -38,9 +37,9 @@

Inheritance diagram for moItRandNextMove< M >:

-moNextMove< M > -eoBF< M &, const M::EOType &, bool > -eoFunctorBase +moNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -74,13 +73,13 @@ unsigned int 
template<class M>
class moItRandNextMove< M > -One of the possible moNextMove. +One of the possible moNextMove.

-This class is a move (moMove) generator with a bound for the maximum number of iterations. +This class is a move (moMove) generator with a bound for the maximum number of iterations.

-Definition at line 22 of file moItRandNextMove.h.

Constructor & Destructor Documentation

+Definition at line 47 of file moItRandNextMove.h.

Constructor & Destructor Documentation

@@ -111,7 +110,7 @@ template<class M>

The constructor.

-Parameters only for initialising the attributes.

+Parameters only for initialising the attributes.

Parameters:
@@ -120,7 +119,7 @@ The constructor.

-Definition at line 37 of file moItRandNextMove.h. +Definition at line 62 of file moItRandNextMove.h.

Member Function Documentation

@@ -145,7 +144,7 @@ template<class M> - +
__rand_move the random move generator.
) [inline, virtual] [inline]
@@ -161,20 +160,18 @@ If the maximum number is not already reached, the current move is forgotten and
__sol the current solution.
-
Returns:
FALSE if the maximum number of iteration is reached, else TRUE.
+
Returns:
FALSE if the maximum number of iteration is reached, else TRUE.

-Implements eoBF< M &, const M::EOType &, bool >. +Definition at line 77 of file moItRandNextMove.h.

-Definition at line 52 of file moItRandNextMove.h. -

-References moItRandNextMove< M >::max_iter, moItRandNextMove< M >::num_iter, and moItRandNextMove< M >::rand_move. +References moItRandNextMove< M >::max_iter, moItRandNextMove< M >::num_iter, and moItRandNextMove< M >::rand_move.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png index 52d789f14..3ec8c9761 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png and b/trunk/paradiseo-mo/doc/html/classmo_it_rand_next_move.png differ 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 4088776a2..b6562dd49 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moLSCheckPoint< M > Member List

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

- + - - - -
add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline]
funcmoLSCheckPoint< M > [private]
functor_category()eoBF< const M &, const M::EOType &, void > [static]
functor_category()eoBF< A1, A2, R > [static]
operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline]
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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + eoBF::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 6ca6a8fe4..d7eeb161f 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moLSCheckPoint< M > Class Template Reference + +ParadisEO-MOMovingObjects: moLSCheckPoint< M > Class Template Reference - +
-
+
-
-

moLSCheckPoint< M > Class Template Reference

Class which allows a checkpointing system. + +

moLSCheckPoint< M > Class Template Reference

Class which allows a checkpointing system. More...

#include <moLSCheckPoint.h> @@ -38,21 +37,21 @@

Inheritance diagram for moLSCheckPoint< M >:

-eoBF< const M &, const M::EOType &, void > -eoFunctorBase +eoBF< A1, A2, R > +eoFunctorBase List of all members. - - + + @@ -68,7 +67,7 @@ Thanks to this class, at each iteration, additionnal function can be used (and n

-Definition at line 21 of file moLSCheckPoint.h.

Member Function Documentation

+Definition at line 46 of file moLSCheckPoint.h.

Member Function Documentation

@@ -97,7 +96,7 @@ template<class M>

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

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

Parameters:
@@ -108,9 +107,9 @@ Each saved function is used on the current move and the current solution.

-Definition at line 34 of file moLSCheckPoint.h. +Definition at line 59 of file moLSCheckPoint.h.

-References moLSCheckPoint< M >::func. +References moLSCheckPoint< M >::func.

@@ -122,7 +121,7 @@ template<class M>

- + @@ -141,15 +140,15 @@ The new function is added at the end of the vector.
Parameter

-Definition at line 49 of file moLSCheckPoint.h. +Definition at line 74 of file moLSCheckPoint.h.

-References moLSCheckPoint< M >::func. +References moLSCheckPoint< M >::func.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.png b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.png index 53ebc48e8..1e121e05e 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.png and b/trunk/paradiseo-mo/doc/html/classmo_l_s_check_point.png differ 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 013ee3d75..86ed1030a 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +

Public Member Functions

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

Private Attributes

-std::vector< eoBF< const M &,
+std::vector< eoBF< const M &,
const typename M::EOType &,
void > * > 		func
void moLSCheckPoint< M >::add (eoBF< const M &, const typename M::EOType &, void > & eoBF< const M &, const typename M::EOType &, void > &  __f  )  [inline]
- - +
-
+

moLinearCoolingSchedule Member List

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

- + - - -
functor_category()eoUF< double &, bool > [static]
functor_category()eoUF< double &, bool > [static]
moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
operator()(double &__temp)moLinearCoolingSchedule [inline, virtual]
quantitymoLinearCoolingSchedule [private]
thresholdmoLinearCoolingSchedule [private]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< double &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 a6fc88319..b83e92929 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moLinearCoolingSchedule Class Reference + +ParadisEO-MOMovingObjects: moLinearCoolingSchedule Class Reference - +
-
+
-
-

moLinearCoolingSchedule Class Reference

One of the possible moCoolingSchedule. + +

moLinearCoolingSchedule Class Reference

One of the possible moCoolingSchedule. More...

#include <moLinearCoolingSchedule.h> @@ -39,8 +38,8 @@

moCoolingSchedule -eoUF< double &, bool > -eoFunctorBase +eoUF< double &, bool > +eoFunctorBase List of all members. @@ -50,7 +49,7 @@ - + @@ -62,13 +61,13 @@ double 
 Simple constructor.
bool operator() (double &__temp)
 Function which proceeds to the cooling.
 Function which proceeds to the cooling.

Private Attributes

double threshold
 The quantity that allows the temperature to decrease.

Detailed Description

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

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

-Definition at line 22 of file moLinearCoolingSchedule.h.

Constructor & Destructor Documentation

+Definition at line 47 of file moLinearCoolingSchedule.h.

Constructor & Destructor Documentation

@@ -105,7 +104,7 @@ Simple constructor.

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

Member Function Documentation

@@ -126,7 +125,7 @@ Definition at line

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

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

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

-Implements eoUF< double &, bool >. +Implements eoUF< double &, bool >.

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

-References quantity, and threshold. +References quantity, and threshold.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png index 51f125753..064f41e2d 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png and b/trunk/paradiseo-mo/doc/html/classmo_linear_cooling_schedule.png differ diff --git a/trunk/paradiseo-mo/doc/html/classmo_move-members.html b/trunk/paradiseo-mo/doc/html/classmo_move-members.html index 23bc769c6..2648afd0a 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moMove< EOT > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoUF< EOT &, void > [static] + operator()(EOT &)=0eoUF< EOT &, void > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< EOT &, void > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move.html b/trunk/paradiseo-mo/doc/html/classmo_move.html index 304b9eef2..d802bffe3 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moMove< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moMove< EOT > Class Template Reference - +
-
+
-
+

moMove< EOT > Class Template Reference

Definition of a move. More...

@@ -38,8 +37,9 @@

Inheritance diagram for moMove< EOT >:

-eoUF< EOT &, void > -eoFunctorBase +eoUF< EOT &, void > +eoFunctorBase +TwoOpt List of all members. @@ -59,10 +59,10 @@ 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:
    +Definition at line 48 of file moMove.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move.png b/trunk/paradiseo-mo/doc/html/classmo_move.png index c363ebdaf..8fec37472 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_move.png and b/trunk/paradiseo-mo/doc/html/classmo_move.png differ 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 69096e813..1657d7fa4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moMoveExpl< M > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoBF< const M::EOType &, M::EOType &, void > [static] + operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual] + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html index 05bc51f84..cd53edbc4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_expl.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moMoveExpl< M > Class Template Reference + +ParadisEO-MOMovingObjects: moMoveExpl< M > Class Template Reference - +
-
+
-
-

moMoveExpl< M > Class Template Reference

Description of a move (moMove) explorer. + +

moMoveExpl< M > Class Template Reference

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

#include <moMoveExpl.h> @@ -38,8 +37,8 @@

Inheritance diagram for moMoveExpl< M >:

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

template<class M>
class moMoveExpl< M >

-Description of a move (moMove) explorer. +Description of a move (moMove) explorer.

-Only a description...See moMoveLoopExpl. +Only a description...See moMoveLoopExpl.

-Definition at line 21 of file moMoveExpl.h.

The documentation for this class was generated from the following file:
    +Definition at line 46 of file moMoveExpl.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 978d40b46..2b92b6694 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
    -
    +
-
+

moMoveIncrEval< M > Member List

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

- - - - -
functor_category()eoBF< const M &, const M::EOType &, M::EOType::Fitness > [static]
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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoBF< A1, A2, R > [static] + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 137baa011..0d997921f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moMoveIncrEval< M > Class Template Reference + +ParadisEO-MOMovingObjects: moMoveIncrEval< M > Class Template Reference - +
-
+
-
-

moMoveIncrEval< M > Class Template Reference

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

moMoveIncrEval< M > Class Template Reference

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

#include <moMoveIncrEval.h> @@ -38,8 +37,8 @@

Inheritance diagram for moMoveIncrEval< M >:

-eoBF< const M &, const M::EOType &, M::EOType::Fitness > -eoFunctorBase +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -54,10 +53,10 @@ 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:
    +Definition at line 49 of file moMoveIncrEval.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.png b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.png index 1739a986a..1a63407f8 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.png and b/trunk/paradiseo-mo/doc/html/classmo_move_incr_eval.png differ 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 bbf4c4cb2..a44086358 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moMoveInit< M > Member List

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

- - - - -
functor_category()eoBF< M &, const M::EOType &, void > [static]
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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoBF< A1, A2, R > [static] + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init.html b/trunk/paradiseo-mo/doc/html/classmo_move_init.html index 6706af5ec..58cbf03d4 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_init.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moMoveInit< M > Class Template Reference + +ParadisEO-MOMovingObjects: moMoveInit< M > Class Template Reference - +
-
+
-
-

moMoveInit< M > Class Template Reference

Move (moMove) initializer. + +

moMoveInit< M > Class Template Reference

Move (moMove) initializer. More...

#include <moMoveInit.h> @@ -38,8 +37,8 @@

Inheritance diagram for moMoveInit< M >:

-eoBF< M &, const M::EOType &, void > -eoFunctorBase +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -48,16 +47,16 @@

template<class M>
class moMoveInit< M >

-Move (moMove) initializer. +Move (moMove) initializer.

Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used.

-Definition at line 22 of file moMoveInit.h.

The documentation for this class was generated from the following file:
    +Definition at line 47 of file moMoveInit.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_init.png b/trunk/paradiseo-mo/doc/html/classmo_move_init.png index 88094e4c9..df2d15f95 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_move_init.png and b/trunk/paradiseo-mo/doc/html/classmo_move_init.png differ 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 022f2c136..4eedbc642 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moMoveLoopExpl< M > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoBF< const M::EOType &, M::EOType &, void > [static] + operator()(const M::EOType &, M::EOType &)=0eoBF< const M::EOType &, M::EOType &, void > [pure virtual] + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 3d903a7dc..e5bdcdf6d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_loop_expl.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moMoveLoopExpl< M > Class Template Reference + +ParadisEO-MOMovingObjects: moMoveLoopExpl< M > Class Template Reference - +
-
+
-
+

moMoveLoopExpl< M > Class Template Reference

Class which describes an iterative explorer. More...

@@ -39,8 +38,8 @@

moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase moHCMoveLoopExpl< M > moTSMoveLoopExpl< M > @@ -53,14 +52,14 @@ Class which describes an iterative explorer.

-Only a description... moHCMoveLoopExpl and moTSMoveLoopExpl are exemples of class that are a moMoveLoopExpl. +Only a description... moHCMoveLoopExpl and moTSMoveLoopExpl are exemples of class that are a moMoveLoopExpl.

-Definition at line 21 of file moMoveLoopExpl.h.

The documentation for this class was generated from the following file:
    +Definition at line 46 of file moMoveLoopExpl.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 6583d9663..11c54953d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
    -
    +
-
+

moMoveSelect< M > Member List

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

- + - + - - -
Fitness typedefmoMoveSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
operator()(M &, M::EOType::Fitness &)=0eoBF< M &, M::EOType::Fitness &, void > [pure virtual]
operator()(M &, M::EOType::Fitness &)=0eoBF< M &, M::EOType::Fitness &, void > [pure virtual]
update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_move_select.html b/trunk/paradiseo-mo/doc/html/classmo_move_select.html index ddcb70454..afaaebd9d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_move_select.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moMoveSelect< M > Class Template Reference + +ParadisEO-MOMovingObjects: moMoveSelect< M > Class Template Reference - +
-
+
-
-

moMoveSelect< M > Class Template Reference

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

moMoveSelect< M > Class Template Reference

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

#include <moMoveSelect.h> @@ -38,8 +37,8 @@

Inheritance diagram for moMoveSelect< M >:

-eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase moBestImprSelect< M > moFirstImprSelect< M > moRandImprSelect< M > @@ -57,19 +56,19 @@ typedef M::EOType::Fitness  Procedure which initialises all that the move selector needs including the initial fitness.
virtual bool update (const M &__move, const Fitness &__fit)=0 - Function which updates the best solutions.
+ Function which updates the best solutions.

Detailed Description

template<class M>
class moMoveSelect< M >

-Class that describes a move selector (moMove). +Class that describes a move selector (moMove).

-It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. +It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.

-Definition at line 32 of file moMoveSelect.h.

Member Function Documentation

+Definition at line 57 of file moMoveSelect.h.

Member Function Documentation

@@ -130,7 +129,7 @@ template<class M>

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

Parameters:
@@ -138,7 +137,7 @@ template<class M>
__fit a fitness linked to the new move.
-
Returns:
a boolean that expresses the need to resume the exploration.
+
Returns:
a boolean that expresses the need to resume the exploration.

Implemented in moBestImprSelect< M >, and moRandImprSelect< M >. @@ -146,8 +145,8 @@ Implemented in moMoveSelect.h -

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 e73171c9f..0b9cd8ffd 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moNextMove< M > Member List

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

- - - - -
functor_category()eoBF< M &, const M::EOType &, bool > [static]
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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoBF< A1, A2, R > [static] + operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.html b/trunk/paradiseo-mo/doc/html/classmo_next_move.html index 3dcb1b522..cd7ff3cda 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_next_move.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moNextMove< M > Class Template Reference + +ParadisEO-MOMovingObjects: moNextMove< M > Class Template Reference - +
-
+
-
-

moNextMove< M > Class Template Reference

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

moNextMove< M > Class Template Reference

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

#include <moNextMove.h> @@ -38,9 +37,9 @@

Inheritance diagram for moNextMove< M >:

-eoBF< M &, const M::EOType &, bool > -eoFunctorBase -moItRandNextMove< M > +eoBF< A1, A2, R > +eoFunctorBase +moItRandNextMove< M > List of all members. @@ -49,16 +48,16 @@

template<class M>
class moNextMove< M >

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

-Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used. +Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used.

-Definition at line 22 of file moNextMove.h.

The documentation for this class was generated from the following file:
    +Definition at line 47 of file moNextMove.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_next_move.png b/trunk/paradiseo-mo/doc/html/classmo_next_move.png index f0527341d..2021f9a10 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_next_move.png and b/trunk/paradiseo-mo/doc/html/classmo_next_move.png differ 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 38080dde4..8cd96b5c7 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moNoAspirCrit< M > Member List

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

- + - - - -
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moNoAspirCrit< M > [inline, private, virtual]
operator()(const M &__move, const typename M::EOType::Fitness &__sol)moNoAspirCrit< M > [inline, private]
moAspirCrit::operator()(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 Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual] + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 d08224191..7ad82a4e1 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moNoAspirCrit< M > Class Template Reference + +ParadisEO-MOMovingObjects: moNoAspirCrit< M > Class Template Reference - +
-
+
-
-

moNoAspirCrit< M > Class Template Reference

One of the possible aspiration criterion (moAspirCrit). + +

moNoAspirCrit< M > Class Template Reference

One of the possible aspiration criterion (moAspirCrit). More...

#include <moNoAspirCrit.h> @@ -38,31 +37,31 @@

Inheritance diagram for moNoAspirCrit< M >:

-moAspirCrit< M > -eoBF< const M &, const M::EOType::Fitness &, bool > -eoFunctorBase +moAspirCrit< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. - + - +

Private Member Functions

bool operator() (const M &__move, const typename M::EOType::Fitness &__sol)
 Function which describes the aspiration criterion behaviour.
 Function which describes the aspiration criterion behaviour.
void init ()
 Procedure which initialises all that needs a moNoAspirCrit.
 Procedure which initialises all that needs a moNoAspirCrit.

Detailed Description

template<class M>
class moNoAspirCrit< M >

-One of the possible aspiration criterion (moAspirCrit). +One of the possible aspiration criterion (moAspirCrit).

The simplest : never satisfied.

-Definition at line 21 of file moNoAspirCrit.h.

Member Function Documentation

+Definition at line 46 of file moNoAspirCrit.h.

Member Function Documentation

@@ -91,7 +90,7 @@ template<class M>

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

Does nothing.

Parameters:
@@ -100,10 +99,10 @@ Does nothing.

__sol a fitness.

-
Returns:
FALSE.
+
Returns:
FALSE.

-Definition at line 32 of file moNoAspirCrit.h. +Definition at line 57 of file moNoAspirCrit.h.

@@ -124,19 +123,19 @@ template<class M>

-Procedure which initialises all that needs a moNoAspirCrit. +Procedure which initialises all that needs a moNoAspirCrit.

Nothing...

Implements moAspirCrit< M >.

-Definition at line 43 of file moNoAspirCrit.h. +Definition at line 68 of file moNoAspirCrit.h.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png index 2faca5ab9..c0687eec9 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png and b/trunk/paradiseo-mo/doc/html/classmo_no_aspir_crit.png differ 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 index 9ebc25c00..7e2790efa 100644 --- 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: 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]
functor_category()eoUF< const EOT &, bool > [static]
init()moNoFitImprSolContinue< EOT > [inline, virtual]
maxNumberOfIterationsWithoutImprovementmoNoFitImprSolContinue< EOT > [private]
moNoFitImprSolContinue(unsigned int __maxNumberOfIterationWithoutImprovement)moNoFitImprSolContinue< EOT > [inline]
operator()(const EOT &__sol)moNoFitImprSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 index 7f451d2a2..3db34d592 100644 --- 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moNoFitImprSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moNoFitImprSolContinue< EOT > Class Template Reference - +
-
+
-
+

moNoFitImprSolContinue< EOT > Class Template Reference

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

@@ -39,8 +38,8 @@

moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -55,7 +54,7 @@ typedef EOT::Fitness  - + @@ -87,7 +86,7 @@ The stop criterion corresponds to a maximum number of iterations without improve

-Definition at line 21 of file moNoFitImprSolContinue.h.

Constructor & Destructor Documentation

+Definition at line 46 of file moNoFitImprSolContinue.h.

Constructor & Destructor Documentation

@@ -116,7 +115,7 @@ Basic constructor.

-Definition at line 33 of file moNoFitImprSolContinue.h. +Definition at line 58 of file moNoFitImprSolContinue.h.

Member Function Documentation

@@ -139,21 +138,21 @@ template<class EOT>

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

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

Parameters:
 Basic constructor.
bool operator() (const EOT &__sol)
 Function that activates the stopping criterion.
 Function that activates the stopping criterion.
void init ()
 Procedure which allows to initialise all the stuff needed.
__sol the current solution.
-
Returns:
true or false.
+
Returns:
true or false.

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

-Definition at line 43 of file moNoFitImprSolContinue.h. +Definition at line 68 of file moNoFitImprSolContinue.h.

-References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement. +References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement.

@@ -180,15 +179,15 @@ It can be also used to reinitialize all the needed things.

Implements moSolContinue< EOT >.

-Definition at line 77 of file moNoFitImprSolContinue.h. +Definition at line 102 of file moNoFitImprSolContinue.h.

-References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< EOT >::firstFitnessSaved. +References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< EOT >::firstFitnessSaved.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 b2bf7a6aa..b980f3ede 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moRandImprSelect< M > Member List

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

- + - - -
Fitness typedefmoRandImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
init(const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
init_fitmoRandImprSelect< M > [private]
operator()(M &__move, Fitness &__fit)moRandImprSelect< M > [inline, virtual]
update(const M &__move, const Fitness &__fit)moRandImprSelect< M > [inline, virtual]
vect_better_fitmoRandImprSelect< M > [private]
vect_better_movesmoRandImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 d2fad21ea..6be97e158 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_impr_select.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moRandImprSelect< M > Class Template Reference + +ParadisEO-MOMovingObjects: moRandImprSelect< M > Class Template Reference - +
-
+
-
-

moRandImprSelect< M > Class Template Reference

One of the possible moMove selector (moMoveSelect). + +

moRandImprSelect< M > Class Template Reference

One of the possible moMove selector (moMoveSelect). More...

#include <moRandImprSelect.h> @@ -39,8 +38,8 @@

moMoveSelect< M > -eoBF< M &, M::EOType::Fitness &, void > -eoFunctorBase +eoBF< M &, M::EOType::Fitness &, void > +eoFunctorBase List of all members. @@ -52,10 +51,10 @@ typedef M::EOType::Fitness  - + - + @@ -77,13 +76,13 @@ std::vector< M > 

Public Member Functions

void init (const Fitness &__fit)
 Procedure which all that needs a moRandImprSelect.
 Procedure which all that needs a moRandImprSelect.
bool update (const M &__move, const Fitness &__fit)
 Function that updates the fitness and move vectors.
 Function that updates the fitness and move vectors.
void operator() (M &__move, Fitness &__fit) throw (EmptySelection)
 The move selection.
template<class M>
class moRandImprSelect< M > -One of the possible moMove selector (moMoveSelect). +One of the possible moMove selector (moMoveSelect).

All the neighbors are considered. One of them that enables an improvment of the objective function is choosen.

-Definition at line 25 of file moRandImprSelect.h.

Member Function Documentation

+Definition at line 50 of file moRandImprSelect.h.

Member Function Documentation

@@ -103,7 +102,7 @@ template<class M>

-Procedure which all that needs a moRandImprSelect. +Procedure which all that needs a moRandImprSelect.

Give a value to the initialise fitness. Clean the move and fitness vectors.

Parameters:
@@ -115,9 +114,9 @@ Give a value to the initialise fitness. Clean the move and fitness vectors.

Implements moMoveSelect< M >.

-Definition at line 40 of file moRandImprSelect.h. +Definition at line 65 of file moRandImprSelect.h.

-References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.

@@ -148,7 +147,7 @@ template<class M>

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

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

Parameters:
@@ -157,14 +156,14 @@ if a move give a better fitness than the initial fitness, it is saved and the fi
__fit a new fitness associated to the new move.
-
Returns:
TRUE.
+
Returns:
TRUE.

Implements moMoveSelect< M >.

-Definition at line 56 of file moRandImprSelect.h. +Definition at line 81 of file moRandImprSelect.h.

-References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. +References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves.

@@ -206,22 +205,22 @@ One the saved move is randomly chosen.

Exceptions:
- +
EmptySelection If no move which improves the current fitness are found.
EmptySelection If no move which improves the current fitness are found.

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

-Definition at line 77 of file moRandImprSelect.h. +Definition at line 102 of file moRandImprSelect.h.

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

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 115176bbb..2dcc04665 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moRandMove< M > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + functor_category()eoUF< M &, void > [static] + operator()(M &)=0eoUF< M &, void > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< M &, void > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html index 74c3ef7a6..d7f28a61f 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/doc/html/classmo_rand_move.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moRandMove< M > Class Template Reference + +ParadisEO-MOMovingObjects: moRandMove< M > Class Template Reference - +
-
+
-
+

moRandMove< M > Class Template Reference

Random move generator. More...

@@ -38,8 +37,8 @@

Inheritance diagram for moRandMove< M >:

-eoUF< M &, void > -eoFunctorBase +eoUF< M &, void > +eoFunctorBase List of all members. @@ -50,14 +49,14 @@ Random move generator.

-Only a description... An object that herits from this class needs to be designed in order to use a moSA. +Only a description... An object that herits from this class needs to be designed in order to use a moSA.

-Definition at line 21 of file moRandMove.h.

The documentation for this class was generated from the following file:
    +Definition at line 46 of file moRandMove.h.
    The documentation for this class was generated from the following file: -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/classmo_rand_move.png b/trunk/paradiseo-mo/doc/html/classmo_rand_move.png index e3354069c..2e8f6148e 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_rand_move.png and b/trunk/paradiseo-mo/doc/html/classmo_rand_move.png differ 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 a8a96602b..642e9bb8e 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +
-
+

moSA< M > Member List

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

- - + - - - + + + - - - + + - - - - - - -
binaryeoOp< EOType >
className() consteoMonOp< M::EOType > [virtual]
className() const eoMonOp< M::EOType > [virtual]
contmoSA< M > [private]
cool_schedmoSA< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoSA< M > [private]
Fitness typedefmoSA< M > [private]
full_evalmoSA< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
generaleoOp< EOType >
getType() consteoOp< EOType >
functor_category()eoUF< M::EOType &, bool > [static]
getType() const eoOp< EOType >
incr_evalmoSA< M > [private]
init_tempmoSA< M > [private]
moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline]
move_randmoSA< M > [private]
operator()(EOT &__sol)moSA< M > [inline, virtual]
OpType enum nameeoOp< EOType >
quadraticeoOp< EOType >
unaryeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_s_a.html b/trunk/paradiseo-mo/doc/html/classmo_s_a.html index ef3dd0b95..1be829cf9 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/doc/html/classmo_s_a.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moSA< M > Class Template Reference + +ParadisEO-MOMovingObjects: moSA< M > Class Template Reference - +
-
+
-
+

moSA< M > Class Template Reference

Simulated Annealing (SA). More...

@@ -39,15 +38,15 @@

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

Public Member Functions

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

-Definition at line 30 of file moSA.h.

Constructor & Destructor Documentation

+Definition at line 55 of file moSA.h.

Constructor & Destructor Documentation

@@ -138,7 +137,7 @@ template<class M>
- eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -166,7 +165,7 @@ All the boxes used by a SA need to be given.

-Definition at line 58 of file moSA.h. +Definition at line 83 of file moSA.h.

Member Function Documentation

@@ -191,26 +190,26 @@ template<class M>

function that launches the SA algorithm.

-As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.

+As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.

Parameters:
__sol a solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.

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

-Definition at line 80 of file moSA.h. +Definition at line 105 of file moSA.h.

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

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 04f671dec..0d29c7570 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moSimpleMoveTabuList< M > Member List

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

- + - + + - - -
add(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
currentSizemoSimpleMoveTabuList< M > [private]
EOT typedefmoSimpleMoveTabuList< M >
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moSimpleMoveTabuList< M > [inline, virtual]
maxSizemoSimpleMoveTabuList< M > [private]
moSimpleMoveTabuList(unsigned int __size)moSimpleMoveTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline]
moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
removeMove(const M &__move)moSimpleMoveTabuList< M > [inline, private]
tabuListmoSimpleMoveTabuList< M > [private]
update()moSimpleMoveTabuList< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 4e1e10323..1b597ffcf 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moSimpleMoveTabuList< M > Class Template Reference + +ParadisEO-MOMovingObjects: moSimpleMoveTabuList< M > Class Template Reference - +
-
+
-
+

moSimpleMoveTabuList< M > Class Template Reference

Class describing a move tabu list with a limited memory. More...

@@ -38,9 +37,9 @@

Inheritance diagram for moSimpleMoveTabuList< M >:

-moTabuList< M > -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -56,7 +55,7 @@ typedef M::EOType  - + @@ -92,7 +91,7 @@ Class describing a move tabu list with a limited memory.

-Definition at line 22 of file moSimpleMoveTabuList.h.

Member Function Documentation

+Definition at line 47 of file moSimpleMoveTabuList.h.

Member Function Documentation

@@ -114,29 +113,27 @@ template<class M>
- +
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
 Function that indicates if, in a given state, the _move is tabu or not.
void add (const M &__move, const EOT &__sol)
 Procedure to add a move in the tabu list.
) [inline, virtual] [inline]

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

Parameters:
- +
__move A given moMove.
__move A given moMove.
__sol A solution.
-
Returns:
true or false.
+
Returns:
true or false.

-Implements eoBF< const M &, const M::EOType &, bool >. +Definition at line 71 of file moSimpleMoveTabuList.h.

-Definition at line 46 of file moSimpleMoveTabuList.h. -

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

@@ -180,9 +177,9 @@ The two parameters have not to be modified so they are constant parameters.

Implements moTabuList< M >.

-Definition at line 60 of file moSimpleMoveTabuList.h. +Definition at line 85 of file moSimpleMoveTabuList.h.

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

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

Implements moTabuList< M >.

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

@@ -236,7 +233,7 @@ Can be useful if the data structure needs to be allocated before being used.

Implements moTabuList< M >.

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

@@ -262,22 +259,22 @@ Procedure that removes a given move from the tabu list (if it is into, else do n

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

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

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

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

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png index b291321fa..f4a038c83 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png and b/trunk/paradiseo-mo/doc/html/classmo_simple_move_tabu_list.png differ 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 404b7e47e..2a462c7b9 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moSimpleSolutionTabuList< M > Member List

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

- + - + + - - -
add(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
currentSizemoSimpleSolutionTabuList< M > [private]
EOT typedefmoSimpleSolutionTabuList< M >
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
functor_category()eoBF< A1, A2, R > [static]
init()moSimpleSolutionTabuList< M > [inline, virtual]
maxSizemoSimpleSolutionTabuList< M > [private]
moSimpleSolutionTabuList(unsigned int __size)moSimpleSolutionTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline]
moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
removeSolution(const EOT &__sol)moSimpleSolutionTabuList< M > [inline, private]
tabuListmoSimpleSolutionTabuList< M > [private]
update()moSimpleSolutionTabuList< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 ef00121b7..2ad89fa87 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moSimpleSolutionTabuList< M > Class Template Reference + +ParadisEO-MOMovingObjects: moSimpleSolutionTabuList< M > Class Template Reference - +
-
+
-
+

moSimpleSolutionTabuList< M > Class Template Reference

Class describing a solution tabu list with limited length. More...

@@ -38,9 +37,9 @@

Inheritance diagram for moSimpleSolutionTabuList< M >:

-moTabuList< M > -eoBF< const M &, const M::EOType &, bool > -eoFunctorBase +moTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase List of all members. @@ -55,7 +54,7 @@ typedef M::EOType  - + @@ -91,7 +90,7 @@ Class describing a solution tabu list with limited length.

-Definition at line 22 of file moSimpleSolutionTabuList.h.

Constructor & Destructor Documentation

+Definition at line 47 of file moSimpleSolutionTabuList.h.

Constructor & Destructor Documentation

@@ -120,9 +119,9 @@ Constructor.

-Definition at line 34 of file moSimpleSolutionTabuList.h. +Definition at line 59 of file moSimpleSolutionTabuList.h.

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

Member Function Documentation

@@ -147,29 +146,27 @@ template<class M> - +
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
 Function that indicates if, in a given state, the _move is tabu or not.
void add (const M &__move, const EOT &__sol)
 Procedure to add a move in the tabu list.
) [inline, virtual] [inline]

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

Parameters:
- +
__move A given moMove.
__move A given moMove.
__sol A solution.
-
Returns:
true or false.
+
Returns:
true or false.

-Implements eoBF< const M &, const M::EOType &, bool >. +Definition at line 70 of file moSimpleSolutionTabuList.h.

-Definition at line 45 of file moSimpleSolutionTabuList.h. -

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

@@ -213,9 +210,9 @@ The two parameters have not to be modified so they are constant parameters.

Implements moTabuList< M >.

-Definition at line 64 of file moSimpleSolutionTabuList.h. +Definition at line 89 of file moSimpleSolutionTabuList.h.

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

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

Implements moTabuList< M >.

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

@@ -269,7 +266,7 @@ Can be useful if the data structure needs to be allocated before being used.

Implements moTabuList< M >.

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

@@ -300,17 +297,17 @@ Procedure that removes a given solution from the tabu list (if it is into, else

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

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

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

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png index df07eba57..38d26e329 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png and b/trunk/paradiseo-mo/doc/html/classmo_simple_solution_tabu_list.png differ 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 cd19a471b..8ed7ed288 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moSolContinue< EOT > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual] + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html index bf014b569..18e2b1994 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moSolContinue< EOT > Class Template Reference - +
-
+
-
+

moSolContinue< EOT > Class Template Reference

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

@@ -38,8 +37,8 @@

Inheritance diagram for moSolContinue< EOT >:

-eoUF< const EOT &, bool > -eoFunctorBase +eoUF< const EOT &, bool > +eoFunctorBase moFitSolContinue< EOT > moGenSolContinue< EOT > moNoFitImprSolContinue< EOT > @@ -58,11 +57,11 @@ Class that describes a stop criterion for a solution-based heuristic.

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

-Definition at line 22 of file moSolContinue.h.

Member Function Documentation

+Definition at line 47 of file moSolContinue.h.

Member Function Documentation

@@ -90,8 +89,8 @@ Implemented in moSolContinue.h -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 index aa1def4fe..56814e836 100644 --- 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: 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]
functor_category()eoUF< const EOT &, bool > [static]
init()moSteadyFitSolContinue< EOT > [inline, virtual]
maxNumberOfIterationsmoSteadyFitSolContinue< EOT > [private]
maxNumberOfIterationsReachedmoSteadyFitSolContinue< EOT > [private]
maxNumberOfIterationsWithoutImprovementmoSteadyFitSolContinue< EOT > [private]
moSteadyFitSolContinue(unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)moSteadyFitSolContinue< EOT > [inline]
operator()(const EOT &__sol)moSteadyFitSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< const EOT &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 index ec8792a0b..50df6e7c6 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html +++ b/trunk/paradiseo-mo/doc/html/classmo_steady_fit_sol_continue.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moSteadyFitSolContinue< EOT > Class Template Reference + +ParadisEO-MOMovingObjects: moSteadyFitSolContinue< EOT > Class Template Reference - +
-
+
-
+

moSteadyFitSolContinue< EOT > Class Template Reference

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

@@ -39,8 +38,8 @@

moSolContinue< EOT > -eoUF< const EOT &, bool > -eoFunctorBase +eoUF< const EOT &, bool > +eoFunctorBase List of all members. @@ -55,7 +54,7 @@ typedef EOT::Fitness  - + @@ -95,7 +94,7 @@ The stop criterion corresponds to a maximum number of iterations without improve

-Definition at line 21 of file moSteadyFitSolContinue.h.

Constructor & Destructor Documentation

+Definition at line 46 of file moSteadyFitSolContinue.h.

Constructor & Destructor Documentation

@@ -134,7 +133,7 @@ Basic constructor.

-Definition at line 34 of file moSteadyFitSolContinue.h. +Definition at line 59 of file moSteadyFitSolContinue.h.

Member Function Documentation

@@ -157,7 +156,7 @@ template<class EOT>

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

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

Parameters:
@@ -165,14 +164,14 @@ Indicates if the fitness has not been improved since a number of iterations (aft
 Basic constructor.
bool operator() (const EOT &__sol)
 Function that activates the stopping criterion.
 Function that activates the stopping criterion.
void init ()
 Procedure which allows to initialise the stuff needed.
__sol the current solution.
-
Returns:
true or false.
+
Returns:
true or false.

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

-Definition at line 46 of file moSteadyFitSolContinue.h. +Definition at line 71 of file moSteadyFitSolContinue.h.

-References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement. +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement.

@@ -199,15 +198,15 @@ It can be also used to reinitialize the counter all the needed things.

Implements moSolContinue< EOT >.

-Definition at line 90 of file moSteadyFitSolContinue.h. +Definition at line 115 of file moSteadyFitSolContinue.h.

-References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached. +References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 5e85b884b..85c85209e 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moTS< M > Member List

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

- - + - - - + + + - - - + + - - - - - - -
binaryeoOp< EOType >
className() consteoMonOp< M::EOType > [virtual]
className() const eoMonOp< M::EOType > [virtual]
contmoTS< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoTS< M > [private]
Fitness typedefmoTS< M > [private]
full_evalmoTS< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
generaleoOp< EOType >
getType() consteoOp< EOType >
functor_category()eoUF< M::EOType &, bool > [static]
getType() const eoOp< EOType >
moTS(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
moTS(moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
move_explmoTS< M > [private]
operator()(EOT &__sol)moTS< M > [inline, virtual]
OpType enum nameeoOp< EOType >
quadraticeoOp< EOType >
unaryeoOp< EOType >
~eoFunctorBase()eoFunctorBase [virtual]
~eoOp()eoOp< EOType > [virtual]
~eoUF()eoUF< M::EOType &, bool > [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_t_s.html b/trunk/paradiseo-mo/doc/html/classmo_t_s.html index 26a69536d..1e10e293b 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/doc/html/classmo_t_s.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moTS< M > Class Template Reference + +ParadisEO-MOMovingObjects: moTS< M > Class Template Reference - +
-
+
-
+

moTS< M > Class Template Reference

Tabu Search (TS). More...

@@ -39,23 +38,23 @@

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

Public Member Functions

 moTS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
 moTS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
 Constructor of a moTS specifying all the boxes.
 moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
 Constructor of a moTS specifying all the boxes.
 moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)
 Constructor with less parameters.
bool operator() (EOT &__sol)
 Function which launchs the Tabu Search.
 Function which launchs the Tabu Search.

Private Types

typedef M::EOType EOT
 Stop criterion.
-eoEvalFunc< EOT > & full_eval
full_eval
 Full evaluation function.
@@ -89,7 +88,7 @@ Generic algorithm that describes a tabu search.

-Definition at line 29 of file moTS.h.

Constructor & Destructor Documentation

+Definition at line 54 of file moTS.h.

Constructor & Destructor Documentation

@@ -135,7 +134,7 @@ template<class M>
- eoEvalFunc< EOT > &  + eoEvalFunc< EOT > &  __full_eval  @@ -148,9 +147,9 @@ template<class M>

-Constructor of a moTS specifying all the boxes. +Constructor of a moTS specifying all the boxes.

-In this constructor, a moTSMoveLoopExpl is instanciated.

+In this constructor, a moTSMoveLoopExpl is instanciated.

Parameters:
@@ -164,7 +163,7 @@ In this constructor, a

-Definition at line 58 of file moTS.h. +Definition at line 83 of file moTS.h.

@@ -188,7 +187,7 @@ template<class M>

- + @@ -206,14 +205,14 @@ Constructor with less parameters. The explorer is given in the parameters.

Parameters:
__move_init move initialisation
eoEvalFunc< EOT > & eoEvalFunc< EOT > &  __full_eval 
- +
__move_expl the explorer (generally different that a moTSMoveLoopExpl)
__move_expl the explorer (generally different that a moTSMoveLoopExpl)
__cont stop criterion
__full_eval full evaluation function

-Definition at line 71 of file moTS.h. +Definition at line 96 of file moTS.h.

Member Function Documentation

@@ -236,28 +235,28 @@ template<class M>

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

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

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

Parameters:
__sol a solution to improve.
-
Returns:
TRUE.
+
Returns:
TRUE.

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

-Definition at line 85 of file moTS.h. +Definition at line 110 of file moTS.h.

-References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl. +References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 1e4ce20ed..5e18642e3 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
-
+
-
+

moTSMoveLoopExpl< M > Member List

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

- + @@ -42,10 +41,10 @@ - - -
aspir_critmoTSMoveLoopExpl< M > [private]
EOT typedefmoTSMoveLoopExpl< M > [private]
Fitness typedefmoTSMoveLoopExpl< M > [private]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
incr_evalmoTSMoveLoopExpl< M > [private]
moTSMoveLoopExpl(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit)moTSMoveLoopExpl< M > [inline]
move_initmoTSMoveLoopExpl< M > [private]
next_movemoTSMoveLoopExpl< M > [private]
operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline, virtual]
tabu_listmoTSMoveLoopExpl< M > [private]
~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 dccce4181..a9c737c9e 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 @@ -1,14 +1,15 @@ - -PARADISEO-MO: moTSMoveLoopExpl< M > Class Template Reference + +ParadisEO-MOMovingObjects: moTSMoveLoopExpl< M > Class Template Reference - +
-
+
-
+

moTSMoveLoopExpl< M > Class Template Reference

Explorer for a Tabu Search algorithm. More...

@@ -40,8 +39,8 @@ moMoveLoopExpl< M > moMoveExpl< M > -eoBF< const M::EOType &, M::EOType &, void > -eoFunctorBase +eoBF< const M::EOType &, M::EOType &, void > +eoFunctorBase List of all members. @@ -93,11 +92,11 @@ typedef M::EOType::Fitness 
-It is used by a moTS. +It is used by a moTS.

-Definition at line 30 of file moTSMoveLoopExpl.h.

Constructor & Destructor Documentation

+Definition at line 55 of file moTSMoveLoopExpl.h.

Constructor & Destructor Documentation

@@ -157,9 +156,9 @@ Constructor.

-Definition at line 49 of file moTSMoveLoopExpl.h. +Definition at line 74 of file moTSMoveLoopExpl.h.

-References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list. +References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list.

Member Function Documentation

@@ -202,17 +201,17 @@ The exploration continues while the chosen move is not in the tabu list or the a

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

-Definition at line 69 of file moTSMoveLoopExpl.h. +Definition at line 94 of file moTSMoveLoopExpl.h.

-References moTSMoveLoopExpl< M >::aspir_crit, moTSMoveLoopExpl< M >::incr_eval, moTSMoveLoopExpl< M >::move_init, moTSMoveLoopExpl< M >::move_select, moTSMoveLoopExpl< M >::next_move, and moTSMoveLoopExpl< M >::tabu_list. +References moTSMoveLoopExpl< M >::aspir_crit, moTSMoveLoopExpl< M >::incr_eval, moTSMoveLoopExpl< M >::move_init, moTSMoveLoopExpl< M >::move_select, moTSMoveLoopExpl< M >::next_move, and moTSMoveLoopExpl< M >::tabu_list.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
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 4227e29d7..9e61e8888 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list-members.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Member List + +ParadisEO-MOMovingObjects: Member List - +
- - +

-
+

moTabuList< M > Member List

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

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

Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + ~eoBF()eoBF< A1, A2, R > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html index 464196be2..95957b12d 100644 --- a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: moTabuList< M > Class Template Reference + +ParadisEO-MOMovingObjects: moTabuList< M > Class Template Reference - +
-
+
-
-

moTabuList< M > Class Template Reference

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

moTabuList< M > Class Template Reference

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

#include <moTabuList.h> @@ -38,10 +37,10 @@

Inheritance diagram for moTabuList< M >:

-eoBF< const M &, const M::EOType &, bool > -eoFunctorBase -moSimpleMoveTabuList< M > -moSimpleSolutionTabuList< M > +eoBF< A1, A2, R > +eoFunctorBase +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > List of all members. @@ -65,13 +64,13 @@ typedef M::EOType 
moTS uses. +Class describing a tabu list that a moTS uses.

-It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS. +It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS.

-Definition at line 22 of file moTabuList.h.

Member Function Documentation

+Definition at line 47 of file moTabuList.h.

Member Function Documentation

@@ -136,7 +135,7 @@ Procedure that updates the tabu list content.

Generally, a counter associated to each saved move is decreased by one.

-Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >. +Implemented in moSimpleMoveTabuList< M >, moSimpleSolutionTabuList< M >, and TwoOptTabuList.

@@ -161,13 +160,13 @@ Procedure which initialises the tabu list.

Can be useful if the data structure needs to be allocated before being used.

-Implemented in moSimpleMoveTabuList< M >, and moSimpleSolutionTabuList< M >. +Implemented in moSimpleMoveTabuList< M >, moSimpleSolutionTabuList< M >, and TwoOptTabuList.

The documentation for this class was generated from the following file: -
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png index c9d3346ba..b4c545581 100644 Binary files a/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png and b/trunk/paradiseo-mo/doc/html/classmo_tabu_list.png differ diff --git a/trunk/paradiseo-mo/doc/html/doxygen.css b/trunk/paradiseo-mo/doc/html/doxygen.css index c7db1a8a0..5d583694e 100644 --- a/trunk/paradiseo-mo/doc/html/doxygen.css +++ b/trunk/paradiseo-mo/doc/html/doxygen.css @@ -341,7 +341,6 @@ HR { height: 1px; .paramname { color: #602020; font-style: italic; - white-space: nowrap; } /* End Styling for detailed member documentation */ @@ -356,3 +355,4 @@ HR { height: 1px; .directory p { margin: 0px; white-space: nowrap; } .directory div { display: none; margin: 0px; } .directory img { vertical-align: -30%; } + diff --git a/trunk/paradiseo-mo/doc/html/edge__xover_8cpp-source.html b/trunk/paradiseo-mo/doc/html/edge__xover_8cpp-source.html index e710c2acb..e09500fa5 100644 --- a/trunk/paradiseo-mo/doc/html/edge__xover_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/edge__xover_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: edge_xover.cpp Source File - +
-
-

edge_xover.cpp

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "edge_xover.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <assert.h>
-00013 
-00014 #include <utils/eoRNG.h>
-00015 
-00016 #include "edge_xover.h"
-00017 #include "route_valid.h"
-00018 
-00019 #define MAXINT 1000000
-00020 
-00021 void
-00022 EdgeXover :: build_map (const Route & __par1, const Route & __par2) 
-00023 {
-00024   
-00025   unsigned int len = __par1.size () ;
-00026   
-00027   /* Initialization */
-00028   _map.clear () ;
-00029   _map.resize (len) ;
-00030   
-00031   for (unsigned int i = 0 ; i < len ; i ++) 
-00032     {
-00033       _map [__par1 [i]].insert (__par1 [(i + 1) % len]) ;
-00034       _map [__par2 [i]].insert (__par2 [(i + 1) % len]) ;
-00035       _map [__par1 [i]].insert (__par1 [(i - 1 + len) % len]) ;
-00036       _map [__par2 [i]].insert (__par2 [(i - 1 + len) % len]) ;
-00037     }
-00038   
-00039   visited.clear () ;
-00040   visited.resize (len, false) ;
-00041 }
-00042 
-00043 void
-00044 EdgeXover :: remove_entry (unsigned int __vertex, std :: vector <std :: set <unsigned int> > & __map) 
-00045 {
-00046   
-00047   std :: set <unsigned int> & neigh = __map [__vertex] ;
-00048 
-00049   for (std :: set <unsigned int> :: iterator it = neigh.begin () ; it != neigh.end () ; it ++)
-00050     {
-00051       __map [* it].erase (__vertex) ; 
-00052     }
-00053       
-00054 }
-00055 
-00056 void
-00057 EdgeXover :: add_vertex (unsigned int __vertex, Route & __child) 
-00058 {
-00059   visited [__vertex] = true ;
-00060   __child.push_back (__vertex) ;    
-00061   remove_entry (__vertex, _map) ; /* Removing entries */    
-00062 }
-00063 
-00064 void
-00065 EdgeXover :: cross (const Route & __par1, const Route & __par2, Route & __child) {
-00066   
-00067   build_map (__par1, __par2) ;
-00068   
-00069   unsigned int len = __par1.size () ;
-00070  
-00071   /* Go ! */
-00072   __child.clear () ;
-00073   
-00074   unsigned int cur_vertex = rng.random (len) ;
-00075   
-00076   add_vertex (cur_vertex, __child) ;
-00077 
-00078   for (unsigned int i = 1 ; i < len ; i ++) {
-00079     
-00080     unsigned int len_min_entry = MAXINT ;
-00081     
-00082     std :: set <unsigned int> & neigh = _map [cur_vertex] ;
-00083     
-00084     for (std :: set <unsigned int> :: iterator it = neigh.begin () ; it != neigh.end () ; it ++) 
-00085       {      
-00086         unsigned int l = _map [* it].size () ;
-00087         if (len_min_entry > l)
-00088           {
-00089             len_min_entry = l ;
-00090           }
-00091       }
-00092     
-00093     std :: vector <unsigned int> cand ; /* Candidates */
-00094     
-00095     for (std :: set <unsigned> :: iterator it = neigh.begin () ; it != neigh.end () ;  it ++) 
-00096       {      
-00097         unsigned int l = _map [* it].size () ;
-00098         if (len_min_entry == l)
-00099           {
-00100             cand.push_back (* it) ;
-00101           }
-00102       }
-00103        
-00104     if (! cand.size ()) 
-00105       {
-00106         
-00107         /* Oh no ! Implicit mutation */      
-00108         for (unsigned int j = 0 ; j < len ; j ++)
-00109           {
-00110             if (! visited [j])
-00111               {
-00112                 cand.push_back (j) ;
-00113               }
-00114           }
-00115       }
-00116     
-00117     cur_vertex = cand [rng.random (cand.size ())] ;
-00118     
-00119     add_vertex (cur_vertex, __child) ;
-00120   } 
-00121 }
-00122 
-00123 bool
-00124 EdgeXover :: operator () (Route & __route1, Route & __route2) 
-00125 {
-00126   
-00127   // Init. copy
-00128   Route par [2] ;
-00129   par [0] = __route1 ;
-00130   par [1] = __route2 ;
-00131   
-00132   cross (par [0], par [1], __route1) ;
-00133   cross (par [1], par [0], __route2) ;
-00134   
-00135   assert (valid (__route1)) ;
-00136   assert (valid (__route2)) ;
-00137 
-00138   __route1.invalidate () ;
-00139   __route2.invalidate () ;
-00140 
-00141   return true ;
-00142 }
-
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

edge_xover.cpp

00001 /* 
+00002 * <edge_xover.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <assert.h>
+00038 
+00039 #include <utils/eoRNG.h>
+00040 
+00041 #include "edge_xover.h"
+00042 #include "route_valid.h"
+00043 
+00044 #define MAXINT 1000000
+00045 
+00046 void
+00047 EdgeXover :: build_map (const Route & __par1, const Route & __par2) 
+00048 {
+00049   
+00050   unsigned int len = __par1.size () ;
+00051   
+00052   /* Initialization */
+00053   _map.clear () ;
+00054   _map.resize (len) ;
+00055   
+00056   for (unsigned int i = 0 ; i < len ; i ++) 
+00057     {
+00058       _map [__par1 [i]].insert (__par1 [(i + 1) % len]) ;
+00059       _map [__par2 [i]].insert (__par2 [(i + 1) % len]) ;
+00060       _map [__par1 [i]].insert (__par1 [(i - 1 + len) % len]) ;
+00061       _map [__par2 [i]].insert (__par2 [(i - 1 + len) % len]) ;
+00062     }
+00063   
+00064   visited.clear () ;
+00065   visited.resize (len, false) ;
+00066 }
+00067 
+00068 void
+00069 EdgeXover :: remove_entry (unsigned int __vertex, std :: vector <std :: set <unsigned int> > & __map) 
+00070 {
+00071   
+00072   std :: set <unsigned int> & neigh = __map [__vertex] ;
+00073 
+00074   for (std :: set <unsigned int> :: iterator it = neigh.begin () ; it != neigh.end () ; it ++)
+00075     {
+00076       __map [* it].erase (__vertex) ; 
+00077     }
+00078       
+00079 }
+00080 
+00081 void
+00082 EdgeXover :: add_vertex (unsigned int __vertex, Route & __child) 
+00083 {
+00084   visited [__vertex] = true ;
+00085   __child.push_back (__vertex) ;    
+00086   remove_entry (__vertex, _map) ; /* Removing entries */    
+00087 }
+00088 
+00089 void
+00090 EdgeXover :: cross (const Route & __par1, const Route & __par2, Route & __child) {
+00091   
+00092   build_map (__par1, __par2) ;
+00093   
+00094   unsigned int len = __par1.size () ;
+00095  
+00096   /* Go ! */
+00097   __child.clear () ;
+00098   
+00099   unsigned int cur_vertex = rng.random (len) ;
+00100   
+00101   add_vertex (cur_vertex, __child) ;
+00102 
+00103   for (unsigned int i = 1 ; i < len ; i ++) {
+00104     
+00105     unsigned int len_min_entry = MAXINT ;
+00106     
+00107     std :: set <unsigned int> & neigh = _map [cur_vertex] ;
+00108     
+00109     for (std :: set <unsigned int> :: iterator it = neigh.begin () ; it != neigh.end () ; it ++) 
+00110       {      
+00111         unsigned int l = _map [* it].size () ;
+00112         if (len_min_entry > l)
+00113           {
+00114             len_min_entry = l ;
+00115           }
+00116       }
+00117     
+00118     std :: vector <unsigned int> cand ; /* Candidates */
+00119     
+00120     for (std :: set <unsigned> :: iterator it = neigh.begin () ; it != neigh.end () ;  it ++) 
+00121       {      
+00122         unsigned int l = _map [* it].size () ;
+00123         if (len_min_entry == l)
+00124           {
+00125             cand.push_back (* it) ;
+00126           }
+00127       }
+00128        
+00129     if (! cand.size ()) 
+00130       {
+00131         
+00132         /* Oh no ! Implicit mutation */      
+00133         for (unsigned int j = 0 ; j < len ; j ++)
+00134           {
+00135             if (! visited [j])
+00136               {
+00137                 cand.push_back (j) ;
+00138               }
+00139           }
+00140       }
+00141     
+00142     cur_vertex = cand [rng.random (cand.size ())] ;
+00143     
+00144     add_vertex (cur_vertex, __child) ;
+00145   } 
+00146 }
+00147 
+00148 bool
+00149 EdgeXover :: operator () (Route & __route1, Route & __route2) 
+00150 {
+00151   
+00152   // Init. copy
+00153   Route par [2] ;
+00154   par [0] = __route1 ;
+00155   par [1] = __route2 ;
+00156   
+00157   cross (par [0], par [1], __route1) ;
+00158   cross (par [1], par [0], __route2) ;
+00159   
+00160   assert (valid (__route1)) ;
+00161   assert (valid (__route2)) ;
+00162 
+00163   __route1.invalidate () ;
+00164   __route2.invalidate () ;
+00165 
+00166   return true ;
+00167 }
+
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html b/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html index 9fb1a6145..522045e44 100644 --- a/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/edge__xover_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: edge_xover.h Source File - +
-
-

edge_xover.h

00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "edge_xover.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef edge_xover_h
-00013 #define edge_xover_h
-00014 
-00015 #include <vector>
-00016 #include <set>
-00017 
-00018 #include <eoOp.h>
-00019 
-00020 #include "route.h"
-00021 
-00023 class EdgeXover : public eoQuadOp <Route> 
-00024 {
-00025   
-00026 public :
-00027   
-00028   bool operator () (Route & __route1, Route & __route2) ;
-00029 
-00030 private :
-00031   
-00032   void cross (const Route & __par1, const Route & __par2, Route & __child) ; /* Binary */
-00033 
-00034   void remove_entry (unsigned int __vertex, std :: vector <std :: set <unsigned> > & __map) ;
-00035   /* Updating the map of entries */
+
+

edge_xover.h

00001 /* 
+00002 * <edge_xover.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00037   void build_map (const Route & __par1, const Route & __par2) ;
-00038 
-00039   void add_vertex (unsigned int __vertex, Route & __child) ;
-00040 
-00041   std :: vector <std :: set <unsigned int> > _map ; /* The handled map */
+00037 #ifndef edge_xover_h
+00038 #define edge_xover_h
+00039 
+00040 #include <vector>
+00041 #include <set>
 00042 
-00043   std :: vector <bool> visited ; /* Vertices that are already visited */
+00043 #include <eoOp.h>
 00044 
-00045 } ;
+00045 #include "route.h"
 00046 
-00047 #endif
-
Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00048 class EdgeXover : public eoQuadOp <Route> +00049 { +00050 +00051 public : +00052 +00053 bool operator () (Route & __route1, Route & __route2) ; +00054 +00055 private : +00056 +00057 void cross (const Route & __par1, const Route & __par2, Route & __child) ; /* Binary */ +00058 +00059 void remove_entry (unsigned int __vertex, std :: vector <std :: set <unsigned> > & __map) ; +00060 /* Updating the map of entries */ +00061 +00062 void build_map (const Route & __par1, const Route & __par2) ; +00063 +00064 void add_vertex (unsigned int __vertex, Route & __child) ; +00065 +00066 std :: vector <std :: set <unsigned int> > _map ; /* The handled map */ +00067 +00068 std :: vector <bool> visited ; /* Vertices that are already visited */ +00069 +00070 } ; +00071 +00072 #endif +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/files.html b/trunk/paradiseo-mo/doc/html/files.html index 66dc5a63a..80707696f 100644 --- a/trunk/paradiseo-mo/doc/html/files.html +++ b/trunk/paradiseo-mo/doc/html/files.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: File Index + +ParadisEO-MOMovingObjects: File Index - +
-
-

PARADISEO-MO File List

Here is a list of all documented files with brief descriptions: + +

ParadisEO-MOMovingObjects File List

Here is a list of all documented files with brief descriptions:
+ + + + + + + + + - - - @@ -61,9 +67,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
city_swap.cpp [code]
city_swap.h [code]
edge_xover.cpp [code]
edge_xover.h [code]
graph.cpp [code]
graph.h [code]
hill_climbing.cpp [code]
index.h [code]
iterated_local_search.cpp [code]
mix.h [code]
mo.h [code]
moAlgo.h [code]
moAspirCrit.h [code]
moBestImprSelect.h [code]
moComparator.h [code]
moCoolingSchedule.h [code]
moExponentialCoolingSchedule.h [code]
moFirstImprSelect.h [code]
moFitComparator.h [code]
moFitSolContinue.h [code]
moGenSolContinue.h [code]
moHC.h [code]
moHCMoveLoopExpl.h [code]
moILS.h [code]
moImprBestFitAspirCrit.h [code]
moItRandNextMove.h [code]
moLinearCoolingSchedule.h [code]
moTabuList.h [code]
moTS.h [code]
moTSMoveLoopExpl.h [code]
order_xover.cpp [code]
order_xover.h [code]
part_route_eval.cpp [code]
part_route_eval.h [code]
part_two_opt_init.cpp [code]
part_two_opt_init.h [code]
part_two_opt_next.cpp [code]
part_two_opt_next.h [code]
partial_mapped_xover.cpp [code]
partial_mapped_xover.h [code]
route.h [code]
route_eval.cpp [code]
route_eval.h [code]
route_init.cpp [code]
route_init.h [code]
route_valid.cpp [code]
route_valid.h [code]
simulated_annealing.cpp [code]
t-mo.cpp [code]
tabu_search.cpp [code]
two_opt.cpp [code]
two_opt.h [code]
two_opt_incr_eval.cpp [code]
two_opt_incr_eval.h [code]
two_opt_init.cpp [code]
two_opt_init.h [code]
two_opt_next.cpp [code]
two_opt_next.h [code]
two_opt_rand.cpp [code]
two_opt_rand.h [code]
two_opt_tabu_list.cpp [code]
two_opt_tabu_list.h [code]
-
Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
+doxygen 1.4.7
diff --git a/trunk/paradiseo-mo/doc/html/functions.html b/trunk/paradiseo-mo/doc/html/functions.html index c0d1c12df..3ee1427dc 100644 --- a/trunk/paradiseo-mo/doc/html/functions.html +++ b/trunk/paradiseo-mo/doc/html/functions.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Class Members + +ParadisEO-MOMovingObjects: Class Members - +
- - +
-
+
  • Class Members
    • +

    - b -

    +: moImprBestFitAspirCrit< M >, moFirstImprSelect< M >, moBestImprSelect< M >
  • best_move +: moFirstImprSelect< M >, moBestImprSelect< M >
  • build_map() +: EdgeXover

    - c -

    +: moTS< M >, moSA< M >
  • cool_sched +: moSA< M >
  • counter +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • cross() +: OrderXover, EdgeXover
  • currentSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >

    - e -

    +: moTSMoveLoopExpl< M >, moTS< M >, moTabuList< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moItRandNextMove< M >, moHCMoveLoopExpl< M >, moHC< M >
  • EOType +: moMove< EOT >

    - f -

    -

    - g -

    -

    - h -

    +: moImprBestFitAspirCrit< M >, moBestImprSelect< M >
  • firstFitnessSaved +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • fitness +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >, moFitSolContinue< EOT >
  • Fitness +: moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >
  • from +: PartRouteEval
  • full_eval +: moTS< M >, moSA< M >, moHC< M >
  • func +: moLSCheckPoint< M >

    - i -

    -

    - l -

    +: moTSMoveLoopExpl< M >, moSA< M >, moHCMoveLoopExpl< M >
  • init() +: TwoOptTabuList, moTabuList< M >, moSteadyFitSolContinue< EOT >, moSolContinue< EOT >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moNoAspirCrit< M >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moGenSolContinue< EOT >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M >, moAspirCrit< M >
  • init_fit +: moRandImprSelect< M >, moFirstImprSelect< M >
  • init_temp +: moSA< M >

    - m -

    +: moItRandNextMove< M >
  • maxNumberOfIterations +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsReached +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsWithoutImprovement +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • maxNumGen +: moGenSolContinue< EOT >
  • maxSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • moExponentialCoolingSchedule() +: moExponentialCoolingSchedule
  • moFitSolContinue() +: moFitSolContinue< EOT >
  • moGenSolContinue() +: moGenSolContinue< EOT >
  • moHC() +: moHC< M >
  • moHCMoveLoopExpl() +: moHCMoveLoopExpl< M >
  • moImprBestFitAspirCrit() +: moImprBestFitAspirCrit< M >
  • moItRandNextMove() +: moItRandNextMove< M >
  • moLinearCoolingSchedule() +: moLinearCoolingSchedule
  • moNoFitImprSolContinue() +: moNoFitImprSolContinue< EOT >
  • moSA() +: moSA< M >
  • moSimpleMoveTabuList() +: moSimpleMoveTabuList< M >
  • moSimpleSolutionTabuList() +: moSimpleSolutionTabuList< M >
  • moSteadyFitSolContinue() +: moSteadyFitSolContinue< EOT >
  • moTS() +: moTS< M >
  • moTSMoveLoopExpl() +: moTSMoveLoopExpl< M >
  • move_expl +: moTS< M >, moHC< M >
  • move_init +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • move_rand +: moSA< M >
  • move_select +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >

    - n -

    +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • num_iter +: moItRandNextMove< M >
  • numGen +: moGenSolContinue< EOT >

    - o -

    +
  • operator!() +: TwoOpt
  • operator()() +: TwoOptTabuList, TwoOptRand, TwoOptNext, TwoOptInit, TwoOptIncrEval, TwoOpt, RouteInit, RouteEval, PartialMappedXover, PartTwoOptInit, PartRouteEval, OrderXover, EdgeXover, CitySwap, moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moNoAspirCrit< M >, moLSCheckPoint< M >, moLinearCoolingSchedule, moItRandNextMove< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moGenSolContinue< EOT >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moExponentialCoolingSchedule, moBestImprSelect< M >

    - p -

    +
  • PartRouteEval() +: PartRouteEval
  • printOn() +: TwoOpt

    - q -

    +: moLinearCoolingSchedule

    - r -

    -

    - s -

    +: moItRandNextMove< M >
  • ratio +: moExponentialCoolingSchedule
  • readFrom() +: TwoOpt
  • removeMove() +: moSimpleMoveTabuList< M >
  • removeSolution() +: moSimpleSolutionTabuList< M >
  • repair() +: PartialMappedXover

    - t -

    +: moTSMoveLoopExpl< M >
  • tabu_span +: TwoOptTabuList
  • tabuList +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • threshold +: moLinearCoolingSchedule, moExponentialCoolingSchedule
  • to +: PartRouteEval

    - u -

    +: TwoOptTabuList, moTabuList< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moRandImprSelect< M >, moMoveSelect< M >, moFirstImprSelect< M >, moBestImprSelect< M >

    - v -

    -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +: moFirstImprSelect< M >
  • vect_better_fit +: moRandImprSelect< M >
  • vect_better_moves +: moRandImprSelect< M >
  • visited +: EdgeXover +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/functions_func.html b/trunk/paradiseo-mo/doc/html/functions_func.html index b7557f1d6..278c93304 100644 --- a/trunk/paradiseo-mo/doc/html/functions_func.html +++ b/trunk/paradiseo-mo/doc/html/functions_func.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Class Members - Functions + +ParadisEO-MOMovingObjects: Class Members - Functions - +
    -
    +
    • -
    +
  • Class Members
    • +
    -
    - -
    - -

     

    -

    - a -

    +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/functions_type.html b/trunk/paradiseo-mo/doc/html/functions_type.html index ff6a69601..69cb96871 100644 --- a/trunk/paradiseo-mo/doc/html/functions_type.html +++ b/trunk/paradiseo-mo/doc/html/functions_type.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Class Members - Typedefs + +ParadisEO-MOMovingObjects: Class Members - Typedefs - +
    -
    +
    -
    +
  • Class Members
    • +
     

    -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +: moTSMoveLoopExpl< M >, moTS< M >, moTabuList< M >, moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >, moSA< M >, moItRandNextMove< M >, moHCMoveLoopExpl< M >, moHC< M >
  • EOType +: moMove< EOT >
  • Fitness +: moTSMoveLoopExpl< M >, moTS< M >, moSteadyFitSolContinue< EOT >, moSA< M >, moRandImprSelect< M >, moNoFitImprSolContinue< EOT >, moMoveSelect< M >, moImprBestFitAspirCrit< M >, moHCMoveLoopExpl< M >, moHC< M >, moFitSolContinue< EOT >, moFirstImprSelect< M >, moBestImprSelect< M > +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    • diff --git a/trunk/paradiseo-mo/doc/html/functions_vars.html b/trunk/paradiseo-mo/doc/html/functions_vars.html index 317300427..45c9577a6 100644 --- a/trunk/paradiseo-mo/doc/html/functions_vars.html +++ b/trunk/paradiseo-mo/doc/html/functions_vars.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Class Members - Variables + +ParadisEO-MOMovingObjects: Class Members - Variables - +
    -
    +
    -
    +
  • Class Members
    • +

    - b -

    +: moImprBestFitAspirCrit< M >, moFirstImprSelect< M >, moBestImprSelect< M >
  • best_move +: moFirstImprSelect< M >, moBestImprSelect< M >

    - c -

    +: moTS< M >, moSA< M >
  • cool_sched +: moSA< M >
  • counter +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • currentSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >

    - f -

    +: moImprBestFitAspirCrit< M >, moBestImprSelect< M >
  • firstFitnessSaved +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • fitness +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >, moFitSolContinue< EOT >
  • from +: PartRouteEval
  • full_eval +: moTS< M >, moSA< M >, moHC< M >
  • func +: moLSCheckPoint< M >

    - i -

    +: moTSMoveLoopExpl< M >, moSA< M >, moHCMoveLoopExpl< M >
  • init_fit +: moRandImprSelect< M >, moFirstImprSelect< M >
  • init_temp +: moSA< M >

    - m -

    +: moItRandNextMove< M >
  • maxNumberOfIterations +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsReached +: moSteadyFitSolContinue< EOT >
  • maxNumberOfIterationsWithoutImprovement +: moSteadyFitSolContinue< EOT >, moNoFitImprSolContinue< EOT >
  • maxNumGen +: moGenSolContinue< EOT >
  • maxSize +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • move_expl +: moTS< M >, moHC< M >
  • move_init +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • move_rand +: moSA< M >
  • move_select +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >

    - n -

    -

    - p -

    +: moTSMoveLoopExpl< M >, moHCMoveLoopExpl< M >
  • num_iter +: moItRandNextMove< M >
  • numGen +: moGenSolContinue< EOT >

    - q -

    +: moLinearCoolingSchedule

    - r -

    +: moItRandNextMove< M >
  • ratio +: moExponentialCoolingSchedule

    - t -

    +: moTSMoveLoopExpl< M >
  • tabu_span +: TwoOptTabuList
  • tabuList +: moSimpleSolutionTabuList< M >, moSimpleMoveTabuList< M >
  • threshold +: moLinearCoolingSchedule, moExponentialCoolingSchedule
  • to +: PartRouteEval

    - v -

    -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +: moFirstImprSelect< M >
  • vect_better_fit +: moRandImprSelect< M >
  • vect_better_moves +: moRandImprSelect< M >
  • visited +: EdgeXover +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/graph_8cpp-source.html b/trunk/paradiseo-mo/doc/html/graph_8cpp-source.html index f7e369aa7..6d7d3f4d0 100644 --- a/trunk/paradiseo-mo/doc/html/graph_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/graph_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: graph.cpp Source File - +
    -
    -

    graph.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "graph.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <fstream>
-00013 #include <iostream>
-00014 #include <math.h>
-00015 
-00016 #include "graph.h"
-00017 
-00018 namespace Graph {
-00019 
-00020   static std :: vector <std :: pair <double, double> > vectCoord ; // Coordinates
-00021   
-00022   static std :: vector <std :: vector <unsigned int> > dist ; // Distances Mat.
-00023 
-00024   unsigned size () 
-00025   {
-00026     return dist.size () ;
-00027   }
-00028 
-00029   void computeDistances () 
-00030   {
-00031     
-00032     // Dim.
-00033     unsigned int numCities = vectCoord.size () ;
-00034     dist.resize (numCities) ;
-00035     for (unsigned int i = 0 ; i < dist.size () ; i ++)
-00036       {
-00037         dist [i].resize (numCities) ;
-00038       }
-00039     
-00040     // Computations.
-00041     for (unsigned int i = 0 ; i < dist.size () ; i ++)
-00042       {
-00043         for (unsigned int j = i + 1 ; j < dist.size () ; j ++) 
-00044           {
-00045             double distX = (double)(vectCoord [i].first - vectCoord [j].first) ;
-00046             double distY = (double)(vectCoord [i].second - vectCoord [j].second) ;
-00047             dist [i] [j] = dist [j] [i] = (unsigned) (sqrt ((float) (distX * distX + distY * distY)) + 0.5) ;
-00048           }
-00049       }
-00050   }
-00051 
-00052   void load (const char * __fileName) 
-00053   {
-00054     
-00055     std :: ifstream f (__fileName) ;
+
    +

    graph.cpp

    00001 /* 
+00002 * <graph.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <fstream>
+00038 #include <iostream>
+00039 #include <math.h>
+00040 
+00041 #include "graph.h"
+00042 
+00043 namespace Graph {
+00044 
+00045   static std :: vector <std :: pair <double, double> > vectCoord ; // Coordinates
+00046   
+00047   static std :: vector <std :: vector <unsigned int> > dist ; // Distances Mat.
+00048 
+00049   unsigned size () 
+00050   {
+00051     return dist.size () ;
+00052   }
+00053 
+00054   void computeDistances () 
+00055   {
 00056     
-00057     std :: cout << ">> Loading [" << __fileName << "]" << std :: endl ;
-00058     
-00059     if (f) 
-00060       {
-00061         unsigned int num_vert ; 
-00062         
-00063         f >> num_vert ;
-00064         vectCoord.resize (num_vert) ;
-00065         
-00066         for (unsigned int i = 0 ; i < num_vert ; i ++)  
-00067           {
-00068             f >> vectCoord [i].first >> vectCoord [i].second ;
-00069           }
-00070                   
-00071         f.close () ;
-00072         
-00073         computeDistances () ;
+00057     // Dim.
+00058     unsigned int numCities = vectCoord.size () ;
+00059     dist.resize (numCities) ;
+00060     for (unsigned int i = 0 ; i < dist.size () ; i ++)
+00061       {
+00062         dist [i].resize (numCities) ;
+00063       }
+00064     
+00065     // Computations.
+00066     for (unsigned int i = 0 ; i < dist.size () ; i ++)
+00067       {
+00068         for (unsigned int j = i + 1 ; j < dist.size () ; j ++) 
+00069           {
+00070             double distX = (double)(vectCoord [i].first - vectCoord [j].first) ;
+00071             double distY = (double)(vectCoord [i].second - vectCoord [j].second) ;
+00072             dist [i] [j] = dist [j] [i] = (unsigned) (sqrt ((float) (distX * distX + distY * distY)) + 0.5) ;
+00073           }
 00074       }
-00075     else 
-00076       {
-00077         
-00078         std :: cout << __fileName << " doesn't exist !!!" << std :: endl ;
-00079         // Bye !!!
-00080         exit (1) ;
-00081       }
-00082   }
-00083   
-00084   float distance (unsigned int __from, unsigned int __to) 
-00085   {
-00086     return (float)(dist [__from] [__to]) ;
-00087   }
-00088 }
-00089 
-00090 
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00075 } +00076 +00077 void load (const char * __fileName) +00078 { +00079 +00080 std :: ifstream f (__fileName) ; +00081 +00082 std :: cout << ">> Loading [" << __fileName << "]" << std :: endl ; +00083 +00084 if (f) +00085 { +00086 unsigned int num_vert ; +00087 +00088 f >> num_vert ; +00089 vectCoord.resize (num_vert) ; +00090 +00091 for (unsigned int i = 0 ; i < num_vert ; i ++) +00092 { +00093 f >> vectCoord [i].first >> vectCoord [i].second ; +00094 } +00095 +00096 f.close () ; +00097 +00098 computeDistances () ; +00099 } +00100 else +00101 { +00102 +00103 std :: cout << __fileName << " doesn't exist !!!" << std :: endl ; +00104 // Bye !!! +00105 exit (1) ; +00106 } +00107 } +00108 +00109 float distance (unsigned int __from, unsigned int __to) +00110 { +00111 return (float)(dist [__from] [__to]) ; +00112 } +00113 } +00114 +00115 +
    • Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7 diff --git a/trunk/paradiseo-mo/doc/html/graph_8h-source.html b/trunk/paradiseo-mo/doc/html/graph_8h-source.html index ba9e1d756..50d149fc7 100644 --- a/trunk/paradiseo-mo/doc/html/graph_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/graph_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: graph.h Source File - +
    -
    -

    graph.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "graph.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef graph_h
-00013 #define graph_h
-00014 
-00015 #include <vector>
-00016 #include <utility>
-00017 
-00018 namespace Graph 
-00019 {
-00020   void load (const char * __file_name) ;
-00021   /* Loading cities
-00022      (expressed by their coordinates)
-00023      from the given file name */  
-00024   
-00025   float distance (unsigned int __from, unsigned int __to) ;
-00026 
-00027   unsigned int size () ; // How many cities ?
-00028 }
-00029 
-00030 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    graph.h

    00001 /* 
+00002 * <graph.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef graph_h
+00038 #define graph_h
+00039 
+00040 #include <vector>
+00041 #include <utility>
+00042 
+00043 namespace Graph 
+00044 {
+00045   void load (const char * __file_name) ;
+00046   /* Loading cities
+00047      (expressed by their coordinates)
+00048      from the given file name */  
+00049   
+00050   float distance (unsigned int __from, unsigned int __to) ;
+00051 
+00052   unsigned int size () ; // How many cities ?
+00053 }
+00054 
+00055 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/hierarchy.html b/trunk/paradiseo-mo/doc/html/hierarchy.html index cc67ca36b..2081244dd 100644 --- a/trunk/paradiseo-mo/doc/html/hierarchy.html +++ b/trunk/paradiseo-mo/doc/html/hierarchy.html @@ -1,14 +1,15 @@ - -PARADISEO-MO: Hierarchical Index + +ParadisEO-MOMovingObjects: Hierarchical Index - +
    -
    +
    -
    -

    PARADISEO-MO Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically:
      +
    +

    ParadisEO-MOMovingObjects Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically: +
  • eoBF< M &, M::EOType::Fitness &, void > [external] -
  • eoUF< const EOT &, bool > +
  • eoUF< A1, R > + [external] +
  • eoUF< const EOT &, bool > [external] -
  • eoUF< double &, bool > +
  • eoUF< double &, bool > [external] -
  • eoUF< EOT &, bool > +
  • eoUF< EOT &, bool > [external] -
  • eoUF< EOT &, void > +
  • eoUF< EOT &, void > [external] +
  • eoUF< EOType &, bool > + [external] +
  • eoUF< eoVector< float, unsigned int > &, void > + [external] +
  • eoUF< M &, void > [external] -
  • eoUF< M::EOType &, bool > +
  • eoUF< M::EOType &, bool > [external] - -
  • eoOp< EOType > +
  • eoUF< TwoOpt &, void > [external] +
  • moRandMove< TwoOpt > + -
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + + +
  • eoOp< EOType > + [external] +
  • eoPrintable + [external] + +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/hill__climbing_8cpp-source.html b/trunk/paradiseo-mo/doc/html/hill__climbing_8cpp-source.html index e1873394a..969b5fc7f 100644 --- a/trunk/paradiseo-mo/doc/html/hill__climbing_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/hill__climbing_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: hill_climbing.cpp Source File - +
    -
    -

    hill_climbing.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "hill_climbing.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <mo.h>
-00013 
-00014 #include <graph.h>
-00015 #include <route.h>
-00016 #include <route_eval.h>
-00017 #include <route_init.h>
-00018 
-00019 #include <two_opt.h>
-00020 #include <two_opt_init.h>
-00021 #include <two_opt_next.h>
-00022 #include <two_opt_incr_eval.h>
-00023 
-00024 int
-00025 main (int __argc, char * __argv []) 
-00026 {
-00027   if (__argc != 2) {
-00028     
-00029     std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl ;
-00030     return 1 ;
-00031   }
-00032 
-00033   srand (1000) ;
-00034 
-00035   Graph :: load (__argv [1]) ; // Instance
+
    +

    hill_climbing.cpp

    00001 /* 
+00002 * <hill_climbing.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00037   Route route ; // Solution
-00038   
-00039   RouteInit init ; // Sol. Random Init.
-00040   init (route) ;
-00041 
-00042   RouteEval full_eval ; // Full. Eval.
-00043   full_eval (route) ;
-00044   
-00045   std :: cout << "[From] " << route << std :: endl ;
-00046 
-00047   /* Tools for an efficient (? :-))
-00048      local search ! */
-00049   
-00050   TwoOptInit two_opt_init ; // Init.
-00051    
-00052   TwoOptNext two_opt_next ; // Explorer.
-00053   
-00054   TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
-00055   
-00056   //moFirstImprSelect <TwoOpt> two_opt_select ;
-00057   moBestImprSelect <TwoOpt> two_opt_select ;
-00058   //moRandImprSelect <TwoOpt> two_opt_select ;
+00037 #include <mo.h>
+00038 
+00039 #include <graph.h>
+00040 #include <route.h>
+00041 #include <route_eval.h>
+00042 #include <route_init.h>
+00043 
+00044 #include <two_opt.h>
+00045 #include <two_opt_init.h>
+00046 #include <two_opt_next.h>
+00047 #include <two_opt_incr_eval.h>
+00048 
+00049 int
+00050 main (int __argc, char * __argv []) 
+00051 {
+00052   if (__argc != 2) {
+00053     
+00054     std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl ;
+00055     return 1 ;
+00056   }
+00057 
+00058   srand (1000) ;
 00059 
-00060   moHC <TwoOpt> hill_climbing (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, full_eval) ;
-00061   hill_climbing (route) ;
-00062 
-00063   std :: cout << "[To] " << route << std :: endl ;
-00064 
-00065   return 0 ;
-00066 }
-00067 
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00060 Graph :: load (__argv [1]) ; // Instance +00061 +00062 Route route ; // Solution +00063 +00064 RouteInit init ; // Sol. Random Init. +00065 init (route) ; +00066 +00067 RouteEval full_eval ; // Full. Eval. +00068 full_eval (route) ; +00069 +00070 std :: cout << "[From] " << route << std :: endl ; +00071 +00072 /* Tools for an efficient (? :-)) +00073 local search ! */ +00074 +00075 TwoOptInit two_opt_init ; // Init. +00076 +00077 TwoOptNext two_opt_next ; // Explorer. +00078 +00079 TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. +00080 +00081 //moFirstImprSelect <TwoOpt> two_opt_select ; +00082 moBestImprSelect <TwoOpt> two_opt_select ; +00083 //moRandImprSelect <TwoOpt> two_opt_select ; +00084 +00085 moHC <TwoOpt> hill_climbing (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, full_eval) ; +00086 hill_climbing (route) ; +00087 +00088 std :: cout << "[To] " << route << std :: endl ; +00089 +00090 return 0 ; +00091 } +00092 +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/index.html b/trunk/paradiseo-mo/doc/html/index.html index 7a92d1781..33979cfb8 100644 --- a/trunk/paradiseo-mo/doc/html/index.html +++ b/trunk/paradiseo-mo/doc/html/index.html @@ -1,11 +1,8 @@ - -PARADISEO-MO + +ParadisEO-MOMovingObjects - - <a href="main.html">Frames are disabled. Click here to go to the main page.</a> - diff --git a/trunk/paradiseo-mo/doc/html/index_8h-source.html b/trunk/paradiseo-mo/doc/html/index_8h-source.html index dca6ead7b..92d9fc12c 100644 --- a/trunk/paradiseo-mo/doc/html/index_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/index_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: index.h Source File + +ParadisEO-MOMovingObjects: index.h Source File - +
    -
    +

    index.h

    00001 
-00034 // coding: iso-8859-1
-00035 // mode: C++
-00036 // c-file-style: "Stroustrup"
-00037 // fill-column: 80
-00038 // End:
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +00062 // coding: iso-8859-1 +00063 // mode: C++ +00064 // c-file-style: "Stroustrup" +00065 // fill-column: 80 +00066 // End: +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/iterated__local__search_8cpp-source.html b/trunk/paradiseo-mo/doc/html/iterated__local__search_8cpp-source.html index e0630677c..eea739b25 100644 --- a/trunk/paradiseo-mo/doc/html/iterated__local__search_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/iterated__local__search_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: iterated_local_search.cpp Source File - +
    -
    +

    iterated_local_search.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "iterated_local_search.cpp"
@@ -45,81 +44,55 @@
 00020 #include <two_opt_init.h>
 00021 #include <two_opt_next.h>
 00022 #include <two_opt_incr_eval.h>
-00023 #include <two_opt_tabu_list.h>
-00024 #include <two_opt_rand.h>
+00023 
+00024 #include <city_swap.h>
 00025 
-00026 #include <city_swap.h>
-00027 
-00028 int
-00029 main (int __argc, char * __argv []) 
-00030 {
-00031   if (__argc != 2) 
-00032     {
-00033       std :: cerr << "Usage : ./iterated_local_search [instance]" << std :: endl ;
-00034       return 1 ;
-00035     }
-00036   
-00037   Graph :: load (__argv [1]) ; // Instance
-00038 
-00039   Route route ; // Solution
-00040   
-00041   RouteInit init ; // Sol. Random Init.
-00042   init (route) ;
-00043 
-00044   RouteEval full_eval ; // Full. Eval.
-00045   full_eval (route) ;
+00026 int
+00027 main (int __argc, char * __argv []) 
+00028 {
+00029   if (__argc != 2) 
+00030     {
+00031       std :: cerr << "Usage : ./iterated_local_search [instance]" << std :: endl ;
+00032       return 1 ;
+00033     }
+00034   
+00035   Graph :: load (__argv [1]) ; // Instance
+00036 
+00037   Route route ; // Solution
+00038   
+00039   RouteInit init ; // Sol. Random Init.
+00040   init (route) ;
+00041 
+00042   RouteEval full_eval ; // Full. Eval.
+00043   full_eval (route) ;
+00044   
+00045   std :: cout << "[From] " << route << std :: endl ;
 00046   
-00047   std :: cout << "[From] " << route << std :: endl ;
-00048   
-00049   /* Tools for an efficient (? :-))
-00050      local search ! */
-00051 
-00052   TwoOptInit two_opt_init ; // Init.
-00053    
-00054   TwoOptNext two_opt_next ; // Explorer.
-00055   
-00056   TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
-00057   
-00058   moBestImprSelect <TwoOpt> two_opt_select ;
-00059   
-00060   //moHC<TwoOpt> hill_climbing (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, full_eval) ;
-00061     
-00062   moGenSolContinue <Route> cont (1000) ; 
-00063   
-00064   moFitComparator<Route> comparator;
-00065 
-00066   CitySwap perturbation;
-00067 
-00068   //moILS<TwoOpt> iterated_local_search (hill_climbing, cont, comparator, perturbation, full_eval) ;
-00069   //moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, 
-00070   //                           two_opt_select, cont, comparator, perturbation, full_eval) ;
-00071   
-00072   moGenSolContinue <Route> ts_cont (100) ; 
-00073 
-00074   TwoOptTabuList tabu_list ; // Tabu List
-00075   moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion
-00076 
-00077   //moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, ts_cont, 
-00078   //                                   cont, comparator, perturbation, full_eval) ;
-00079   
-00080   TwoOptRand two_opt_rand ; // Route Random. Gen.
-00081 
-00082   moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule 
-00083   
-00084   moGenSolContinue <Route> sa_cont (100) ; 
-00085 
-00086   moILS<TwoOpt> iterated_local_search (two_opt_rand, two_opt_incr_eval, sa_cont, 100, cool_sched,
-00087                                        cont, comparator, perturbation, full_eval) ;
-00088 
-00089   iterated_local_search(route) ;
-00090 
-00091   std :: cout << "[To] " << route << std :: endl ;
-00092   
-00093   return 0 ;
-00094 }
-00095 
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00047 TwoOptInit two_opt_init ; // Init. +00048 +00049 TwoOptNext two_opt_next ; // Explorer. +00050 +00051 TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. +00052 +00053 moBestImprSelect <TwoOpt> two_opt_select ; //Move selection +00054 +00055 moGenSolContinue <Route> cont (1000) ; //Stopping criterion +00056 +00057 moFitComparator<Route> comparator; // Route comparator +00058 +00059 CitySwap perturbation; // Route perturbation +00060 +00061 moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, +00062 cont, comparator, perturbation, full_eval) ; +00063 iterated_local_search(route) ; +00064 +00065 std :: cout << "[To] " << route << std :: endl ; +00066 +00067 return 0 ; +00068 } +00069 +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/main.html b/trunk/paradiseo-mo/doc/html/main.html index 40ad76419..bfead2f0f 100644 --- a/trunk/paradiseo-mo/doc/html/main.html +++ b/trunk/paradiseo-mo/doc/html/main.html @@ -1,13 +1,14 @@ - -PARADISEO-MO: Welcome to PARADISEO-Moving Objects + +ParadisEO-MOMovingObjects: Welcome to PARADISEO-Moving Objects - +
    -
    +

    Welcome to PARADISEO-Moving Objects

    -

    0.1

    +

    1.0

    Introduction

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

    AUTHORS

    @@ -37,12 +37,15 @@ AUTHORS

    LICENCE

    -

    +This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the CeCILL license as circulated by CEA, CNRS and INRIA at the following URL "http://www.cecill.info".

    +As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability.

    +In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security. The fact that you are presently reading this means that you have had knowledge of the CeCILL license and that you accept its terms.

    +ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr

    Home Page

    http://paradiseo.gforge.inria.fr

    Installation

    -The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mix_8h-source.html b/trunk/paradiseo-mo/doc/html/mix_8h-source.html index 4fd1e5870..776356a42 100644 --- a/trunk/paradiseo-mo/doc/html/mix_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mix_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: mix.h Source File - +
    -
    -

    mix.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "mix.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef mix_h
-00013 #define mix_h
-00014 
-00015 #include <utils/eoRNG.h>
-00016 
-00017 template <class T> void mix (std :: vector <T> & __vect) 
-00018 {
-00019   for (unsigned int i = 0 ; i < __vect.size () ; i ++)   
-00020     {
-00021       std :: swap (__vect [i], __vect [rng.random (__vect.size ())]) ;
-00022     }
-00023 }
-00024 
-00025 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    mix.h

    00001 /* 
+00002 * <mix.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef mix_h
+00038 #define mix_h
+00039 
+00040 #include <utils/eoRNG.h>
+00041 
+00042 template <class T> void mix (std :: vector <T> & __vect) 
+00043 {
+00044   for (unsigned int i = 0 ; i < __vect.size () ; i ++)   
+00045     {
+00046       std :: swap (__vect [i], __vect [rng.random (__vect.size ())]) ;
+00047     }
+00048 }
+00049 
+00050 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/mo_8h-source.html b/trunk/paradiseo-mo/doc/html/mo_8h-source.html index deeb5f311..2132d3dca 100644 --- a/trunk/paradiseo-mo/doc/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: mo.h Source File + +ParadisEO-MOMovingObjects: mo.h Source File - +
    -
    -

    mo.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "mo.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __mo_h
-00013 #define __mo_h
-00014 
-00015 #include "moAlgo.h"
-00016 #include "moAspirCrit.h"
-00017 #include "moBestImprSelect.h"
-00018 #include "moComparator.h"
-00019 #include "moCoolingSchedule.h"
-00020 #include "moExponentialCoolingSchedule.h"
-00021 #include "moFirstImprSelect.h"
-00022 #include "moFitComparator.h"
-00023 #include "moGenSolContinue.h"
-00024 #include "moHC.h"
-00025 #include "moHCMoveLoopExpl.h"
-00026 #include "moImprBestFitAspirCrit.h"
-00027 #include "moILS.h"
-00028 #include "moItRandNextMove.h"
-00029 #include "moLinearCoolingSchedule.h"
-00030 #include "moLSCheckPoint.h"
-00031 #include "moMoveExpl.h"
-00032 #include "moMove.h"
-00033 #include "moMoveIncrEval.h"
-00034 #include "moMoveInit.h"
-00035 #include "moMoveLoopExpl.h"
-00036 #include "moMoveSelect.h"
-00037 #include "moNextMove.h"
-00038 #include "moNoAspirCrit.h"
-00039 #include "moRandImprSelect.h"
-00040 #include "moRandMove.h"
-00041 #include "moSA.h"
-00042 #include "moSimpleMoveTabuList.h"
-00043 #include "moSimpleSolutionTabuList.h"
-00044 #include "moSolContinue.h"
-00045 #include "moTabuList.h"
-00046 #include "moTS.h"
-00047 #include "moTSMoveLoopExpl.h"
-00048 
-00049 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  + +

    mo.h

    00001 /* 
+00002 * <mo.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __mo_h
+00038 #define __mo_h
+00039 
+00040 #include "moAlgo.h"
+00041 #include "moAspirCrit.h"
+00042 #include "moBestImprSelect.h"
+00043 #include "moCoolingSchedule.h"
+00044 #include "moExponentialCoolingSchedule.h"
+00045 #include "moFirstImprSelect.h"
+00046 #include "moGenSolContinue.h"
+00047 #include "moHC.h"
+00048 #include "moHCMoveLoopExpl.h"
+00049 #include "moImprBestFitAspirCrit.h"
+00050 #include "moItRandNextMove.h"
+00051 #include "moLinearCoolingSchedule.h"
+00052 #include "moLSCheckPoint.h"
+00053 #include "moMoveExpl.h"
+00054 #include "moMove.h"
+00055 #include "moMoveIncrEval.h"
+00056 #include "moMoveInit.h"
+00057 #include "moMoveLoopExpl.h"
+00058 #include "moMoveSelect.h"
+00059 #include "moNextMove.h"
+00060 #include "moNoAspirCrit.h"
+00061 #include "moRandImprSelect.h"
+00062 #include "moRandMove.h"
+00063 #include "moSA.h"
+00064 #include "moSimpleMoveTabuList.h"
+00065 #include "moSimpleSolutionTabuList.h"
+00066 #include "moSolContinue.h"
+00067 #include "moTabuList.h"
+00068 #include "moTS.h"
+00069 #include "moTSMoveLoopExpl.h"
+00070 
+00071 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 7777481e1..f1d5cf02f 100644 --- a/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_algo_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: moAlgo.h Source File + +ParadisEO-MOMovingObjects: moAlgo.h Source File - +
    -
    -

    moAlgo.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moAlgo.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moAlgo_h
-00013 #define __moAlgo_h
-00014 
-00015 #include <eoOp.h>
-00016 
-00018 
-00021 template < class EOT > class moAlgo:public eoMonOp < EOT >
-00022 {
-00023 
-00024 };
-00025 
-00026 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  + +

    moAlgo.h

    00001 /* 
+00002 * <moAlgo.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moAlgo_h
+00038 #define __moAlgo_h
+00039 
+00040 #include <eoOp.h>
+00041 
+00043 
+00046 template < class EOT > class moAlgo:public eoMonOp < EOT >
+00047 {
+00048 
+00049 };
+00050 
+00051 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 70e9f19e6..19c534696 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moAspirCrit.h Source File + +ParadisEO-MOMovingObjects: moAspirCrit.h Source File - +
    -
    -

    moAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moAspirCrit.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moAspirCrit_h
-00013 #define __moAspirCrit_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename
-00023   M::EOType::Fitness &,
-00024   bool >
-00025 {
-00026 
-00027 public:
-00029 
-00032   virtual void
-00033   init () = 0;
-00034 
-00035 };
+
    +

    moAspirCrit.h

    00001 /* 
+00002 * <moAspirCrit.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00037 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +00037 #ifndef __moAspirCrit_h +00038 #define __moAspirCrit_h +00039 +00040 #include <eoFunctor.h> +00041 +00043 +00047 template < class M > class moAspirCrit:public eoBF < const M &, const typename +00048 M::EOType::Fitness &, +00049 bool > +00050 { +00051 +00052 public: +00054 +00057 virtual void +00058 init () = 0; +00059 +00060 }; +00061 +00062 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 e0c13c2c5..24f09ec0b 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moBestImprSelect.h Source File + +ParadisEO-MOMovingObjects: moBestImprSelect.h Source File - +
    -
    -

    moBestImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moBestImprSelect.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moBestImprSelect_h
-00013 #define __moBestImprSelect_h
-00014 
-00015 #include "moMoveSelect.h"
-00016 
-00018 
-00022 template < class M > class moBestImprSelect:public moMoveSelect < M >
-00023 {
-00024 
-00025 public:
-00026 
-00028   typedef typename M::EOType::Fitness Fitness;
-00029 
-00031   void init (const Fitness & __fit)
-00032   {
-00033 
-00034     first_time = true;
-00035   }
+
    +

    moBestImprSelect.h

    00001 /* 
+00002 * <moBestImprSelect.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00037 
-00039 
-00047   bool update (const M & __move, const Fitness & __fit)
-00048   {
+00037 #ifndef __moBestImprSelect_h
+00038 #define __moBestImprSelect_h
+00039 
+00040 #include "moMoveSelect.h"
+00041 
+00043 
+00047 template < class M > class moBestImprSelect:public moMoveSelect < M >
+00048 {
 00049 
-00050     if (first_time || __fit > best_fit)
-00051       {
-00052 
-00053         best_fit = __fit;
-00054         best_move = __move;
-00055 
-00056         first_time = false;
-00057       }
+00050 public:
+00051 
+00053   typedef typename M::EOType::Fitness Fitness;
+00054 
+00056   void init (const Fitness & __fit)
+00057   {
 00058 
-00059     return true;
+00059     first_time = true;
 00060   }
 00061 
-00063 
-00068   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
-00069   {
-00070 
-00071     if (!first_time)
-00072       {
-00073         __move = best_move;
-00074         __fit = best_fit;
-00075       }
-00076     else
-00077       throw EmptySelection ();
-00078   }
-00079 
-00080 private:
-00081 
-00083   bool first_time;
-00084 
-00086   M best_move;
-00087 
-00089   Fitness best_fit;
-00090 
-00091 };
-00092 
-00093 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +00062 +00064 +00072 bool update (const M & __move, const Fitness & __fit) +00073 { +00074 +00075 if (first_time || __fit > best_fit) +00076 { +00077 +00078 best_fit = __fit; +00079 best_move = __move; +00080 +00081 first_time = false; +00082 } +00083 +00084 return true; +00085 } +00086 +00088 +00093 void operator () (M & __move, Fitness & __fit) throw (EmptySelection) +00094 { +00095 +00096 if (!first_time) +00097 { +00098 __move = best_move; +00099 __fit = best_fit; +00100 } +00101 else +00102 throw EmptySelection (); +00103 } +00104 +00105 private: +00106 +00108 bool first_time; +00109 +00111 M best_move; +00112 +00114 Fitness best_fit; +00115 +00116 }; +00117 +00118 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 594aa03a5..a75a5b3e8 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moCoolingSchedule.h Source File + +ParadisEO-MOMovingObjects: moCoolingSchedule.h Source File - +
    -
    -

    moCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moCoolingSchedule.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2007
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moCoolingSchedule_h
-00013 #define __moCoolingSchedule_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 class moCoolingSchedule:public eoUF < double &, bool >
-00023 {
-00024 
-00025 };
-00026 
-00027 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  + +

    moCoolingSchedule.h

    00001 /* 
+00002 * <moCoolingSchedule.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moCoolingSchedule_h
+00038 #define __moCoolingSchedule_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00047 class moCoolingSchedule:public eoUF < double &, bool >
+00048 {
+00049 
+00050 };
+00051 
+00052 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 e058f3d4f..1d2c0cda7 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moExponentialCoolingSchedule.h Source File + +ParadisEO-MOMovingObjects: moExponentialCoolingSchedule.h Source File - +
    -
    -

    moExponentialCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moExponentialCoolingSchedule.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2007
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moExponentialCoolingSchedule_h
-00013 #define __moExponentialCoolingSchedule_h
-00014 
-00015 #include "moCoolingSchedule.h"
-00016 
-00018 
-00022 class moExponentialCoolingSchedule: public moCoolingSchedule
-00023 {
-00024 
-00025 public:
-00027 
-00031   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
-00032   {}
-00033 
-00035 
-00041   bool operator() (double &__temp)
-00042   {
-00043     return (__temp *= ratio) > threshold;
-00044   }
-00045 
-00046 private:
-00047 
-00049   double threshold;
-00050 
-00052   double ratio;
-00053 };
-00054 
-00055 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  + +

    moExponentialCoolingSchedule.h

    00001 /* 
+00002 * <moExponentialCoolingSchedule.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moExponentialCoolingSchedule_h
+00038 #define __moExponentialCoolingSchedule_h
+00039 
+00040 #include "moCoolingSchedule.h"
+00041 
+00043 
+00047 class moExponentialCoolingSchedule: public moCoolingSchedule
+00048 {
+00049 
+00050 public:
+00052 
+00056   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
+00057   {}
+00058 
+00060 
+00066   bool operator() (double &__temp)
+00067   {
+00068     return (__temp *= ratio) > threshold;
+00069   }
+00070 
+00071 private:
+00072 
+00074   double threshold;
+00075 
+00077   double ratio;
+00078 };
+00079 
+00080 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 412ffbcba..75f042b5b 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moFirstImprSelect.h Source File + +ParadisEO-MOMovingObjects: moFirstImprSelect.h Source File - +
    -
    -

    moFirstImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moFirstImprSelect.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moFirstImprSelect_h
-00013 #define __moFirstImprSelect_h
-00014 
-00015 #include "moMoveSelect.h"
-00016 
-00018 
-00023 template < class M > class moFirstImprSelect:public moMoveSelect < M >
-00024 {
-00025 
-00026 public:
-00027 
-00029   typedef typename M::EOType::Fitness Fitness;
-00030 
-00032 
-00035   virtual void init (const Fitness & __fit)
-00036   {
-00037 
-00038     valid = false;
-00039     init_fit = __fit;
-00040   }
+
    +

    moFirstImprSelect.h

    00001 /* 
+00002 * <moFirstImprSelect.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moFirstImprSelect_h
+00038 #define __moFirstImprSelect_h
+00039 
+00040 #include "moMoveSelect.h"
 00041 
-00042 
-00044 
-00052   bool update (const M & __move, const typename M::EOType::Fitness & __fit)
-00053   {
-00054 
-00055     if (__fit > init_fit)
-00056       {
+00043 
+00048 template < class M > class moFirstImprSelect:public moMoveSelect < M >
+00049 {
+00050 
+00051 public:
+00052 
+00054   typedef typename M::EOType::Fitness Fitness;
+00055 
 00057 
-00058         best_fit = __fit;
-00059         best_move = __move;
-00060         valid = true;
-00061 
-00062         return false;
-00063       }
-00064     else
-00065       {
-00066         return true;
-00067       }
-00068   }
+00060   virtual void init (const Fitness & __fit)
+00061   {
+00062 
+00063     valid = false;
+00064     init_fit = __fit;
+00065   }
+00066 
+00067 
 00069 
-00071 
-00076   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
-00077   {
-00078 
-00079     if (valid)
-00080       {
-00081         __move = best_move;
-00082         __fit = best_fit;
-00083       }
-00084     else
-00085       throw EmptySelection ();
-00086   }
-00087 
-00088 private:
-00089 
-00091   bool valid;
-00092 
-00094   M best_move;
-00095 
-00097   Fitness init_fit;
-00098 
-00100   Fitness best_fit;
-00101 
-00102 };
+00077   bool update (const M & __move, const typename M::EOType::Fitness & __fit)
+00078   {
+00079 
+00080     if (__fit > init_fit)
+00081       {
+00082 
+00083         best_fit = __fit;
+00084         best_move = __move;
+00085         valid = true;
+00086 
+00087         return false;
+00088       }
+00089     else
+00090       {
+00091         return true;
+00092       }
+00093   }
+00094 
+00096 
+00101   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
+00102   {
 00103 
-00104 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +00104 if (valid) +00105 { +00106 __move = best_move; +00107 __fit = best_fit; +00108 } +00109 else +00110 throw EmptySelection (); +00111 } +00112 +00113 private: +00114 +00116 bool valid; +00117 +00119 M best_move; +00120 +00122 Fitness init_fit; +00123 +00125 Fitness best_fit; +00126 +00127 }; +00128 +00129 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 index bbaca23a3..5aceac42d 100644 --- 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moFitSolContinue.h Source File + +ParadisEO-MOMovingObjects: 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 
-00033   moFitSolContinue (Fitness __fitness): fitness (__fitness)
-00034   {}
-00035 
-00037 
-00043   bool operator   () (const EOT & __sol)
-00044   {
-00045     if(__sol.invalid())
-00046       {
-00047         return true;
-00048       }
-00049 
-00050     return __sol.fitness() < fitness;
-00051   }
-00052 
-00054 
-00057   void init ()
-00058   {}
-00059 
-00060 private:
-00061 
-00063   Fitness fitness;
-00064 };
-00065 
-00066 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  + +

    moFitSolContinue.h

    00001 /* 
+00002 * <moFitSolContinue.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moFitSolContinue_h
+00038 #define __moFitSolContinue_h
+00039 
+00040 #include "moSolContinue.h"
+00041 
+00043 
+00046 template < class EOT > class moFitSolContinue:public moSolContinue < EOT >
+00047 {
+00048 
+00049 public:
+00050 
+00052   typedef typename EOT::Fitness Fitness;
+00053 
+00055 
+00058   moFitSolContinue (Fitness __fitness): fitness (__fitness)
+00059   {}
+00060 
+00062 
+00068   bool operator   () (const EOT & __sol)
+00069   {
+00070     if(__sol.invalid())
+00071       {
+00072         return true;
+00073       }
+00074 
+00075     return __sol.fitness() < fitness;
+00076   }
+00077 
+00079 
+00082   void init ()
+00083   {}
+00084 
+00085 private:
+00086 
+00088   Fitness fitness;
+00089 };
+00090 
+00091 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 706074a0a..cd9a83b65 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moGenSolContinue.h Source File + +ParadisEO-MOMovingObjects: moGenSolContinue.h Source File - +
    -
    -

    moGenSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "eoGenSolContinue.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moGenSolContinue_h
-00013 #define __moGenSolContinue_h
-00014 
-00015 #include "moSolContinue.h"
-00016 
-00018 
-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   {
-00032 
-00033   }
-00034 
+
    +

    moGenSolContinue.h

    00001 /* 
+00002 * <moGenSolContinue.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00044   bool operator   () (const EOT & __sol)
-00045   {
-00046 
-00047     return (++numGen < maxNumGen);
-00048   }
-00049 
-00051 
-00054   void init ()
-00055   {
-00056 
-00057     numGen = 0;
+00037 #ifndef __moGenSolContinue_h
+00038 #define __moGenSolContinue_h
+00039 
+00040 #include "moSolContinue.h"
+00041 
+00043 
+00046 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
+00047 {
+00048 
+00049 public:
+00050 
+00052 
+00055   moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
+00056   {
+00057 
 00058   }
 00059 
-00060 private:
 00061 
-00063   unsigned int maxNumGen;
-00064 
-00066   unsigned int numGen;
-00067 };
-00068 
-00069 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +00069 bool operator () (const EOT & __sol) +00070 { +00071 +00072 return (++numGen < maxNumGen); +00073 } +00074 +00076 +00079 void init () +00080 { +00081 +00082 numGen = 0; +00083 } +00084 +00085 private: +00086 +00088 unsigned int maxNumGen; +00089 +00091 unsigned int numGen; +00092 }; +00093 +00094 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 29c5dc60c..6b0dad3c8 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moHC.h Source File + +ParadisEO-MOMovingObjects: moHC.h Source File - +
    -
    -

    moHC.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moHC.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moHC_h
-00013 #define __moHC_h
-00014 
-00015 #include <eoEvalFunc.h>
-00016 
-00017 #include "moAlgo.h"
-00018 #include "moMoveExpl.h"
-00019 #include "moHCMoveLoopExpl.h"
-00020 
-00022 
-00025 template < class M > class moHC:public moAlgo < typename M::EOType >
-00026 {
-00027 
-00029   typedef
-00030     typename
-00031     M::EOType
-00032     EOT;
-00033 
-00035   typedef
-00036     typename
-00037     EOT::Fitness
-00038     Fitness;
-00039 
-00040 public:
+
    +

    moHC.h

    00001 /* 
+00002 * <moHC.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moHC_h
+00038 #define __moHC_h
+00039 
+00040 #include <eoEvalFunc.h>
 00041 
-00043 
-00052 moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
-00053              (__move_init, __next_move, __incr_eval, __move_select)),
-00054     full_eval (__full_eval)
-00055   {
-00056 
-00057   }
+00042 #include "moAlgo.h"
+00043 #include "moMoveExpl.h"
+00044 #include "moHCMoveLoopExpl.h"
+00045 
+00047 
+00050 template < class M > class moHC:public moAlgo < typename M::EOType >
+00051 {
+00052 
+00054   typedef
+00055     typename
+00056     M::EOType
+00057     EOT;
 00058 
-00060 
-00066 moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
-00067     full_eval
-00068     (__full_eval)
-00069   {
-00070 
-00071   }
-00072 
-00074 
-00081   bool operator   ()(EOT & __sol)
-00082   {
+00060   typedef
+00061     typename
+00062     EOT::Fitness
+00063     Fitness;
+00064 
+00065 public:
+00066 
+00068 
+00077 moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
+00078              (__move_init, __next_move, __incr_eval, __move_select)),
+00079     full_eval (__full_eval)
+00080   {
+00081 
+00082   }
 00083 
-00084     if (__sol.invalid ())
-00085       {
-00086         full_eval (__sol);
-00087       }
-00088 
-00089     EOT new_sol;
-00090 
-00091     do
-00092       {
-00093 
-00094         new_sol = __sol;
+00085 
+00091 moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
+00092     full_eval
+00093     (__full_eval)
+00094   {
 00095 
-00096         try
-00097         {
-00098 
-00099           move_expl (__sol, new_sol);
-00100 
-00101         }
-00102         catch (EmptySelection & __ex)
-00103         {
-00104 
-00105           break;
-00106         }
-00107 
-00108         if (new_sol.fitness () > __sol.fitness ())
-00109           {
-00110             __sol = new_sol;
-00111           }
-00112         else
-00113           {
-00114             break;
-00115           }
-00116 
-00117       }
-00118     while (true);
-00119 
-00120     return true;
-00121   }
-00122 
-00123 private:
-00124 
-00126   moMoveExpl < M > &move_expl;
-00127 
-00129   eoEvalFunc < EOT > &full_eval;
-00130 };
-00131 
-00132 #endif
-
    Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by  +00096 } +00097 +00099 +00106 bool operator ()(EOT & __sol) +00107 { +00108 +00109 if (__sol.invalid ()) +00110 { +00111 full_eval (__sol); +00112 } +00113 +00114 EOT new_sol; +00115 +00116 do +00117 { +00118 +00119 new_sol = __sol; +00120 +00121 try +00122 { +00123 +00124 move_expl (__sol, new_sol); +00125 +00126 } +00127 catch (EmptySelection & __ex) +00128 { +00129 +00130 break; +00131 } +00132 +00133 if (new_sol.fitness () > __sol.fitness ()) +00134 { +00135 __sol = new_sol; +00136 } +00137 else +00138 { +00139 break; +00140 } +00141 +00142 } +00143 while (true); +00144 +00145 return true; +00146 } +00147 +00148 private: +00149 +00151 moMoveExpl < M > &move_expl; +00152 +00154 eoEvalFunc < EOT > &full_eval; +00155 }; +00156 +00157 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 0b8948e73..5fc6332fb 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moHCMoveLoopExpl.h Source File + +ParadisEO-MOMovingObjects: moHCMoveLoopExpl.h Source File - +
    -
    -

    moHCMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moHCMoveLoopExpl.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moHCMoveLoopExpl_h
-00013 #define __moHCMoveLoopExpl_h
-00014 
-00015 #include "moMoveLoopExpl.h"
-00016 
-00017 #include "moMoveInit.h"
-00018 #include "moNextMove.h"
-00019 #include "moMoveIncrEval.h"
-00020 #include "moMoveSelect.h"
-00021 
-00023 template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M >
-00024 {
-00025 
-00027   typedef typename M::EOType EOT;
-00028 
-00030   typedef typename M::EOType::Fitness Fitness;
-00031 
-00032 public:
-00033 
-00035 
-00043 moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
-00044 
-00045   move_init (__move_init),
-00046     next_move (__next_move),
-00047     incr_eval (__incr_eval), move_select (__move_select)
-00048   {
-00049 
-00050   }
-00051 
+
    +

    moHCMoveLoopExpl.h

    00001 /* 
+00002 * <moHCMoveLoopExpl.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moHCMoveLoopExpl_h
+00038 #define __moHCMoveLoopExpl_h
+00039 
+00040 #include "moMoveLoopExpl.h"
+00041 
+00042 #include "moMoveInit.h"
+00043 #include "moNextMove.h"
+00044 #include "moMoveIncrEval.h"
+00045 #include "moMoveSelect.h"
+00046 
+00048 template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M >
+00049 {
+00050 
+00052   typedef typename M::EOType EOT;
 00053 
-00059   void operator   () (const EOT & __old_sol, EOT & __new_sol)
-00060   {
-00061 
-00062     M move;
-00063 
-00064     //
-00065     move_init (move, __old_sol);        /* Restarting the exploration of 
-00066                                            of the neighborhood ! */
-00067 
-00068     move_select.init (__old_sol.fitness ());
+00055   typedef typename M::EOType::Fitness Fitness;
+00056 
+00057 public:
+00058 
+00060 
+00068 moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
 00069 
-00070     while (move_select.update (move, incr_eval (move, __old_sol))
-00071            && next_move (move, __old_sol));
-00072 
-00073     try
-00074     {
-00075 
-00076       M best_move;
-00077 
-00078       Fitness best_move_fit;
-00079 
-00080       move_select (best_move, best_move_fit);
-00081       __new_sol.fitness (best_move_fit);
-00082       best_move (__new_sol);
-00083 
-00084     }
-00085     catch (EmptySelection & __ex)
-00086     {
-00087 
-00088       // ?
-00089     }
-00090   }
-00091 
-00092 private:
-00093 
-00095   moMoveInit < M > &move_init;
-00096 
-00098   moNextMove < M > &next_move;
-00099 
-00101   moMoveIncrEval < M > &incr_eval;
+00070   move_init (__move_init),
+00071     next_move (__next_move),
+00072     incr_eval (__incr_eval), move_select (__move_select)
+00073   {
+00074 
+00075   }
+00076 
+00078 
+00084   void operator   () (const EOT & __old_sol, EOT & __new_sol)
+00085   {
+00086 
+00087     M move;
+00088 
+00089     //
+00090     move_init (move, __old_sol);        /* Restarting the exploration of 
+00091                                            of the neighborhood ! */
+00092 
+00093     move_select.init (__old_sol.fitness ());
+00094 
+00095     while (move_select.update (move, incr_eval (move, __old_sol))
+00096            && next_move (move, __old_sol));
+00097 
+00098     try
+00099     {
+00100 
+00101       M best_move;
 00102 
-00104   moMoveSelect < M > &move_select;
-00105 
-00106 };
-00107 
-00108 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00103 Fitness best_move_fit; +00104 +00105 move_select (best_move, best_move_fit); +00106 __new_sol.fitness (best_move_fit); +00107 best_move (__new_sol); +00108 +00109 } +00110 catch (EmptySelection & __ex) +00111 { +00112 +00113 // ? +00114 } +00115 } +00116 +00117 private: +00118 +00120 moMoveInit < M > &move_init; +00121 +00123 moNextMove < M > &next_move; +00124 +00126 moMoveIncrEval < M > &incr_eval; +00127 +00129 moMoveSelect < M > &move_select; +00130 +00131 }; +00132 +00133 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 8b3ee9852..ee0de8202 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moImprBestFitAspirCrit.h Source File + +ParadisEO-MOMovingObjects: moImprBestFitAspirCrit.h Source File - +
    -
    -

    moImprBestFitAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moImprAspirCrit.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moImprBestFitAspirCrit_h
-00013 #define __moImprBestFitAspirCrit_h
-00014 
-00015 #include "moAspirCrit.h"
-00016 
-00018 
-00022 template < class M > class moImprBestFitAspirCrit:public moAspirCrit < M >
-00023 {
-00024 
-00025 public:
-00026 
-00028   typedef typename M::EOType::Fitness Fitness;
-00029 
-00031   moImprBestFitAspirCrit ()
-00032   {
-00033 
-00034     first_time = true;
-00035   }
+
    +

    moImprBestFitAspirCrit.h

    00001 /* 
+00002 * <moImprBestFitAspirCrit.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00038   void init ()
-00039   {
-00040 
-00041     first_time = true;
-00042   }
+00037 #ifndef __moImprBestFitAspirCrit_h
+00038 #define __moImprBestFitAspirCrit_h
+00039 
+00040 #include "moAspirCrit.h"
+00041 
 00043 
-00045 
-00052   bool operator   () (const M & __move, const Fitness & __fit)
-00053   {
+00047 template < class M > class moImprBestFitAspirCrit:public moAspirCrit < M >
+00048 {
+00049 
+00050 public:
+00051 
+00053   typedef typename M::EOType::Fitness Fitness;
 00054 
-00055     if (first_time)
-00056       {
-00057 
-00058         best_fit = __fit;
-00059         first_time = false;
-00060 
-00061         return true;
-00062       }
-00063     else if (__fit < best_fit)
-00064       return false;
+00056   moImprBestFitAspirCrit ()
+00057   {
+00058 
+00059     first_time = true;
+00060   }
+00061 
+00063   void init ()
+00064   {
 00065 
-00066     else
-00067       {
+00066     first_time = true;
+00067   }
 00068 
-00069         best_fit = __fit;
 00070 
-00071         return true;
-00072       }
-00073   }
-00074 
-00075 private:
-00076 
-00078   Fitness best_fit;
+00077   bool operator   () (const M & __move, const Fitness & __fit)
+00078   {
 00079 
-00081   bool first_time;
-00082 };
-00083 
-00084 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00080 if (first_time) +00081 { +00082 +00083 best_fit = __fit; +00084 first_time = false; +00085 +00086 return true; +00087 } +00088 else if (__fit < best_fit) +00089 return false; +00090 +00091 else +00092 { +00093 +00094 best_fit = __fit; +00095 +00096 return true; +00097 } +00098 } +00099 +00100 private: +00101 +00103 Fitness best_fit; +00104 +00106 bool first_time; +00107 }; +00108 +00109 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 9472670d9..b19d1487e 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moItRandNextMove.h Source File + +ParadisEO-MOMovingObjects: moItRandNextMove.h Source File - +
    -
    -

    moItRandNextMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moNextMove.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moItRandNextMove_h
-00013 #define __moItRandNextMove_h
-00014 
-00015 #include "moNextMove.h"
-00016 #include "moRandMove.h"
-00017 
-00019 
-00022 template < class M > class moItRandNextMove:public moNextMove < M >
-00023 {
-00024 
-00026   typedef typename M::EOType EOT;
-00027 
-00028 public:
-00029 
-00031 
-00037   moItRandNextMove (moRandMove < M > &__rand_move,
-00038                     unsigned int __max_iter):rand_move (__rand_move),
-00039     max_iter (__max_iter), num_iter (0)
-00040   {
-00041 
-00042   }
-00043 
-00045 
-00052   bool operator   () (M & __move, const EOT & __sol)
-00053   {
+
    +

    moItRandNextMove.h

    00001 /* 
+00002 * <moItRandNextMove.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moItRandNextMove_h
+00038 #define __moItRandNextMove_h
+00039 
+00040 #include "moNextMove.h"
+00041 #include "moRandMove.h"
+00042 
+00044 
+00047 template < class M > class moItRandNextMove:public moNextMove < M >
+00048 {
+00049 
+00051   typedef typename M::EOType EOT;
+00052 
+00053 public:
 00054 
-00055     if (num_iter++ > max_iter)
-00056       {
-00057 
-00058         num_iter = 0;
-00059         return false;
-00060       }
-00061     else
-00062       {
-00063 
-00064         /* The given solution is discarded here */
-00065         rand_move (__move);
-00066         num_iter++;
-00067         return true;
-00068       }
-00069   }
+00056 
+00062   moItRandNextMove (moRandMove < M > &__rand_move,
+00063                     unsigned int __max_iter):rand_move (__rand_move),
+00064     max_iter (__max_iter), num_iter (0)
+00065   {
+00066 
+00067   }
+00068 
 00070 
-00071 private:
-00072 
-00074   moRandMove < M > &rand_move;
-00075 
-00077   unsigned int max_iter;
-00078 
-00080   unsigned int num_iter;
-00081 
-00082 };
-00083 
-00084 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00077 bool operator () (M & __move, const EOT & __sol) +00078 { +00079 +00080 if (num_iter++ > max_iter) +00081 { +00082 +00083 num_iter = 0; +00084 return false; +00085 } +00086 else +00087 { +00088 +00089 /* The given solution is discarded here */ +00090 rand_move (__move); +00091 num_iter++; +00092 return true; +00093 } +00094 } +00095 +00096 private: +00097 +00099 moRandMove < M > &rand_move; +00100 +00102 unsigned int max_iter; +00103 +00105 unsigned int num_iter; +00106 +00107 }; +00108 +00109 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 d977a33e7..6ca0534d1 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moLSCheckPoint.h Source File + +ParadisEO-MOMovingObjects: moLSCheckPoint.h Source File - +
    -
    -

    moLSCheckPoint.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moLSCheckPoint.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moSolUpdater_h
-00013 #define __moSolUpdater_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename
-00022   M::EOType &, void >
-00023 {
-00024 
-00025 public:
-00027 
-00033   void
-00034   operator   () (const M & __move, const typename M::EOType & __sol)
-00035   {
+
    +

    moLSCheckPoint.h

    00001 /* 
+00002 * <moLSCheckPoint.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00037     for (unsigned int i = 0; i < func.size (); i++)
-00038       {
-00039         func[i]->operator   ()(__move, __sol);
-00040       }
-00041   }
-00042 
-00044 
-00048   void
-00049   add (eoBF < const M &, const typename M::EOType &, void >&__f)
-00050   {
-00051 
-00052     func.push_back (&__f);
-00053   }
-00054 
-00055 private:
-00056 
-00058   std::vector < eoBF < const
-00059     M &, const
-00060     typename
-00061   M::EOType &, void >*>
-00062     func;
-00063 
-00064 };
-00065 
-00066 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00037 #ifndef __moSolUpdater_h +00038 #define __moSolUpdater_h +00039 +00040 #include <eoFunctor.h> +00041 +00043 +00046 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename +00047 M::EOType &, void > +00048 { +00049 +00050 public: +00052 +00058 void +00059 operator () (const M & __move, const typename M::EOType & __sol) +00060 { +00061 +00062 for (unsigned int i = 0; i < func.size (); i++) +00063 { +00064 func[i]->operator ()(__move, __sol); +00065 } +00066 } +00067 +00069 +00073 void +00074 add (eoBF < const M &, const typename M::EOType &, void >&__f) +00075 { +00076 +00077 func.push_back (&__f); +00078 } +00079 +00080 private: +00081 +00083 std::vector < eoBF < const +00084 M &, const +00085 typename +00086 M::EOType &, void >*> +00087 func; +00088 +00089 }; +00090 +00091 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 4c57f2fbc..aa764670d 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moLinearCoolingSchedule.h Source File + +ParadisEO-MOMovingObjects: moLinearCoolingSchedule.h Source File - +
    -
    -

    moLinearCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moLinearCoolingSchedule.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2007
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moLinearCoolingSchedule_h
-00013 #define __moLinearCoolingSchedule_h
-00014 
-00015 #include "moCoolingSchedule.h"
-00016 
-00018 
-00022 class moLinearCoolingSchedule: public moCoolingSchedule
-00023 {
-00024 
-00025 public:
-00027 
-00031   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
-00032   {}
-00033 
-00035 
-00041   bool operator() (double &__temp)
-00042   {
-00043     return (__temp -= quantity) > threshold;
-00044   }
-00045 
-00046 private:
-00047 
-00049   double threshold;
-00050 
-00052   double quantity;
-00053 };
-00054 
-00055 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moLinearCoolingSchedule.h

    00001 /* 
+00002 * <moLinearCoolingSchedule.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moLinearCoolingSchedule_h
+00038 #define __moLinearCoolingSchedule_h
+00039 
+00040 #include "moCoolingSchedule.h"
+00041 
+00043 
+00047 class moLinearCoolingSchedule: public moCoolingSchedule
+00048 {
+00049 
+00050 public:
+00052 
+00056   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
+00057   {}
+00058 
+00060 
+00066   bool operator() (double &__temp)
+00067   {
+00068     return (__temp -= quantity) > threshold;
+00069   }
+00070 
+00071 private:
+00072 
+00074   double threshold;
+00075 
+00077   double quantity;
+00078 };
+00079 
+00080 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 c13c6edf1..c18c94bc1 100644 --- a/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/mo_move_8h-source.html @@ -1,15 +1,16 @@ - -PARADISEO-MO: moMove.h Source File + +ParadisEO-MOMovingObjects: moMove.h Source File - +
    -
    -

    moMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moMove.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moMove_h
-00013 #define __moMove_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00023 template < class EOT > class moMove:public eoUF < EOT &, void >
-00024 {
-00025 
-00026 public:
-00028   typedef EOT EOType;
-00029 
-00030 };
-00031 
-00032 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moMove.h

    00001 /* 
+00002 * <moMove.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moMove_h
+00038 #define __moMove_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00048 template < class EOT > class moMove:public eoUF < EOT &, void >
+00049 {
+00050 
+00051 public:
+00053   typedef EOT EOType;
+00054 
+00055 };
+00056 
+00057 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 445c675b2..71540b50f 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moMoveExpl.h Source File + +ParadisEO-MOMovingObjects: moMoveExpl.h Source File - +
    -
    -

    moMoveExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "eoMoveExpl.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moMoveExpl_h
-00013 #define __moMoveExpl_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00021 template < class M > class moMoveExpl:public eoBF < const typename
-00022   M::EOType &,
-00023   typename
-00024 M::EOType &, void >
-00025 {
-00026 
-00027 };
-00028 
-00029 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moMoveExpl.h

    00001 /* 
+00002 * <moMoveExpl.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moMoveExpl_h
+00038 #define __moMoveExpl_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00046 template < class M > class moMoveExpl:public eoBF < const typename
+00047   M::EOType &,
+00048   typename
+00049 M::EOType &, void >
+00050 {
+00051 
+00052 };
+00053 
+00054 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 3ada362ce..b59695ac8 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moMoveIncrEval.h Source File + +ParadisEO-MOMovingObjects: moMoveIncrEval.h Source File - +
    -
    -

    moMoveIncrEval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "eoMoveIncrEval.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moMoveIncrEval_h
-00013 #define __moMoveIncrEval_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename
-00025   M::EOType &,
-00026   typename
-00027   M::EOType::Fitness >
-00028 {
-00029 
-00030 };
-00031 
-00032 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moMoveIncrEval.h

    00001 /* 
+00002 * <moMoveIncrEval.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moMoveIncrEval_h
+00038 #define __moMoveIncrEval_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00049 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename
+00050   M::EOType &,
+00051   typename
+00052   M::EOType::Fitness >
+00053 {
+00054 
+00055 };
+00056 
+00057 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 49f4d292a..7630fe9a5 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moMoveInit.h Source File + +ParadisEO-MOMovingObjects: moMoveInit.h Source File - +
    -
    -

    moMoveInit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moMoveInit.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moMoveInit_h
-00013 #define __moMoveInit_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 template < class M > class moMoveInit:public eoBF < M &, const typename
-00023 M::EOType &, void >
-00024 {
-00025 
-00026 };
-00027 
-00028 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moMoveInit.h

    00001 /* 
+00002 * <moMoveInit.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moMoveInit_h
+00038 #define __moMoveInit_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00047 template < class M > class moMoveInit:public eoBF < M &, const typename
+00048 M::EOType &, void >
+00049 {
+00050 
+00051 };
+00052 
+00053 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 46cae587a..21adbd2ed 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moMoveLoopExpl.h Source File + +ParadisEO-MOMovingObjects: moMoveLoopExpl.h Source File - +
    -
    -

    moMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moMoveLoopExpl.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moMoveLoopExpl_h
-00013 #define __moMoveLoopExpl_h
-00014 
-00015 #include "moMoveExpl.h"
-00016 
-00018 
-00021 template < class M > class moMoveLoopExpl:public moMoveExpl < M >
-00022 {
-00023 
-00024 };
-00025 
-00026 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moMoveLoopExpl.h

    00001 /* 
+00002 * <moMoveLoopExpl.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moMoveLoopExpl_h
+00038 #define __moMoveLoopExpl_h
+00039 
+00040 #include "moMoveExpl.h"
+00041 
+00043 
+00046 template < class M > class moMoveLoopExpl:public moMoveExpl < M >
+00047 {
+00048 
+00049 };
+00050 
+00051 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 e58836fed..c818a6f53 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moMoveSelect.h Source File + +ParadisEO-MOMovingObjects: moMoveSelect.h Source File - +
    -
    -

    moMoveSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moMoveSelect.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moMoveSelect_h
-00013 #define __moMoveSelect_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00021 class EmptySelection
-00022 {
-00023 
-00024 };
-00025 
-00027 
-00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &,
-00033   void >
-00034 {
-00035 public:
-00037   typedef
-00038     typename
-00039     M::EOType::Fitness
-00040     Fitness;
+
    +

    moMoveSelect.h

    00001 /* 
+00002 * <moMoveSelect.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moMoveSelect_h
+00038 #define __moMoveSelect_h
+00039 
+00040 #include <eoFunctor.h>
 00041 
 00043 
-00050   virtual void
-00051   init (const Fitness & __fit) = 0;
+00046 class EmptySelection
+00047 {
+00048 
+00049 };
+00050 
 00052 
-00054 
-00059   virtual
-00060     bool
-00061   update (const M & __move, const Fitness & __fit) = 0;
-00062 
-00063 };
-00064 
-00065 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00057 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &, +00058 void > +00059 { +00060 public: +00062 typedef +00063 typename +00064 M::EOType::Fitness +00065 Fitness; +00066 +00068 +00075 virtual void +00076 init (const Fitness & __fit) = 0; +00077 +00079 +00084 virtual +00085 bool +00086 update (const M & __move, const Fitness & __fit) = 0; +00087 +00088 }; +00089 +00090 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 6898be642..a7661f60c 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moNextMove.h Source File + +ParadisEO-MOMovingObjects: moNextMove.h Source File - +
    -
    -

    moNextMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moNextMove.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moNextMove_h
-00013 #define __moNextMove_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 template < class M > class moNextMove:public eoBF < M &, const typename
-00023   M::EOType &,
-00024   bool >
-00025 {
-00026 
-00027 };
-00028 
-00029 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moNextMove.h

    00001 /* 
+00002 * <moNextMove.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moNextMove_h
+00038 #define __moNextMove_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00047 template < class M > class moNextMove:public eoBF < M &, const typename
+00048   M::EOType &,
+00049   bool >
+00050 {
+00051 
+00052 };
+00053 
+00054 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 03f720d9f..5b4d5f498 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moNoAspirCrit.h Source File + +ParadisEO-MOMovingObjects: moNoAspirCrit.h Source File - +
    -
    -

    moNoAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "eoNoAspirCrit.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moNoAspirCrit_h
-00013 #define __moNoAspirCrit_h
-00014 
-00015 #include "moAspirCrit.h"
-00016 
-00018 
-00021 template < class M > class moNoAspirCrit:public moAspirCrit < M >
-00022 {
-00023 
-00025 
-00032   bool operator   () (const M & __move,
-00033                       const typename M::EOType::Fitness & __sol)
-00034   {
-00035 
-00036     return false;
-00037   }
-00038 
-00040 
-00043   void init ()
-00044   {
-00045   }
-00046 };
-00047 
-00048 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moNoAspirCrit.h

    00001 /* 
+00002 * <moNoAspirCrit.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moNoAspirCrit_h
+00038 #define __moNoAspirCrit_h
+00039 
+00040 #include "moAspirCrit.h"
+00041 
+00043 
+00046 template < class M > class moNoAspirCrit:public moAspirCrit < M >
+00047 {
+00048 
+00050 
+00057   bool operator   () (const M & __move,
+00058                       const typename M::EOType::Fitness & __sol)
+00059   {
+00060 
+00061     return false;
+00062   }
+00063 
+00065 
+00068   void init ()
+00069   {
+00070   }
+00071 };
+00072 
+00073 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 index 658da6b78..f94c15b3b 100644 --- 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moNoFitImprSolContinue.h Source File + +ParadisEO-MOMovingObjects: 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 
-00033   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement)
-00034     : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) 
-00035   {}
+
    +

    moNoFitImprSolContinue.h

    00001 /* 
+00002 * <moNoFitImprSolContinue.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00038 
-00043   bool operator   () (const EOT & __sol)
-00044   {
-00045     if(__sol.invalid())
-00046       {
-00047         return true;
-00048       }
-00049 
-00050     if(firstFitnessSaved)
-00051       {
-00052         fitness=__sol.fitness();
-00053         counter=0;
-00054         firstFitnessSaved=false;
-00055         return true;
-00056       }
-00057     
-00058     counter++;
-00059 
-00060     if( __sol.fitness() > fitness)
-00061       {
-00062         fitness=__sol.fitness();
-00063         counter=0;
-00064       }
-00065   
-00066     if(counter==maxNumberOfIterationsWithoutImprovement)
-00067       {
-00068         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
-00069       }
-00070     return counter!=maxNumberOfIterationsWithoutImprovement;
-00071   }
-00072 
+00037 #ifndef __moNoFitImprSolContinue_h
+00038 #define __moNoFitImprSolContinue_h
+00039 
+00040 #include "moSolContinue.h"
+00041 
+00043 
+00046 template < class EOT > class moNoFitImprSolContinue:public moSolContinue < EOT >
+00047 {
+00048 
+00049 public:
+00050 
+00052   typedef typename EOT::Fitness Fitness;
+00053 
+00055 
+00058   moNoFitImprSolContinue (unsigned int __maxNumberOfIterationWithoutImprovement)
+00059     : maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement), firstFitnessSaved(true), counter(0) 
+00060   {}
+00061 
+00063 
+00068   bool operator   () (const EOT & __sol)
+00069   {
+00070     if(__sol.invalid())
+00071       {
+00072         return true;
+00073       }
 00074 
-00077   void init ()
-00078   {
-00079     firstFitnessSaved=true;
-00080     counter=0;
-00081   }
-00082 
-00083 private:
+00075     if(firstFitnessSaved)
+00076       {
+00077         fitness=__sol.fitness();
+00078         counter=0;
+00079         firstFitnessSaved=false;
+00080         return true;
+00081       }
+00082     
+00083     counter++;
 00084 
-00086   unsigned int maxNumberOfIterationsWithoutImprovement;
-00087 
-00089   bool firstFitnessSaved;
-00090 
-00092   Fitness fitness;
-00093 
-00095   unsigned int counter;
-00096 };
+00085     if( __sol.fitness() > fitness)
+00086       {
+00087         fitness=__sol.fitness();
+00088         counter=0;
+00089       }
+00090   
+00091     if(counter==maxNumberOfIterationsWithoutImprovement)
+00092       {
+00093         std::cout << "moNoFitImrpSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00094       }
+00095     return counter!=maxNumberOfIterationsWithoutImprovement;
+00096   }
 00097 
-00098 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00099 +00102 void init () +00103 { +00104 firstFitnessSaved=true; +00105 counter=0; +00106 } +00107 +00108 private: +00109 +00111 unsigned int maxNumberOfIterationsWithoutImprovement; +00112 +00114 bool firstFitnessSaved; +00115 +00117 Fitness fitness; +00118 +00120 unsigned int counter; +00121 }; +00122 +00123 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 0ece39003..384a1a9ad 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moRandImprSelect.h Source File + +ParadisEO-MOMovingObjects: moRandImprSelect.h Source File - +
    -
    -

    moRandImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moRandImprSelect.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moRandImprSelect_h
-00013 #define __moRandImprSelect_h
-00014 
-00015 #include <vector>
-00016 
-00017 #include <utils/eoRNG.h>
-00018 #include "moMoveSelect.h"
-00019 
-00021 
-00025 template < class M > class moRandImprSelect:public moMoveSelect < M >
-00026 {
-00027 
-00028 public:
-00029 
-00031   typedef typename M::EOType::Fitness Fitness;
-00032 
-00034 
-00040   void init (const Fitness & __fit)
-00041   {
-00042     init_fit = __fit;
-00043     vect_better_fit.clear ();
-00044     vect_better_moves.clear ();
-00045   }
+
    +

    moRandImprSelect.h

    00001 /* 
+00002 * <moRandImprSelect.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moRandImprSelect_h
+00038 #define __moRandImprSelect_h
+00039 
+00040 #include <vector>
+00041 
+00042 #include <utils/eoRNG.h>
+00043 #include "moMoveSelect.h"
+00044 
 00046 
-00048 
-00056   bool update (const M & __move, const Fitness & __fit)
-00057   {
-00058 
-00059     if (__fit > init_fit)
-00060       {
-00061 
-00062         vect_better_fit.push_back (__fit);
-00063         vect_better_moves.push_back (__move);
-00064       }
-00065 
-00066     return true;
-00067   }
-00068 
-00070 
-00077   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
-00078   {
-00079 
-00080     if (!vect_better_fit.empty ())
-00081       {
-00082 
-00083         unsigned n = rng.random (vect_better_fit.size ());
-00084 
-00085         __move = vect_better_moves[n];
-00086         __fit = vect_better_fit[n];
-00087       }
-00088     else
-00089       throw EmptySelection ();
-00090   }
-00091 
-00092 private:
+00050 template < class M > class moRandImprSelect:public moMoveSelect < M >
+00051 {
+00052 
+00053 public:
+00054 
+00056   typedef typename M::EOType::Fitness Fitness;
+00057 
+00059 
+00065   void init (const Fitness & __fit)
+00066   {
+00067     init_fit = __fit;
+00068     vect_better_fit.clear ();
+00069     vect_better_moves.clear ();
+00070   }
+00071 
+00073 
+00081   bool update (const M & __move, const Fitness & __fit)
+00082   {
+00083 
+00084     if (__fit > init_fit)
+00085       {
+00086 
+00087         vect_better_fit.push_back (__fit);
+00088         vect_better_moves.push_back (__move);
+00089       }
+00090 
+00091     return true;
+00092   }
 00093 
-00095   Fitness init_fit;
-00096 
-00098   std::vector < Fitness > vect_better_fit;
-00099 
-00101   std::vector < M > vect_better_moves;
-00102 };
-00103 
-00104 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00095 +00102 void operator () (M & __move, Fitness & __fit) throw (EmptySelection) +00103 { +00104 +00105 if (!vect_better_fit.empty ()) +00106 { +00107 +00108 unsigned n = rng.random (vect_better_fit.size ()); +00109 +00110 __move = vect_better_moves[n]; +00111 __fit = vect_better_fit[n]; +00112 } +00113 else +00114 throw EmptySelection (); +00115 } +00116 +00117 private: +00118 +00120 Fitness init_fit; +00121 +00123 std::vector < Fitness > vect_better_fit; +00124 +00126 std::vector < M > vect_better_moves; +00127 }; +00128 +00129 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 f3211165f..3d5ec92de 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moRandMove.h Source File + +ParadisEO-MOMovingObjects: moRandMove.h Source File - +
    -
    -

    moRandMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moRandMove.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moRandMove_h
-00013 #define __moRandMove_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00021 template < class M > class moRandMove:public eoUF < M &, void >
-00022 {
-00023 
-00024 };
-00025 
-00026 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moRandMove.h

    00001 /* 
+00002 * <moRandMove.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moRandMove_h
+00038 #define __moRandMove_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00046 template < class M > class moRandMove:public eoUF < M &, void >
+00047 {
+00048 
+00049 };
+00050 
+00051 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 443aa88df..ef425d544 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moSA.h Source File + +ParadisEO-MOMovingObjects: moSA.h Source File - +
    -
    -

    moSA.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moSA.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moSA_h
-00013 #define __moSA_h
-00014 
-00015 #include <eoOp.h>
-00016 #include <eoEvalFunc.h>
-00017 
-00018 #include "moAlgo.h"
-00019 #include "moRandMove.h"
-00020 #include "moMoveIncrEval.h"
-00021 #include "moCoolingSchedule.h"
-00022 #include "moSolContinue.h"
-00023 
-00024 #include <math.h>
-00025 
-00027 
-00030 template < class M > class moSA:public moAlgo < typename M::EOType >
-00031 {
-00032 
-00034   typedef
-00035     typename
-00036     M::EOType
-00037     EOT;
-00038 
-00040   typedef
-00041     typename
-00042     EOT::Fitness
-00043     Fitness;
-00044 
-00045 public:
-00046 
+
    +

    moSA.h

    00001 /* 
+00002 * <moSA.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moSA_h
+00038 #define __moSA_h
+00039 
+00040 #include <eoOp.h>
+00041 #include <eoEvalFunc.h>
+00042 
+00043 #include "moAlgo.h"
+00044 #include "moRandMove.h"
+00045 #include "moMoveIncrEval.h"
+00046 #include "moCoolingSchedule.h"
+00047 #include "moSolContinue.h"
 00048 
-00058   moSA (moRandMove < M > &__move_rand,
-00059         moMoveIncrEval < M > &__incr_eval,
-00060         moSolContinue < EOT > &__cont,
-00061         double __init_temp,
-00062         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
-00063   move_rand (__move_rand),
-00064   incr_eval (__incr_eval),
-00065   cont (__cont),
-00066   init_temp (__init_temp),
-00067   cool_sched (__cool_sched),
-00068   full_eval (__full_eval)
-00069   {
-00070 
-00071   }
-00072 
-00074 
-00080   bool operator   ()(EOT & __sol)
-00081   {
-00082 
-00083     if (__sol.invalid ())
-00084       {
-00085         full_eval (__sol);
-00086       }
-00087 
-00088     double temp = init_temp;
-00089 
-00090     M move;
-00091 
-00092     EOT best_sol = __sol;
-00093 
-00094     do
-00095       {
-00096 
-00097         cont.init ();
-00098         do
-00099           {
-00100 
-00101             move_rand (move);
-00102 
-00103             Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
-00104 
-00105             if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
-00106               {
+00049 #include <math.h>
+00050 
+00052 
+00055 template < class M > class moSA:public moAlgo < typename M::EOType >
+00056 {
+00057 
+00059   typedef
+00060     typename
+00061     M::EOType
+00062     EOT;
+00063 
+00065   typedef
+00066     typename
+00067     EOT::Fitness
+00068     Fitness;
+00069 
+00070 public:
+00071 
+00073 
+00083   moSA (moRandMove < M > &__move_rand,
+00084         moMoveIncrEval < M > &__incr_eval,
+00085         moSolContinue < EOT > &__cont,
+00086         double __init_temp,
+00087         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
+00088   move_rand (__move_rand),
+00089   incr_eval (__incr_eval),
+00090   cont (__cont),
+00091   init_temp (__init_temp),
+00092   cool_sched (__cool_sched),
+00093   full_eval (__full_eval)
+00094   {
+00095 
+00096   }
+00097 
+00099 
+00105   bool operator   ()(EOT & __sol)
+00106   {
 00107 
-00108                 __sol.fitness (incr_eval (move, __sol));
-00109                 move (__sol);
-00110 
-00111                 /* Updating the best solution found
-00112                    until now ? */
-00113                 if (__sol.fitness () > best_sol.fitness ())
-00114                   best_sol = __sol;
-00115               }
+00108     if (__sol.invalid ())
+00109       {
+00110         full_eval (__sol);
+00111       }
+00112 
+00113     double temp = init_temp;
+00114 
+00115     M move;
 00116 
-00117           }
-00118         while (cont (__sol));
-00119 
-00120       }
-00121     while (cool_sched (temp));
-00122 
-00123     __sol = best_sol;
-00124 
-00125     return true;
-00126   }
+00117     EOT best_sol = __sol;
+00118 
+00119     do
+00120       {
+00121 
+00122         cont.init ();
+00123         do
+00124           {
+00125 
+00126             move_rand (move);
 00127 
-00128 private:
+00128             Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
 00129 
-00131   moRandMove < M > &move_rand;
+00130             if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
+00131               {
 00132 
-00134   moMoveIncrEval < M > &incr_eval;
+00133                 __sol.fitness (incr_eval (move, __sol));
+00134                 move (__sol);
 00135 
-00137   moSolContinue < EOT > &cont;
-00138 
-00140   double  init_temp;
+00136                 /* Updating the best solution found
+00137                    until now ? */
+00138                 if (__sol.fitness () > best_sol.fitness ())
+00139                   best_sol = __sol;
+00140               }
 00141 
-00143   moCoolingSchedule & cool_sched;
+00142           }
+00143         while (cont (__sol));
 00144 
-00146   eoEvalFunc < EOT > &full_eval;        // Full evaluator.
-00147 };
-00148 
-00149 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00145 } +00146 while (cool_sched (temp)); +00147 +00148 __sol = best_sol; +00149 +00150 return true; +00151 } +00152 +00153 private: +00154 +00156 moRandMove < M > &move_rand; +00157 +00159 moMoveIncrEval < M > &incr_eval; +00160 +00162 moSolContinue < EOT > &cont; +00163 +00165 double init_temp; +00166 +00168 moCoolingSchedule & cool_sched; +00169 +00171 eoEvalFunc < EOT > &full_eval; // Full evaluator. +00172 }; +00173 +00174 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 a8dfce292..2b72cc728 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moSimpleMoveTabuList.h Source File + +ParadisEO-MOMovingObjects: moSimpleMoveTabuList.h Source File - +
    -
    -

    moSimpleMoveTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moSimpleMoveTabuList.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2007
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moSimpleMoveTabuList_h
-00013 #define __moSimpleMoveTabuList_h
-00014 
-00015 #include <list>
-00016 #include <iterator>
-00017 
-00018 #include "moTabuList.h"
-00019 
-00021 template <class M>
-00022 class moSimpleMoveTabuList: public moTabuList < M >
-00023 {
-00024   
-00025 public:
-00026   
-00028   typedef typename M::EOType EOT;
-00029 
-00031   /*
-00032     \param __size The maximum size of the move tabu list.
-00033    */
-00034   moSimpleMoveTabuList(unsigned int __size): maxSize(__size)
-00035   {
-00036     currentSize=0;
-00037   }
-00038 
-00040 
-00045   bool
-00046   operator () (const M & __move, const EOT & __sol) 
-00047   {
-00048     typename std::list<M>::iterator it;
-00049     
-00050     it=tabuList.begin();
-00051     while(it!=tabuList.end()&&(!((*it)==__move)))
-00052       {
-00053         it++;
-00054       }
-00055     
-00056     return it!=tabuList.end();
-00057   }
-00058   
-00059   void
-00060   add (const M & __move, const EOT & __sol)
-00061   {
-00062     if(currentSize!=0)
-00063       {
-00064         // Useful in the case of a move has been kept thanks to the moAspirCrit.
-00065         // In this case, the move can already be in the tabuList.
-00066         removeMove(__move);
-00067       }
-00068 
-00069     tabuList.push_back(__move);
-00070     
-00071     if(currentSize==maxSize)
-00072       {
-00073         tabuList.erase(tabuList.begin());
-00074       }
-00075     else
-00076       {
-00077         currentSize++;
-00078       }
-00079   }
-00080   
-00081   void
-00082   update ()
-00083   {
-00084     //nothing to do
-00085   }
-00086 
-00087   void
-00088   init ()
-00089   {
-00090     //nothing to do
-00091   }
-00092 
-00093 private:
-00094   
-00096 
-00099   void
-00100   removeMove(const M & __move)
-00101   {
-00102     typename std::list<M>::iterator it;
-00103     
-00104     it=tabuList.begin();
-00105     while(it!=tabuList.end()&&(!((*it)==__move)))
-00106       {
-00107         it++;
-00108       }
-00109 
-00110     if(it!=tabuList.end())
-00111       {
-00112         tabuList.erase(it);
-00113       }
-00114   }
-00115 
-00117   unsigned int maxSize;
-00118 
-00120   unsigned int currentSize;
-00121   
-00123   std::list<M> tabuList;
-00124 };
-00125 
-00126 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moSimpleMoveTabuList.h

    00001 /* 
+00002 * <moSimpleMoveTabuList.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moSimpleMoveTabuList_h
+00038 #define __moSimpleMoveTabuList_h
+00039 
+00040 #include <list>
+00041 #include <iterator>
+00042 
+00043 #include "moTabuList.h"
+00044 
+00046 template <class M>
+00047 class moSimpleMoveTabuList: public moTabuList < M >
+00048 {
+00049   
+00050 public:
+00051   
+00053   typedef typename M::EOType EOT;
+00054 
+00056   /*
+00057     \param __size The maximum size of the move tabu list.
+00058    */
+00059   moSimpleMoveTabuList(unsigned int __size): maxSize(__size)
+00060   {
+00061     currentSize=0;
+00062   }
+00063 
+00065 
+00070   bool
+00071   operator () (const M & __move, const EOT & __sol) 
+00072   {
+00073     typename std::list<M>::iterator it;
+00074     
+00075     it=tabuList.begin();
+00076     while(it!=tabuList.end()&&(!((*it)==__move)))
+00077       {
+00078         it++;
+00079       }
+00080     
+00081     return it!=tabuList.end();
+00082   }
+00083   
+00084   void
+00085   add (const M & __move, const EOT & __sol)
+00086   {
+00087     if(currentSize!=0)
+00088       {
+00089         // Useful in the case of a move has been kept thanks to the moAspirCrit.
+00090         // In this case, the move can already be in the tabuList.
+00091         removeMove(__move);
+00092       }
+00093 
+00094     tabuList.push_back(__move);
+00095     
+00096     if(currentSize==maxSize)
+00097       {
+00098         tabuList.erase(tabuList.begin());
+00099       }
+00100     else
+00101       {
+00102         currentSize++;
+00103       }
+00104   }
+00105   
+00106   void
+00107   update ()
+00108   {
+00109     //nothing to do
+00110   }
+00111 
+00112   void
+00113   init ()
+00114   {
+00115     //nothing to do
+00116   }
+00117 
+00118 private:
+00119   
+00121 
+00124   void
+00125   removeMove(const M & __move)
+00126   {
+00127     typename std::list<M>::iterator it;
+00128     
+00129     it=tabuList.begin();
+00130     while(it!=tabuList.end()&&(!((*it)==__move)))
+00131       {
+00132         it++;
+00133       }
+00134 
+00135     if(it!=tabuList.end())
+00136       {
+00137         tabuList.erase(it);
+00138       }
+00139   }
+00140 
+00142   unsigned int maxSize;
+00143 
+00145   unsigned int currentSize;
+00146   
+00148   std::list<M> tabuList;
+00149 };
+00150 
+00151 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 dc02fdef9..b6e11bc42 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moSimpleSolutionTabuList.h Source File + +ParadisEO-MOMovingObjects: moSimpleSolutionTabuList.h Source File - +
    -
    -

    moSimpleSolutionTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moSimpleSolutionTabuList.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2007
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moSimpleSolutionTabuList_h
-00013 #define __moSimpleSolutionTabuList_h
-00014 
-00015 #include <list>
-00016 #include <iterator>
-00017 
-00018 #include "moTabuList.h"
-00019 
-00021 template <class M>
-00022 class moSimpleSolutionTabuList: public moTabuList < M >
-00023 {
-00024   
-00025 public:
-00026 
-00028   typedef typename M::EOType EOT;
-00029   
-00031 
-00034   moSimpleSolutionTabuList(unsigned int __size): maxSize(__size)
-00035   {
-00036     currentSize=0;
-00037   }
-00038   
-00040 
-00045   bool operator () (const M & __move, const EOT & __sol) 
-00046   {
-00047     typename std::list<EOT>::iterator it;
-00048   
-00049     M _move=(M)__move;
-00050     EOT _sol=(EOT) __sol;
+
    +

    moSimpleSolutionTabuList.h

    00001 /* 
+00002 * <moSimpleSolutionTabuList.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moSimpleSolutionTabuList_h
+00038 #define __moSimpleSolutionTabuList_h
+00039 
+00040 #include <list>
+00041 #include <iterator>
+00042 
+00043 #include "moTabuList.h"
+00044 
+00046 template <class M>
+00047 class moSimpleSolutionTabuList: public moTabuList < M >
+00048 {
+00049   
+00050 public:
 00051 
-00052     _move(_sol);
-00053   
-00054     it=tabuList.begin();
-00055     while(it!=tabuList.end()&&(!((*it)==_sol)))
-00056       {
-00057         it++;
-00058       }
-00059     
-00060     return it!=tabuList.end();
-00061   }
-00062   
-00063   void
-00064   add (const M & __move, const EOT & __sol)
-00065   {
-00066     M _move=(M)__move;
-00067     EOT _sol=(EOT) _sol;
-00068     
-00069     _move(_sol);
-00070 
-00071     if(currentSize!=0)
-00072       {
-00073         // Useful in the case of a solution has been kept thanks to the moAspirCrit.
-00074         // In this case, the solution can already be in the tabuList.
-00075         removeSolution(_sol);
-00076       }
-00077     
-00078     tabuList.push_back(_sol);
-00079     
-00080     if(currentSize==maxSize)
+00053   typedef typename M::EOType EOT;
+00054   
+00056 
+00059   moSimpleSolutionTabuList(unsigned int __size): maxSize(__size)
+00060   {
+00061     currentSize=0;
+00062   }
+00063   
+00065 
+00070   bool operator () (const M & __move, const EOT & __sol) 
+00071   {
+00072     typename std::list<EOT>::iterator it;
+00073   
+00074     M _move=(M)__move;
+00075     EOT _sol=(EOT) __sol;
+00076 
+00077     _move(_sol);
+00078   
+00079     it=tabuList.begin();
+00080     while(it!=tabuList.end()&&(!((*it)==_sol)))
 00081       {
-00082         tabuList.erase(tabuList.begin());
+00082         it++;
 00083       }
-00084     else
-00085       {
-00086         currentSize++;
-00087       }
-00088   }
-00089 
-00090   void
-00091   update ()
-00092   {
-00093     //nothing to do
-00094   }
+00084     
+00085     return it!=tabuList.end();
+00086   }
+00087   
+00088   void
+00089   add (const M & __move, const EOT & __sol)
+00090   {
+00091     M _move=(M)__move;
+00092     EOT _sol=(EOT) _sol;
+00093     
+00094     _move(_sol);
 00095 
-00096   void
-00097   init ()
-00098   {
-00099     //nothing to do
-00100   }
-00101 
-00102 private:
-00103 
-00105 
-00108   void
-00109   removeSolution(const EOT & __sol)
-00110   {
-00111     typename std::list<EOT>::iterator it;
-00112 
-00113     it=tabuList.begin();
-00114     while(it!=tabuList.end()&&(!((*it)==__sol)))
-00115       {
-00116         it++;
-00117       }
-00118 
-00119     if(it!=tabuList.end())
-00120       {
-00121         tabuList.erase(it);
-00122       }
-00123   }
-00124   
-00126   unsigned int maxSize;
-00127 
-00129   unsigned int currentSize;
-00130   
-00132   std::list<EOT> tabuList;
-00133 };
-00134 
-00135 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00096 if(currentSize!=0) +00097 { +00098 // Useful in the case of a solution has been kept thanks to the moAspirCrit. +00099 // In this case, the solution can already be in the tabuList. +00100 removeSolution(_sol); +00101 } +00102 +00103 tabuList.push_back(_sol); +00104 +00105 if(currentSize==maxSize) +00106 { +00107 tabuList.erase(tabuList.begin()); +00108 } +00109 else +00110 { +00111 currentSize++; +00112 } +00113 } +00114 +00115 void +00116 update () +00117 { +00118 //nothing to do +00119 } +00120 +00121 void +00122 init () +00123 { +00124 //nothing to do +00125 } +00126 +00127 private: +00128 +00130 +00133 void +00134 removeSolution(const EOT & __sol) +00135 { +00136 typename std::list<EOT>::iterator it; +00137 +00138 it=tabuList.begin(); +00139 while(it!=tabuList.end()&&(!((*it)==__sol))) +00140 { +00141 it++; +00142 } +00143 +00144 if(it!=tabuList.end()) +00145 { +00146 tabuList.erase(it); +00147 } +00148 } +00149 +00151 unsigned int maxSize; +00152 +00154 unsigned int currentSize; +00155 +00157 std::list<EOT> tabuList; +00158 }; +00159 +00160 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 7d1aa03f8..5d307ea62 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moSolContinue.h Source File + +ParadisEO-MOMovingObjects: moSolContinue.h Source File - +
    -
    -

    moSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moSolContinue.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moSolContinue_h
-00013 #define __moSolContinue_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool >
-00023 {
-00024 
-00025 public:
-00027 
-00030   virtual void init () = 0;
-00031 };
-00032 
-00033 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  + +

    moSolContinue.h

    00001 /* 
+00002 * <moSolContinue.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moSolContinue_h
+00038 #define __moSolContinue_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00047 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool >
+00048 {
+00049 
+00050 public:
+00052 
+00055   virtual void init () = 0;
+00056 };
+00057 
+00058 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 index 32baf47e5..9556376b0 100644 --- 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moSteadyFitSolContinue.h Source File + +ParadisEO-MOMovingObjects: 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 
-00034   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
-00035     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
-00036       maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
-00037   {}
-00038 
-00040 
-00046   bool operator   () (const EOT & __sol)
-00047   {
-00048     if(!maxNumberOfIterationsReached)
-00049       {
-00050         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
-00051         if(maxNumberOfIterationsReached)
-00052           {
-00053             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
-00054           }
-00055         return true;
-00056       }
-00057 
-00058     if(__sol.invalid())
-00059       {
-00060         return true;
-00061       }
-00062 
-00063     if(firstFitnessSaved)
-00064       {
-00065         fitness=__sol.fitness();
-00066         counter=0;
-00067         firstFitnessSaved=false;
-00068         return true;
-00069       }
-00070     
-00071     counter++;
-00072 
-00073     if( __sol.fitness() > fitness )
+
    +

    moSteadyFitSolContinue.h

    00001 /* 
+00002 * <moSteadyFitSolContinue.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moSteadyFitSolContinue_h
+00038 #define __moSteadyFitSolContinue_h
+00039 
+00040 #include "moSolContinue.h"
+00041 
+00043 
+00046 template < class EOT > class moSteadyFitSolContinue:public moSolContinue < EOT >
+00047 {
+00048 
+00049 public:
+00050 
+00052   typedef typename EOT::Fitness Fitness;
+00053 
+00055 
+00059   moSteadyFitSolContinue (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)
+00060     : maxNumberOfIterations (__maxNumberOfIterations), maxNumberOfIterationsWithoutImprovement(__maxNumberOfIterationWithoutImprovement),
+00061       maxNumberOfIterationsReached(false), firstFitnessSaved(true), counter(0) 
+00062   {}
+00063 
+00065 
+00071   bool operator   () (const EOT & __sol)
+00072   {
+00073     if(!maxNumberOfIterationsReached)
 00074       {
-00075         fitness=__sol.fitness();
-00076         counter=0;
-00077       }
-00078   
-00079     if(counter==maxNumberOfIterationsWithoutImprovement)
-00080       {
-00081         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
-00082       }
-00083     return counter!=maxNumberOfIterationsWithoutImprovement;
-00084   }
-00085 
+00075         maxNumberOfIterationsReached=((++counter)==maxNumberOfIterations);
+00076         if(maxNumberOfIterationsReached)
+00077           {
+00078             std::cout << "moSteadyFitSolContinue: Done the minimum number of iterations [" << counter << "]." << std::endl;
+00079           }
+00080         return true;
+00081       }
+00082 
+00083     if(__sol.invalid())
+00084       {
+00085         return true;
+00086       }
 00087 
-00090   void init ()
-00091   {
-00092     maxNumberOfIterationsReached=false;
-00093     counter=0;
-00094     firstFitnessSaved=true;
-00095   }
-00096 
-00097 private:
-00098 
-00100   unsigned int maxNumberOfIterations;
-00101 
-00103   unsigned int maxNumberOfIterationsWithoutImprovement;
-00104 
-00106   bool maxNumberOfIterationsReached;
-00107 
-00109   bool firstFitnessSaved;
+00088     if(firstFitnessSaved)
+00089       {
+00090         fitness=__sol.fitness();
+00091         counter=0;
+00092         firstFitnessSaved=false;
+00093         return true;
+00094       }
+00095     
+00096     counter++;
+00097 
+00098     if( __sol.fitness() > fitness )
+00099       {
+00100         fitness=__sol.fitness();
+00101         counter=0;
+00102       }
+00103   
+00104     if(counter==maxNumberOfIterationsWithoutImprovement)
+00105       {
+00106         std::cout << "moSteadyFitSolContinue: Done [" << counter  << "] iterations without improvement." << std::endl;
+00107       }
+00108     return counter!=maxNumberOfIterationsWithoutImprovement;
+00109   }
 00110 
-00112   Fitness fitness;
-00113 
-00115   unsigned int counter;
-00116 };
-00117 
-00118 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00112 +00115 void init () +00116 { +00117 maxNumberOfIterationsReached=false; +00118 counter=0; +00119 firstFitnessSaved=true; +00120 } +00121 +00122 private: +00123 +00125 unsigned int maxNumberOfIterations; +00126 +00128 unsigned int maxNumberOfIterationsWithoutImprovement; +00129 +00131 bool maxNumberOfIterationsReached; +00132 +00134 bool firstFitnessSaved; +00135 +00137 Fitness fitness; +00138 +00140 unsigned int counter; +00141 }; +00142 +00143 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 493e88eb0..ad695d59f 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moTS.h Source File + +ParadisEO-MOMovingObjects: moTS.h Source File - +
    -
    -

    moTS.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moTS.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008       
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moTS_h
-00013 #define __moTS_h
-00014 
-00015 #include <eoOp.h>
-00016 #include <eoEvalFunc.h>
-00017 
-00018 #include "moAlgo.h"
-00019 #include "moSolContinue.h"
-00020 
-00021 #include "moMoveExpl.h"
-00022 #include "moTSMoveLoopExpl.h"
-00023 
-00024 
-00026 
-00029 template < class M > class moTS:public moAlgo < typename M::EOType >
-00030 {
-00031 
-00033   typedef
-00034     typename
-00035     M::EOType
-00036     EOT;
-00037 
-00039   typedef
-00040     typename
-00041     EOT::Fitness
-00042     Fitness;
-00043 
-00044 public:
+
    +

    moTS.h

    00001 /* 
+00002 * <moTS.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moTS_h
+00038 #define __moTS_h
+00039 
+00040 #include <eoOp.h>
+00041 #include <eoEvalFunc.h>
+00042 
+00043 #include "moAlgo.h"
+00044 #include "moSolContinue.h"
 00045 
-00047 
-00058 moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
-00059              (__move_init, __next_move, __incr_eval, __tabu_list,
-00060               __aspir_crit)), cont (__cont), full_eval (__full_eval)
-00061       {}
+00046 #include "moMoveExpl.h"
+00047 #include "moTSMoveLoopExpl.h"
+00048 
+00049 
+00051 
+00054 template < class M > class moTS:public moAlgo < typename M::EOType >
+00055 {
+00056 
+00058   typedef
+00059     typename
+00060     M::EOType
+00061     EOT;
 00062 
-00064 
-00071 moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
-00072     cont (__cont),
-00073     full_eval (__full_eval)
-00074     {}
-00075 
-00077 
-00085   bool operator   ()(EOT & __sol)
-00086   {
-00087     if (__sol.invalid ())
-00088       {
-00089         full_eval (__sol);
-00090       }
-00091 
-00092     M move;
-00093 
-00094     EOT best_sol = __sol, new_sol;
-00095 
-00096     cont.init ();
-00097 
-00098     do
-00099       {
+00064   typedef
+00065     typename
+00066     EOT::Fitness
+00067     Fitness;
+00068 
+00069 public:
+00070 
+00072 
+00083 moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
+00084              (__move_init, __next_move, __incr_eval, __tabu_list,
+00085               __aspir_crit)), cont (__cont), full_eval (__full_eval)
+00086       {}
+00087 
+00089 
+00096 moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
+00097     cont (__cont),
+00098     full_eval (__full_eval)
+00099     {}
 00100 
-00101         new_sol = __sol;
 00102 
-00103         try
-00104         {
-00105 
-00106           move_expl (__sol, new_sol);
-00107 
-00108         }
-00109         catch (EmptySelection & __ex)
-00110         {
-00111 
-00112           break;
-00113         }
-00114 
-00115         /* Updating the best solution
-00116            found until now ? */
-00117         if (new_sol.fitness () > __sol.fitness ())
-00118           {
-00119             best_sol = new_sol;
-00120           }
-00121 
-00122         __sol = new_sol;
-00123 
-00124       }
-00125     while (cont (__sol));
-00126 
-00127     __sol = best_sol;
-00128  
-00129     return true;
-00130   }
-00131 
-00132 private:
-00133 
-00135   moMoveExpl < M > &move_expl;
+00110   bool operator   ()(EOT & __sol)
+00111   {
+00112     if (__sol.invalid ())
+00113       {
+00114         full_eval (__sol);
+00115       }
+00116 
+00117     M move;
+00118 
+00119     EOT best_sol = __sol, new_sol;
+00120 
+00121     cont.init ();
+00122 
+00123     do
+00124       {
+00125 
+00126         new_sol = __sol;
+00127 
+00128         try
+00129         {
+00130 
+00131           move_expl (__sol, new_sol);
+00132 
+00133         }
+00134         catch (EmptySelection & __ex)
+00135         {
 00136 
-00138   moSolContinue < EOT > &cont;
+00137           break;
+00138         }
 00139 
-00141   eoEvalFunc < EOT > &full_eval;
-00142 };
-00143 
-00144 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00140 /* Updating the best solution +00141 found until now ? */ +00142 if (new_sol.fitness () > __sol.fitness ()) +00143 { +00144 best_sol = new_sol; +00145 } +00146 +00147 __sol = new_sol; +00148 +00149 } +00150 while (cont (__sol)); +00151 +00152 __sol = best_sol; +00153 +00154 return true; +00155 } +00156 +00157 private: +00158 +00160 moMoveExpl < M > &move_expl; +00161 +00163 moSolContinue < EOT > &cont; +00164 +00166 eoEvalFunc < EOT > &full_eval; +00167 }; +00168 +00169 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 8a0147c6f..7f40fc043 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moTSMoveLoopExpl.h Source File + +ParadisEO-MOMovingObjects: moTSMoveLoopExpl.h Source File - +
    -
    -

    moTSMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moTSMoveLoopExpl.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moTSMoveLoopExpl_h
-00013 #define __moTSMoveLoopExpl_h
-00014 
-00015 #include "moMoveLoopExpl.h"
-00016 
-00017 #include "moMoveInit.h"
-00018 #include "moNextMove.h"
-00019 #include "moMoveIncrEval.h"
-00020 #include "moMoveSelect.h"
-00021 
-00022 #include "moTabuList.h"
-00023 #include "moAspirCrit.h"
-00024 #include "moBestImprSelect.h"
-00025 
-00027 
-00030 template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M >
-00031 {
-00032 
-00034   typedef typename M::EOType EOT;
-00035 
-00037   typedef typename M::EOType::Fitness Fitness;
-00038 
-00039 public:
-00040 
-00042 
-00049 moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
-00050   move_init (__move_init),
-00051     next_move (__next_move),
-00052     incr_eval (__incr_eval),
-00053     tabu_list (__tabu_list), aspir_crit (__aspir_crit)
-00054   {
-00055 
-00056     tabu_list.init ();
-00057     aspir_crit.init ();
-00058   }
-00059 
-00061 
-00069   void operator   () (const EOT & __old_sol, EOT & __new_sol)
-00070   {
-00071 
-00072     M move;
-00073 
-00074 
-00075     move_init (move, __old_sol);        /* Restarting the exploration of 
-00076                                            of the neighborhood ! */
-00077 
-00078     move_select.init (__old_sol.fitness ());
-00079 
-00080     do
-00081       {
-00082 
-00083         Fitness fit = incr_eval (move, __old_sol);
+
    +

    moTSMoveLoopExpl.h

    00001 /* 
+00002 * <moTSMoveLoopExpl.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moTSMoveLoopExpl_h
+00038 #define __moTSMoveLoopExpl_h
+00039 
+00040 #include "moMoveLoopExpl.h"
+00041 
+00042 #include "moMoveInit.h"
+00043 #include "moNextMove.h"
+00044 #include "moMoveIncrEval.h"
+00045 #include "moMoveSelect.h"
+00046 
+00047 #include "moTabuList.h"
+00048 #include "moAspirCrit.h"
+00049 #include "moBestImprSelect.h"
+00050 
+00052 
+00055 template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M >
+00056 {
+00057 
+00059   typedef typename M::EOType EOT;
+00060 
+00062   typedef typename M::EOType::Fitness Fitness;
+00063 
+00064 public:
+00065 
+00067 
+00074 moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
+00075   move_init (__move_init),
+00076     next_move (__next_move),
+00077     incr_eval (__incr_eval),
+00078     tabu_list (__tabu_list), aspir_crit (__aspir_crit)
+00079   {
+00080 
+00081     tabu_list.init ();
+00082     aspir_crit.init ();
+00083   }
 00084 
-00085         if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
-00086           {
-00087             if (!move_select.update (move, fit))
-00088               break;
-00089           }
-00090 
-00091       }
-00092     while (next_move (move, __old_sol));
-00093 
-00094     M best_move;
-00095 
-00096     Fitness best_move_fit;
-00097 
-00098     move_select (best_move, best_move_fit);
+00086 
+00094   void operator   () (const EOT & __old_sol, EOT & __new_sol)
+00095   {
+00096 
+00097     M move;
+00098 
 00099 
-00100     __new_sol.fitness (best_move_fit);
-00101     best_move (__new_sol);
+00100     move_init (move, __old_sol);        /* Restarting the exploration of 
+00101                                            of the neighborhood ! */
 00102 
-00103     /* Removing moves that are
-00104        no more tabu */
-00105     tabu_list.update ();
-00106 
-00107     // Updating the tabu list
-00108     tabu_list.add (best_move, __new_sol);
-00109   }
-00110 
-00111 private:
-00112 
-00114   moMoveInit < M > &move_init;
+00103     move_select.init (__old_sol.fitness ());
+00104 
+00105     do
+00106       {
+00107 
+00108         Fitness fit = incr_eval (move, __old_sol);
+00109 
+00110         if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
+00111           {
+00112             if (!move_select.update (move, fit))
+00113               break;
+00114           }
 00115 
-00117   moNextMove < M > &next_move;
+00116       }
+00117     while (next_move (move, __old_sol));
 00118 
-00120   moMoveIncrEval < M > &incr_eval;
-00121 
-00123   moBestImprSelect < M > move_select;
+00119     M best_move;
+00120 
+00121     Fitness best_move_fit;
+00122 
+00123     move_select (best_move, best_move_fit);
 00124 
-00126   moTabuList < M > &tabu_list;
+00125     __new_sol.fitness (best_move_fit);
+00126     best_move (__new_sol);
 00127 
-00129   moAspirCrit < M > &aspir_crit;
-00130 };
+00128     /* Removing moves that are
+00129        no more tabu */
+00130     tabu_list.update ();
 00131 
-00132 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00132 // Updating the tabu list +00133 tabu_list.add (best_move, __new_sol); +00134 } +00135 +00136 private: +00137 +00139 moMoveInit < M > &move_init; +00140 +00142 moNextMove < M > &next_move; +00143 +00145 moMoveIncrEval < M > &incr_eval; +00146 +00148 moBestImprSelect < M > move_select; +00149 +00151 moTabuList < M > &tabu_list; +00152 +00154 moAspirCrit < M > &aspir_crit; +00155 }; +00156 +00157 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    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 ed156efb3..6a2088925 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 @@ -1,15 +1,16 @@ - -PARADISEO-MO: moTabuList.h Source File + +ParadisEO-MOMovingObjects: moTabuList.h Source File - +
    -
    -

    moTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "moTabuList.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef __moTabuList_h
-00013 #define __moTabuList_h
-00014 
-00015 #include <eoFunctor.h>
-00016 
-00018 
-00022 template < class M > class moTabuList:public eoBF < const M &, const typename
-00023   M::EOType &,
-00024   bool >
-00025 {
-00026 
-00027 public:
-00029   typedef typename M::EOType EOT;
-00030 
-00032 
-00038   virtual void
-00039   add (const M & __move, const EOT & __sol) = 0;
-00040 
-00042 
-00045   virtual void
-00046   update () = 0;
-00047 
-00049 
-00052   virtual void
-00053   init () = 0;
-00054 };
+
    +

    moTabuList.h

    00001 /* 
+00002 * <moTabuList.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef __moTabuList_h
+00038 #define __moTabuList_h
+00039 
+00040 #include <eoFunctor.h>
+00041 
+00043 
+00047 template < class M > class moTabuList:public eoBF < const M &, const typename
+00048   M::EOType &,
+00049   bool >
+00050 {
+00051 
+00052 public:
+00054   typedef typename M::EOType EOT;
 00055 
-00056 #endif
-
    Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +00057 +00063 virtual void +00064 add (const M & __move, const EOT & __sol) = 0; +00065 +00067 +00070 virtual void +00071 update () = 0; +00072 +00074 +00077 virtual void +00078 init () = 0; +00079 }; +00080 +00081 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/namespace_graph.html b/trunk/paradiseo-mo/doc/html/namespace_graph.html index 7a92de2a9..a829de8e6 100644 --- a/trunk/paradiseo-mo/doc/html/namespace_graph.html +++ b/trunk/paradiseo-mo/doc/html/namespace_graph.html @@ -1,14 +1,14 @@ - + ParadisEO-MOMovingObjects: Graph Namespace Reference - +
    -
    +
    -
    +

    Graph Namespace Reference

    @@ -56,8 +54,8 @@ static std::vector< std::vector<
    unsigned int > > 
    dist
    -

    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/namespacemembers.html b/trunk/paradiseo-mo/doc/html/namespacemembers.html index 8a3082ed5..58381ab1c 100644 --- a/trunk/paradiseo-mo/doc/html/namespacemembers.html +++ b/trunk/paradiseo-mo/doc/html/namespacemembers.html @@ -1,14 +1,14 @@ - + ParadisEO-MOMovingObjects: Class Members - +
    -
    +
    -
    +
  • Namespace Members
    • +
    @@ -40,20 +38,14 @@ Here is a list of all documented namespace members with links to the namespaces

    -
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +: Graph
  • dist +: Graph
  • distance() +: Graph
  • load() +: Graph
  • size() +: Graph
  • vectCoord +: Graph +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    • diff --git a/trunk/paradiseo-mo/doc/html/namespacemembers_func.html b/trunk/paradiseo-mo/doc/html/namespacemembers_func.html index 1955b4c50..c187a48a0 100644 --- a/trunk/paradiseo-mo/doc/html/namespacemembers_func.html +++ b/trunk/paradiseo-mo/doc/html/namespacemembers_func.html @@ -1,14 +1,14 @@ - + ParadisEO-MOMovingObjects: Class Members - +
    -
    +
    -
    +
  • Namespace Members
    • +
    @@ -40,16 +38,12 @@

    -
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +: Graph
  • distance() +: Graph
  • load() +: Graph
  • size() +: Graph +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    • diff --git a/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html b/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html index 1b84f357f..140b658e9 100644 --- a/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html +++ b/trunk/paradiseo-mo/doc/html/namespacemembers_vars.html @@ -1,14 +1,14 @@ - + ParadisEO-MOMovingObjects: Class Members - +
    -
    +
    -
    +
  • Namespace Members
    • +
     

    -
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +: Graph
  • vectCoord +: Graph +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    • diff --git a/trunk/paradiseo-mo/doc/html/namespaces.html b/trunk/paradiseo-mo/doc/html/namespaces.html index a748a72db..f1d263ea9 100644 --- a/trunk/paradiseo-mo/doc/html/namespaces.html +++ b/trunk/paradiseo-mo/doc/html/namespaces.html @@ -1,14 +1,14 @@ - + ParadisEO-MOMovingObjects: Namespace Index - +
    -
    +
    -
    +

    ParadisEO-MOMovingObjects Namespace List

    Here is a list of all documented namespaces with brief descriptions:
    Graph
    -
    Generated on Thu Sep 20 11:30:29 2007 for ParadisEO-MOMovingObjects by  +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html b/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html index b65d8fad2..92614c7e5 100644 --- a/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/order__xover_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: order_xover.cpp Source File - +
    -
    -

    order_xover.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "order_xover.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2002-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <assert.h>
-00013 #include <vector>
-00014 
-00015 #include <utils/eoRNG.h>
-00016 
-00017 #include "order_xover.h"
-00018 #include "route_valid.h"
-00019 
-00020 void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __child) 
-00021 {
-00022   
-00023   unsigned int cut = rng.random (__par1.size ()) ;
-00024       
-00025   /* To store vertices that have
-00026      already been crossed */
-00027   std::vector<bool> v;
-00028   v.resize(__par1.size());
-00029   
-00030   for (unsigned int i = 0 ; i < __par1.size () ; i ++)
-00031     {
-00032       v [i] = false ;
-00033     }
-00034 
-00035   /* Copy of the left partial
-00036      route of the first parent */ 
-00037   for (unsigned int i = 0 ; i < cut ; i ++) 
-00038     {
-00039       __child [i] = __par1 [i] ; 
-00040       v [__par1 [i]] = true ;
-00041     }
-00042    
-00043   /* Searching the vertex of the second path, that ended
-00044      the previous first one */
-00045   unsigned int from = 0 ;
-00046   for (unsigned int i = 0 ; i < __par2.size () ; i ++)
-00047     {
-00048       if (__par2 [i] == __child [cut - 1]) 
-00049         {
-00050           from = i ;
-00051           break ;
-00052         }
-00053     }
+
    +

    order_xover.cpp

    00001 /* 
+00002 * <order_xover.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <assert.h>
+00038 #include <vector>
+00039 
+00040 #include <utils/eoRNG.h>
+00041 
+00042 #include "order_xover.h"
+00043 #include "route_valid.h"
+00044 
+00045 void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __child) 
+00046 {
+00047   
+00048   unsigned int cut = rng.random (__par1.size ()) ;
+00049       
+00050   /* To store vertices that have
+00051      already been crossed */
+00052   std::vector<bool> v;
+00053   v.resize(__par1.size());
 00054   
-00055   /* Selecting a direction
-00056      Left or Right */
-00057   char direct = rng.flip () ? 1 : -1 ;
-00058     
-00059   /* Copy of the left vertices from
-00060      the second parent path */
-00061   unsigned int l = cut ;
-00062   
-00063   for (unsigned int i = 0 ; i < __par2.size () ; i ++) 
-00064     {
-00065       unsigned int bidule /* :-) */ = (direct * i + from + __par2.size ()) % __par2.size () ;
-00066       if (! v [__par2 [bidule]]) 
-00067         {
-00068           __child [l ++] = __par2 [bidule] ;
-00069           v [__par2 [bidule]] = true ;
-00070         }
-00071     }
-00072   
-00073   v.clear();
-00074 } 
-00075 
-00076 bool OrderXover :: operator () (Route & __route1, Route & __route2) 
-00077 {
-00078   
-00079   // Init. copy
-00080   Route par [2] ;
-00081   par [0] = __route1 ;
-00082   par [1] = __route2 ;
-00083   
-00084   cross (par [0], par [1], __route1) ;
-00085   cross (par [1], par [0], __route2) ;
-00086   
-00087   assert (valid (__route1)) ;
-00088   assert (valid (__route2)) ;
-00089 
-00090   __route1.invalidate () ;
-00091   __route2.invalidate () ;
-00092 
-00093   return true ;
-00094 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00055 for (unsigned int i = 0 ; i < __par1.size () ; i ++) +00056 { +00057 v [i] = false ; +00058 } +00059 +00060 /* Copy of the left partial +00061 route of the first parent */ +00062 for (unsigned int i = 0 ; i < cut ; i ++) +00063 { +00064 __child [i] = __par1 [i] ; +00065 v [__par1 [i]] = true ; +00066 } +00067 +00068 /* Searching the vertex of the second path, that ended +00069 the previous first one */ +00070 unsigned int from = 0 ; +00071 for (unsigned int i = 0 ; i < __par2.size () ; i ++) +00072 { +00073 if (__par2 [i] == __child [cut - 1]) +00074 { +00075 from = i ; +00076 break ; +00077 } +00078 } +00079 +00080 /* Selecting a direction +00081 Left or Right */ +00082 char direct = rng.flip () ? 1 : -1 ; +00083 +00084 /* Copy of the left vertices from +00085 the second parent path */ +00086 unsigned int l = cut ; +00087 +00088 for (unsigned int i = 0 ; i < __par2.size () ; i ++) +00089 { +00090 unsigned int bidule /* :-) */ = (direct * i + from + __par2.size ()) % __par2.size () ; +00091 if (! v [__par2 [bidule]]) +00092 { +00093 __child [l ++] = __par2 [bidule] ; +00094 v [__par2 [bidule]] = true ; +00095 } +00096 } +00097 +00098 v.clear(); +00099 } +00100 +00101 bool OrderXover :: operator () (Route & __route1, Route & __route2) +00102 { +00103 +00104 // Init. copy +00105 Route par [2] ; +00106 par [0] = __route1 ; +00107 par [1] = __route2 ; +00108 +00109 cross (par [0], par [1], __route1) ; +00110 cross (par [1], par [0], __route2) ; +00111 +00112 assert (valid (__route1)) ; +00113 assert (valid (__route2)) ; +00114 +00115 __route1.invalidate () ; +00116 __route2.invalidate () ; +00117 +00118 return true ; +00119 } +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html b/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html index 290353e00..c8e20a8f7 100644 --- a/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/order__xover_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: order_xover.h Source File - +
    -
    -

    order_xover.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "order_xover.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef order_xover_h
-00013 #define order_xover_h
-00014 
-00015 #include <eoOp.h>
-00016 
-00017 #include "route.h"
-00018 
-00020 class OrderXover : public eoQuadOp <Route> 
-00021 {
-00022   
-00023 public :
-00024   
-00025   bool operator () (Route & __route1, Route & __route2) ;
-00026   
-00027 private :
-00028   
-00029   void cross (const Route & __par1, const Route & __par2, Route & __child) ;
-00030 } ;
-00031 
-00032 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    order_xover.h

    00001 /* 
+00002 * <order_xover.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef order_xover_h
+00038 #define order_xover_h
+00039 
+00040 #include <eoOp.h>
+00041 
+00042 #include "route.h"
+00043 
+00045 class OrderXover : public eoQuadOp <Route> 
+00046 {
+00047   
+00048 public :
+00049   
+00050   bool operator () (Route & __route1, Route & __route2) ;
+00051   
+00052 private :
+00053   
+00054   void cross (const Route & __par1, const Route & __par2, Route & __child) ;
+00055 } ;
+00056 
+00057 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html b/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html index b382150b5..2bf12d095 100644 --- a/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/part__route__eval_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: part_route_eval.cpp Source File - +
    -
    -

    part_route_eval.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "part_route_eval.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "part_route_eval.h"
-00013 #include "graph.h"
-00014 
-00015 PartRouteEval :: PartRouteEval (float __from, float __to) : from (__from), to (__to) {}
-00016 
-00017 void PartRouteEval :: operator () (Route & __route) 
-00018 {
-00019   float len = 0 ;
-00020   
-00021   for (unsigned int i = (unsigned int) (__route.size () * from) ; i < (unsigned int ) (__route.size () * to) ; i ++)
-00022     {
-00023       len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ;
-00024     }
-00025   
-00026   __route.fitness (len) ;
-00027 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    part_route_eval.cpp

    00001 /* 
+00002 * <part_route_eval.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "part_route_eval.h"
+00038 #include "graph.h"
+00039 
+00040 PartRouteEval :: PartRouteEval (float __from, float __to) : from (__from), to (__to) {}
+00041 
+00042 void PartRouteEval :: operator () (Route & __route) 
+00043 {
+00044   float len = 0 ;
+00045   
+00046   for (unsigned int i = (unsigned int) (__route.size () * from) ; i < (unsigned int ) (__route.size () * to) ; i ++)
+00047     {
+00048       len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ;
+00049     }
+00050   
+00051   __route.fitness (len) ;
+00052 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html b/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html index ec7e44f3f..b9cc2192c 100644 --- a/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/part__route__eval_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: part_route_eval.h Source File - +
    -
    -

    part_route_eval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "part_route_eval.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef part_route_eval_h
-00013 #define part_route_eval_h
-00014 
-00015 #include <eoEvalFunc.h>
-00016 
-00017 #include "route.h"
-00018 
-00020 class PartRouteEval : public eoEvalFunc <Route> 
-00021 {
-00022   
-00023 public :
-00024   
-00026   PartRouteEval (float __from, float __to) ;
-00027   
-00028   void operator () (Route & __route) ;
-00029   
-00030 private :
-00031 
-00032   float from, to ;
-00033   
-00034 } ;
-00035 
+
    +

    part_route_eval.h

    00001 /* 
+00002 * <part_route_eval.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
 00036 
-00037 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00037 #ifndef part_route_eval_h +00038 #define part_route_eval_h +00039 +00040 #include <eoEvalFunc.h> +00041 +00042 #include "route.h" +00043 +00045 class PartRouteEval : public eoEvalFunc <Route> +00046 { +00047 +00048 public : +00049 +00051 PartRouteEval (float __from, float __to) ; +00052 +00053 void operator () (Route & __route) ; +00054 +00055 private : +00056 +00057 float from, to ; +00058 +00059 } ; +00060 +00061 +00062 #endif +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html index ae94307a5..a6b4624ec 100644 --- a/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: part_two_opt_init.cpp Source File - +
    -
    -

    part_two_opt_init.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "part_two_opt_init.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <utils/eoRNG.h>
-00013 
-00014 #include "part_two_opt_init.h"
-00015 
-00016 void PartTwoOptInit :: operator () (TwoOpt & __move, const Route & __route) 
-00017 {
-00018   __move.first = rng.random (__route.size () - 6) ;
-00019   __move.second = __move.first + 2 ;
-00020 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    part_two_opt_init.cpp

    00001 /* 
+00002 * <part_two_opt_init.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <utils/eoRNG.h>
+00038 
+00039 #include "part_two_opt_init.h"
+00040 
+00041 void PartTwoOptInit :: operator () (TwoOpt & __move, const Route & __route) 
+00042 {
+00043   __move.first = rng.random (__route.size () - 6) ;
+00044   __move.second = __move.first + 2 ;
+00045 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html index dfb7a7df0..34706864a 100644 --- a/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__init_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: part_two_opt_init.h Source File - +
    -
    -

    part_two_opt_init.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "part_two_opt_init.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef part_two_opt_init_h
-00013 #define part_two_opt_init_h
-00014 
-00015 #include <moMoveInit.h>
-00016 
-00017 #include "two_opt.h"
-00018 
-00020 class PartTwoOptInit : public moMoveInit <TwoOpt> 
-00021 {
-00022   
-00023 public :
-00024   
-00025   void operator () (TwoOpt & __move, const Route & __route) ;
-00026   
-00027 } ;
-00028 
-00029 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    part_two_opt_init.h

    00001 /* 
+00002 * <part_two_opt_init.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef part_two_opt_init_h
+00038 #define part_two_opt_init_h
+00039 
+00040 #include <moMoveInit.h>
+00041 
+00042 #include "two_opt.h"
+00043 
+00045 class PartTwoOptInit : public moMoveInit <TwoOpt> 
+00046 {
+00047   
+00048 public :
+00049   
+00050   void operator () (TwoOpt & __move, const Route & __route) ;
+00051   
+00052 } ;
+00053 
+00054 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html index e3558b09d..051c1c1eb 100644 --- a/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: part_two_opt_next.cpp Source File - +
    -
    -

    part_two_opt_next.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "part_two_opt_next.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "part_two_opt_next.h"
-00013 #include "graph.h"
-00014 
-00015 bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) 
-00016 {
-00017   if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2)
-00018     {
-00019       return false ;
-00020     }
-00021   else 
-00022     {
-00023       __move.second ++ ;
-00024       if (__move.second == Graph :: size () - 1) 
-00025         {
-00026           __move.first ++ ;
-00027           __move.second = __move.first + 2 ;
-00028         }
-00029       
-00030       return true ;
-00031     }
-00032 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    part_two_opt_next.cpp

    00001 /* 
+00002 * <part_two_opt_next.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "part_two_opt_next.h"
+00038 #include "graph.h"
+00039 
+00040 bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) 
+00041 {
+00042   if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2)
+00043     {
+00044       return false ;
+00045     }
+00046   else 
+00047     {
+00048       __move.second ++ ;
+00049       if (__move.second == Graph :: size () - 1) 
+00050         {
+00051           __move.first ++ ;
+00052           __move.second = __move.first + 2 ;
+00053         }
+00054       
+00055       return true ;
+00056     }
+00057 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html index 692ffc60e..c0dafd7a1 100644 --- a/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/part__two__opt__next_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: part_two_opt_next.h Source File - +
    -
    -

    part_two_opt_next.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "part_two_opt_next.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef part_two_opt_next_h
-00013 #define part_two_opt_next_h
-00014 
-00015 #include <moNextMove.h>
-00016 #include "two_opt.h"
-00017 
-00019 class PartTwoOptNext : public moNextMove <TwoOpt> 
-00020 {
-00021   
-00022 public :
-00023   
-00024   bool operator () (TwoOpt & __move, const Route & __route) ;
-00025   
-00026 } ;
-00027 
-00028 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    part_two_opt_next.h

    00001 /* 
+00002 * <part_two_opt_next.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef part_two_opt_next_h
+00038 #define part_two_opt_next_h
+00039 
+00040 #include <moNextMove.h>
+00041 #include "two_opt.h"
+00042 
+00044 class PartTwoOptNext : public moNextMove <TwoOpt> 
+00045 {
+00046   
+00047 public :
+00048   
+00049   bool operator () (TwoOpt & __move, const Route & __route) ;
+00050   
+00051 } ;
+00052 
+00053 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html index 3221f3eea..a4e6fea81 100644 --- a/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: partial_mapped_xover.cpp Source File - +
    -
    -

    partial_mapped_xover.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "partial_mapped_xover.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <assert.h>
-00013 
-00014 #include <vector>
-00015 
-00016 #include <utils/eoRNG.h>
-00017 
-00018 #include "partial_mapped_xover.h"
-00019 #include "route_valid.h"
-00020 #include "mix.h"
-00021 
-00022 void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __cut2) 
-00023 {
-00024   
-00025   std::vector<unsigned int> v; // Number of times a cities are visited ...
-00026   
-00027   v.resize(__route.size ()); 
-00028   
-00029   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00030     {
-00031       v [i] = 0 ;
-00032     }
-00033   
-00034   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00035     {
-00036       v [__route [i]] ++ ;
-00037     }
-00038   
-00039   std :: vector <unsigned int> vert ;
+
    +

    partial_mapped_xover.cpp

    00001 /* 
+00002 * <partial_mapped_xover.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <assert.h>
+00038 
+00039 #include <vector>
 00040 
-00041   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00042     {
-00043       if (! v [i])
-00044         {
-00045           vert.push_back (i) ;
-00046         }
-00047     }
-00048   
-00049   mix (vert) ;
-00050 
-00051   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00052     {
-00053       if (i < __cut1 || i >= __cut2)
-00054         {
-00055           if (v [__route [i]] > 1) 
-00056             {
-00057               __route [i] = vert.back () ;
-00058               vert.pop_back () ;
-00059             }
-00060         }
-00061    }
-00062 
-00063   v.clear();
-00064 }
+00041 #include <utils/eoRNG.h>
+00042 
+00043 #include "partial_mapped_xover.h"
+00044 #include "route_valid.h"
+00045 #include "mix.h"
+00046 
+00047 void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __cut2) 
+00048 {
+00049   
+00050   std::vector<unsigned int> v; // Number of times a cities are visited ...
+00051   
+00052   v.resize(__route.size ()); 
+00053   
+00054   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00055     {
+00056       v [i] = 0 ;
+00057     }
+00058   
+00059   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00060     {
+00061       v [__route [i]] ++ ;
+00062     }
+00063   
+00064   std :: vector <unsigned int> vert ;
 00065 
-00066 bool PartialMappedXover :: operator () (Route & __route1, Route & __route2) 
-00067 {
-00068   unsigned int cut1 = rng.random (__route1.size ()), cut2 = rng.random (__route2.size ()) ;
-00069   
-00070   if (cut2 < cut1)
-00071     {
-00072       std :: swap (cut1, cut2) ;
-00073     }
-00074   
-00075   // Between the cuts
-00076   for (unsigned int i = cut1 ; i < cut2 ; i ++)
+00066   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00067     {
+00068       if (! v [i])
+00069         {
+00070           vert.push_back (i) ;
+00071         }
+00072     }
+00073   
+00074   mix (vert) ;
+00075 
+00076   for (unsigned int i = 0 ; i < __route.size () ; i ++)
 00077     {
-00078       std :: swap (__route1 [i], __route2 [i]) ;
-00079     }
-00080   
-00081   // Outside the cuts
-00082   repair (__route1, cut1, cut2) ;
-00083   repair (__route2, cut1, cut2) ;
-00084   
-00085   // Debug
-00086   assert (valid (__route1)) ;
-00087   assert (valid (__route2)) ;
-00088 
-00089   __route1.invalidate () ;
-00090   __route2.invalidate () ;
-00091 
-00092   return true ;
-00093 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00078 if (i < __cut1 || i >= __cut2) +00079 { +00080 if (v [__route [i]] > 1) +00081 { +00082 __route [i] = vert.back () ; +00083 vert.pop_back () ; +00084 } +00085 } +00086 } +00087 +00088 v.clear(); +00089 } +00090 +00091 bool PartialMappedXover :: operator () (Route & __route1, Route & __route2) +00092 { +00093 unsigned int cut1 = rng.random (__route1.size ()), cut2 = rng.random (__route2.size ()) ; +00094 +00095 if (cut2 < cut1) +00096 { +00097 std :: swap (cut1, cut2) ; +00098 } +00099 +00100 // Between the cuts +00101 for (unsigned int i = cut1 ; i < cut2 ; i ++) +00102 { +00103 std :: swap (__route1 [i], __route2 [i]) ; +00104 } +00105 +00106 // Outside the cuts +00107 repair (__route1, cut1, cut2) ; +00108 repair (__route2, cut1, cut2) ; +00109 +00110 // Debug +00111 assert (valid (__route1)) ; +00112 assert (valid (__route2)) ; +00113 +00114 __route1.invalidate () ; +00115 __route2.invalidate () ; +00116 +00117 return true ; +00118 } +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html index 33272c028..0fd29a116 100644 --- a/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/partial__mapped__xover_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: partial_mapped_xover.h Source File - +
    -
    -

    partial_mapped_xover.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "partial_mapped_xover.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef partial_mapped_xover_h
-00013 #define partial_mapped_xover_h
-00014 
-00015 #include <eoOp.h>
-00016 
-00017 #include "route.h"
-00018 
-00020 class PartialMappedXover : public eoQuadOp <Route> {
-00021   
-00022 public :
-00023   
-00024   bool operator () (Route & __route1, Route & __route2) ;
-00025 
-00026 private :
-00027   
-00028   void repair (Route & __route, unsigned __cut1, unsigned __cut2) ;
-00029 } ;
-00030 
-00031 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    partial_mapped_xover.h

    00001 /* 
+00002 * <partial_mapped_xover.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef partial_mapped_xover_h
+00038 #define partial_mapped_xover_h
+00039 
+00040 #include <eoOp.h>
+00041 
+00042 #include "route.h"
+00043 
+00045 class PartialMappedXover : public eoQuadOp <Route> {
+00046   
+00047 public :
+00048   
+00049   bool operator () (Route & __route1, Route & __route2) ;
+00050 
+00051 private :
+00052   
+00053   void repair (Route & __route, unsigned __cut1, unsigned __cut2) ;
+00054 } ;
+00055 
+00056 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route_8h-source.html b/trunk/paradiseo-mo/doc/html/route_8h-source.html index 2015e6156..c2d382ddd 100644 --- a/trunk/paradiseo-mo/doc/html/route_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/route_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route.h Source File - +
    -
    -

    route.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT 
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef route_h
-00013 #define route_h
-00014 
-00015 #include <eoVector.h>
-00016 
-00017 typedef eoVector <float, unsigned int> Route ; // [Fitness (- length), Gene (city)]
-00018 
-00019 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route.h

    00001 /* 
+00002 * <route.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef route_h
+00038 #define route_h
+00039 
+00040 #include <eoVector.h>
+00041 
+00042 typedef eoVector <float, unsigned int> Route ; // [Fitness (- length), Gene (city)]
+00043 
+00044 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html b/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html index 8d5c3d32b..916c67702 100644 --- a/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/route__eval_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route_eval.cpp Source File - +
    -
    -

    route_eval.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route_eval.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* TEXT LICENCE
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "route_eval.h"
-00013 #include "graph.h"
-00014 
-00015 void RouteEval :: operator () (Route & __route) 
-00016 {
-00017   
-00018   float len = 0 ;
-00019   
-00020   for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
-00021     {
-00022       len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; 
-00023     }
-00024   
-00025   __route.fitness (len) ;
-00026 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route_eval.cpp

    00001 /* 
+00002 * <route_eval.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "route_eval.h"
+00038 #include "graph.h"
+00039 
+00040 void RouteEval :: operator () (Route & __route) 
+00041 {
+00042   
+00043   float len = 0 ;
+00044   
+00045   for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
+00046     {
+00047       len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; 
+00048     }
+00049   
+00050   __route.fitness (len) ;
+00051 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html b/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html index f3dd3d37e..0429932a6 100644 --- a/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/route__eval_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route_eval.h Source File - +
    -
    -

    route_eval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route_eval.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef route_eval_h
-00013 #define route_eval_h
-00014 
-00015 #include <eoEvalFunc.h>
-00016 
-00017 #include "route.h"
-00018 
-00020 class RouteEval : public eoEvalFunc <Route> 
-00021 {
-00022   
-00023 public :
-00024   
-00025   void operator () (Route & __route) ;
-00026   
-00027 } ;
-00028 
-00029 
-00030 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route_eval.h

    00001 /* 
+00002 * <route_eval.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef route_eval_h
+00038 #define route_eval_h
+00039 
+00040 #include <eoEvalFunc.h>
+00041 
+00042 #include "route.h"
+00043 
+00045 class RouteEval : public eoEvalFunc <Route> 
+00046 {
+00047   
+00048 public :
+00049   
+00050   void operator () (Route & __route) ;
+00051   
+00052 } ;
+00053 
+00054 
+00055 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html b/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html index d126cb436..5066ef27b 100644 --- a/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/route__init_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route_init.cpp Source File - +
    -
    -

    route_init.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route_init.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <utils/eoRNG.h>
-00013 
-00014 #include "route_init.h"
-00015 #include "graph.h"
-00016 
-00017 void RouteInit :: operator () (Route & __route) 
-00018 {
-00019   
-00020   // Init.
-00021   __route.clear () ;
-00022   for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
-00023     {
-00024       __route.push_back (i) ;
-00025     }
-00026   
-00027   // Swap. cities
-00028 
-00029   for (unsigned int i = 0 ; i < Graph :: size () ; i ++) 
-00030     {
-00031       //unsigned int j = rng.random (Graph :: size ()) ;
-00032       
-00033       unsigned int j = (unsigned int) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ;
-00034       unsigned int city = __route [i] ;
-00035       __route [i] = __route [j] ;
-00036       __route [j] = city ;
-00037     }   
-00038 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route_init.cpp

    00001 /* 
+00002 * <route_init.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <utils/eoRNG.h>
+00038 
+00039 #include "route_init.h"
+00040 #include "graph.h"
+00041 
+00042 void RouteInit :: operator () (Route & __route) 
+00043 {
+00044   
+00045   // Init.
+00046   __route.clear () ;
+00047   for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
+00048     {
+00049       __route.push_back (i) ;
+00050     }
+00051   
+00052   // Swap. cities
+00053 
+00054   for (unsigned int i = 0 ; i < Graph :: size () ; i ++) 
+00055     {
+00056       //unsigned int j = rng.random (Graph :: size ()) ;
+00057       
+00058       unsigned int j = (unsigned int) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ;
+00059       unsigned int city = __route [i] ;
+00060       __route [i] = __route [j] ;
+00061       __route [j] = city ;
+00062     }   
+00063 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route__init_8h-source.html b/trunk/paradiseo-mo/doc/html/route__init_8h-source.html index c8d6295e7..d1ee35a26 100644 --- a/trunk/paradiseo-mo/doc/html/route__init_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/route__init_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route_init.h Source File - +
    -
    -

    route_init.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route_init.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2002-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef route_init_h
-00013 #define route_init_h
-00014 
-00015 #include <eoInit.h>
-00016 
-00017 #include "route.h"
-00018 
-00019 class RouteInit : public eoInit <Route> 
-00020 {
-00021   
-00022 public :
-00023   
-00024   void operator () (Route & __route) ;
-00025   
-00026 } ;
-00027 
-00028 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route_init.h

    00001 /* 
+00002 * <route_init.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef route_init_h
+00038 #define route_init_h
+00039 
+00040 #include <eoInit.h>
+00041 
+00042 #include "route.h"
+00043 
+00044 class RouteInit : public eoInit <Route> 
+00045 {
+00046   
+00047 public :
+00048   
+00049   void operator () (Route & __route) ;
+00050   
+00051 } ;
+00052 
+00053 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html b/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html index 3b4e6f3af..a764ff267 100644 --- a/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/route__valid_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route_valid.cpp Source File - +
    -
    -

    route_valid.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route_valid.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "route_valid.h"
-00013 
-00014 #include <vector>
-00015 
-00016 bool valid (Route & __route) 
-00017 {
-00018   
-00019   std::vector<unsigned int> t;
-00020   t.resize(__route.size());
-00021   
-00022   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00023     {
-00024       t [i] = 0 ;
-00025     }
-00026   
-00027   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00028     {
-00029       t [__route [i]] ++ ;
-00030     }
-00031   
-00032   for (unsigned int i = 0 ; i < __route.size () ; i ++)
-00033     {
-00034       if (t [i] != 1)
-00035         {
-00036           t.clear();
-00037           return false ;
-00038         }
-00039     }
-00040   
-00041   t.clear();
-00042   return true ; // OK.
-00043 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route_valid.cpp

    00001 /* 
+00002 * <route_valid.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "route_valid.h"
+00038 
+00039 #include <vector>
+00040 
+00041 bool valid (Route & __route) 
+00042 {
+00043   
+00044   std::vector<unsigned int> t;
+00045   t.resize(__route.size());
+00046   
+00047   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00048     {
+00049       t [i] = 0 ;
+00050     }
+00051   
+00052   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00053     {
+00054       t [__route [i]] ++ ;
+00055     }
+00056   
+00057   for (unsigned int i = 0 ; i < __route.size () ; i ++)
+00058     {
+00059       if (t [i] != 1)
+00060         {
+00061           t.clear();
+00062           return false ;
+00063         }
+00064     }
+00065   
+00066   t.clear();
+00067   return true ; // OK.
+00068 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html b/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html index dd62cd522..60d7923ab 100644 --- a/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/route__valid_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: route_valid.h Source File - +
    -
    -

    route_valid.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "route_valid.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef route_valid_h
-00013 #define route_valid_h
-00014 
-00015 #include "route.h"
-00016 
-00017 bool valid (Route & __route) ;
-00018 
-00019 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    route_valid.h

    00001 /* 
+00002 * <route_valid.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef route_valid_h
+00038 #define route_valid_h
+00039 
+00040 #include "route.h"
+00041 
+00042 bool valid (Route & __route) ;
+00043 
+00044 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/search.idx b/trunk/paradiseo-mo/doc/html/search.idx index 7260a3bf9..cf8ca498c 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 766a451e7..da7541e01 100644 --- a/trunk/paradiseo-mo/doc/html/search.php +++ b/trunk/paradiseo-mo/doc/html/search.php @@ -1,13 +1,14 @@ - + Search - +
    • Main Page
      • +
    • Namespaces
    • Classes
    • Files
    • @@ -374,8 +375,8 @@ main(); ?> -
      Generated on Tue Sep 25 16:25:47 2007 for PARADISEO-MO by  +
      Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
      +doxygen 1.4.7
      diff --git a/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html b/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html index bd4af5727..c6835a15e 100644 --- a/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/simulated__annealing_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: simulated_annealing.cpp Source File - +
      -
      -

      simulated_annealing.cpp

      00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "simulated_annealing.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008 
-00009    Contact:  paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <mo.h>
-00013 
-00014 #include <graph.h>
-00015 #include <route.h>
-00016 #include <route_eval.h>
-00017 #include <route_init.h>
-00018 
-00019 #include <two_opt.h>
-00020 #include <two_opt_rand.h>
-00021 #include <two_opt_incr_eval.h>
-00022 
-00023 int
-00024 main (int __argc, char * __argv []) 
-00025 {
-00026   if (__argc != 2) 
-00027     {
-00028       std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ;
-00029       return 1 ;
-00030     }
-00031   
-00032   Graph :: load (__argv [1]) ; // Instance
-00033 
-00034   Route route ; // Solution
-00035   
-00036   RouteInit init ; // Sol. Random Init.
-00037   init (route) ;
+
    +

    simulated_annealing.cpp

    00001 /* 
+00002 * <simulated_annealing.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <mo.h>
 00038 
-00039   RouteEval full_eval ; // Full. Eval.
-00040   full_eval (route) ;
-00041   
-00042   std :: cout << "[From] " << route << std :: endl ;
-00043   
-00044   /* Tools for an efficient (? :-))
-00045      local search ! */
-00046   
-00047   TwoOptRand two_opt_rand ; // Route Random. Gen.
-00048      
-00049   TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
-00050   
-00051   TwoOpt move ;
-00052   
-00053   moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule 
-00054   //moLinearCoolingSchedule cool_sched (0.1, 0.5) ; // Linear Cooling Schedule 
-00055   
-00056   moGenSolContinue <Route> cont (1000) ; /* Temperature Descreasing
-00057                                             will occur each 1000
-00058                                             iterations */ 
-00059   
-00060   moSA <TwoOpt> simulated_annealing (two_opt_rand, two_opt_incr_eval, cont, 1000, cool_sched, full_eval) ;
-00061   simulated_annealing (route) ;
-00062 
-00063   std :: cout << "[To] " << route << std :: endl ;
-00064   
-00065   return 0 ;
-00066 }
-00067 
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00039 #include <graph.h> +00040 #include <route.h> +00041 #include <route_eval.h> +00042 #include <route_init.h> +00043 +00044 #include <two_opt.h> +00045 #include <two_opt_rand.h> +00046 #include <two_opt_incr_eval.h> +00047 +00048 int +00049 main (int __argc, char * __argv []) +00050 { +00051 if (__argc != 2) +00052 { +00053 std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ; +00054 return 1 ; +00055 } +00056 +00057 Graph :: load (__argv [1]) ; // Instance +00058 +00059 Route route ; // Solution +00060 +00061 RouteInit init ; // Sol. Random Init. +00062 init (route) ; +00063 +00064 RouteEval full_eval ; // Full. Eval. +00065 full_eval (route) ; +00066 +00067 std :: cout << "[From] " << route << std :: endl ; +00068 +00069 /* Tools for an efficient (? :-)) +00070 local search ! */ +00071 +00072 TwoOptRand two_opt_rand ; // Route Random. Gen. +00073 +00074 TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. +00075 +00076 TwoOpt move ; +00077 +00078 moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule +00079 //moLinearCoolingSchedule cool_sched (0.1, 0.5) ; // Linear Cooling Schedule +00080 +00081 moGenSolContinue <Route> cont (1000) ; /* Temperature Descreasing +00082 will occur each 1000 +00083 iterations */ +00084 +00085 moSA <TwoOpt> simulated_annealing (two_opt_rand, two_opt_incr_eval, cont, 1000, cool_sched, full_eval) ; +00086 simulated_annealing (route) ; +00087 +00088 std :: cout << "[To] " << route << std :: endl ; +00089 +00090 return 0 ; +00091 } +00092 +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html b/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html index 88d184923..90d9312ce 100644 --- a/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/t-mo_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: t-mo.cpp Source File - +
    -
    -

    t-mo.cpp

    00001 //-----------------------------------------------------------------------------
-00002 // t-mo.cpp
-00003 //-----------------------------------------------------------------------------
-00004 
-00005 #include <eo>  // EO
-00006 #include <mo.h>  // MO
-00007 
-00008 //-----------------------------------------------------------------------------
-00009 
-00010 typedef EO<float> Chrom;
-00011 
-00012 //-----------------------------------------------------------------------------
-00013 
-00014 int main()
-00015 {
-00016   Chrom chrom1, chrom2;
-00017 
-00018   std::cout << "chrom1 = " << chrom1 << std::endl
-00019        << "chrom2 = " << chrom2 << std::endl;
-00020 
-00021   return 0;
-00022 }
-00023 
-00024 //-----------------------------------------------------------------------------
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  + +

    t-mo.cpp

    00001 /* 
+00002 * <t-mo.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 //-----------------------------------------------------------------------------
+00037 // t-mo.cpp
+00038 //-----------------------------------------------------------------------------
+00039 
+00040 #include <eo>  // EO
+00041 #include <mo.h>  // MO
+00042 
+00043 //-----------------------------------------------------------------------------
+00044 
+00045 typedef EO<float> Chrom;
+00046 
+00047 //-----------------------------------------------------------------------------
+00048 
+00049 int main()
+00050 {
+00051   Chrom chrom1, chrom2;
+00052 
+00053   std::cout << "chrom1 = " << chrom1 << std::endl
+00054        << "chrom2 = " << chrom2 << std::endl;
+00055 
+00056   return 0;
+00057 }
+00058 
+00059 //-----------------------------------------------------------------------------
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/tabs.css b/trunk/paradiseo-mo/doc/html/tabs.css index c37faafe8..a61552a67 100644 --- a/trunk/paradiseo-mo/doc/html/tabs.css +++ b/trunk/paradiseo-mo/doc/html/tabs.css @@ -82,13 +82,13 @@ DIV.tabs A:hover SPAN background-position: 0% -150px; } -DIV.tabs LI.current A +DIV.tabs LI#current A { background-position: 100% -150px; border-width : 0px; } -DIV.tabs LI.current SPAN +DIV.tabs LI#current SPAN { background-position: 0% -150px; padding-bottom : 6px; diff --git a/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html b/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html index f1d953448..79a1f2795 100644 --- a/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/tabu__search_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: tabu_search.cpp Source File - +
    -
    -

    tabu_search.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "tabu_search.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include <mo.h>
-00013 
-00014 #include <graph.h>
-00015 #include <route.h>
-00016 #include <route_eval.h>
-00017 #include <route_init.h>
-00018 
-00019 #include <two_opt.h>
-00020 #include <two_opt_init.h>
-00021 #include <two_opt_next.h>
-00022 #include <two_opt_incr_eval.h>
-00023 #include <two_opt_tabu_list.h>
-00024 
-00025 int
-00026 main (int __argc, char * __argv []) 
-00027 {
-00028   if (__argc != 2) 
-00029     {
-00030       std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ;
-00031       return 1 ;
-00032     }
-00033   
-00034   Graph :: load (__argv [1]) ; // Instance
-00035   
-00036   Route route ; // Solution
-00037   
-00038   RouteInit init ; // Sol. Random Init.
-00039   init (route) ;
-00040   
-00041   RouteEval full_eval ; // Full. Eval.
-00042   full_eval (route) ;
-00043   
-00044   std :: cout << "[From] " << route << std :: endl ;
-00045 
-00046   /* Tools for an efficient (? :-))
-00047      local search ! */
-00048   
-00049   TwoOptInit two_opt_init ; // Init.
-00050    
-00051   TwoOptNext two_opt_next ; // Explorer.
-00052   
-00053   TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
-00054 
-00055   TwoOptTabuList tabu_list ; // Tabu List
-00056   //moSimpleMoveTabuList<TwoOpt> tabu_list(10);
-00057   //moSimpleSolutionTabuList<TwoOpt> tabu_list(10);
-00058 
-00059   moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion
-00060 
-00061   moGenSolContinue <Route> cont (10000) ; // Continuator
-00062 
-00063   moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ;
-00064   tabu_search (route) ;
+
    +

    tabu_search.cpp

    00001 /* 
+00002 * <tabu_search.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include <mo.h>
+00038 
+00039 #include <graph.h>
+00040 #include <route.h>
+00041 #include <route_eval.h>
+00042 #include <route_init.h>
+00043 
+00044 #include <two_opt.h>
+00045 #include <two_opt_init.h>
+00046 #include <two_opt_next.h>
+00047 #include <two_opt_incr_eval.h>
+00048 #include <two_opt_tabu_list.h>
+00049 
+00050 int
+00051 main (int __argc, char * __argv []) 
+00052 {
+00053   if (__argc != 2) 
+00054     {
+00055       std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ;
+00056       return 1 ;
+00057     }
+00058   
+00059   Graph :: load (__argv [1]) ; // Instance
+00060   
+00061   Route route ; // Solution
+00062   
+00063   RouteInit init ; // Sol. Random Init.
+00064   init (route) ;
 00065   
-00066   std :: cout << "[To] " << route << std :: endl ;
-00067   
-00068   return 0 ;
-00069 }
+00066   RouteEval full_eval ; // Full. Eval.
+00067   full_eval (route) ;
+00068   
+00069   std :: cout << "[From] " << route << std :: endl ;
 00070 
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00071 /* Tools for an efficient (? :-)) +00072 local search ! */ +00073 +00074 TwoOptInit two_opt_init ; // Init. +00075 +00076 TwoOptNext two_opt_next ; // Explorer. +00077 +00078 TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. +00079 +00080 TwoOptTabuList tabu_list ; // Tabu List +00081 //moSimpleMoveTabuList<TwoOpt> tabu_list(10); +00082 //moSimpleSolutionTabuList<TwoOpt> tabu_list(10); +00083 +00084 moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion +00085 +00086 moGenSolContinue <Route> cont (10000) ; // Continuator +00087 +00088 moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ; +00089 tabu_search (route) ; +00090 +00091 std :: cout << "[To] " << route << std :: endl ; +00092 +00093 return 0 ; +00094 } +00095 +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7
    diff --git a/trunk/paradiseo-mo/doc/html/tree.html b/trunk/paradiseo-mo/doc/html/tree.html index 78dd4585c..00bc3a01d 100644 --- a/trunk/paradiseo-mo/doc/html/tree.html +++ b/trunk/paradiseo-mo/doc/html/tree.html @@ -1,6 +1,6 @@ - + @@ -61,25 +61,24 @@
    -

    PARADISEO-MO

    +

    ParadisEO-MOMovingObjects

    o*Welcome to PARADISEO-Moving Objects

    o+Class List

    o+Class Hierarchy

    |o*EmptySelection

    -

    |o+eoFunctorBase [external]

    +

    |o+eoFunctorBase [external]

    -

    ||o+eoBF< M &, const M::EOType &, bool > [external]

    +

    ||o+eoBF< EOType &, EOType &, bool > [external]

    -

    ||o+eoBF< M &, const M::EOType &, void > [external]

    +

    ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

    -

    ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

    -
    -

    |||\+moMoveSelect< M >

    - -

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

    -
    -

    |||\+moSolContinue< EOT >

    +

    ||o+eoUF< A1, R > [external]

    +
    +

    |||o+eoEvalFunc< EOT > [external]

    + +

    |||\+eoInit< EOT > [external]

    +

    ||| \*RouteInit

    +
    +
    +

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

    + -

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

    -
    -

    |||\+moCoolingSchedule

    -
    +

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

    + -

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

    -
    -

    |||\+eoMonOp< EOT > [external]

    -
    +

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

    +
    +

    |||\+eoMonOp< EOT > [external]

    +
    -

    ||o+eoUF< EOT &, void > [external]

    -
    -

    |||\*moMove< EOT >

    +

    ||o+eoUF< EOT &, void > [external]

    + -

    ||o*eoUF< EOType &, bool > [external]

    -

    ||o+eoUF< M &, void > [external]

    -
    +

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

    +
    +

    |||\+eoMonOp< EOType > [external]

    +
    +

    ||| \*CitySwap

    +
    +
    +

    ||o+eoUF< eoVector< float, unsigned int > &, void > [external]

    + +

    ||o+eoUF< M &, void > [external]

    + -

    ||\+eoUF< M::EOType &, bool > [external]

    -
    -

    || \+eoMonOp< M::EOType > [external]

    -
    -

    ||  \+moAlgo< M::EOType >

    - -

    |\+eoOp< EOType > [external]

    -
    -

    | o*eoMonOp< EOT > [external]

    -

    | \*eoMonOp< M::EOType > [external]

    +

    |o+eoOp< EOType > [external]

    +
    +

    ||o*eoMonOp< EOType > [external]

    +

    ||o*eoMonOp< EOT > [external]

    +

    ||o*eoMonOp< M::EOType > [external]

    +

    ||\*eoQuadOp< EOType > [external]

    +
    +

    |\+eoPrintable [external]

    +
    +

    | \+eoPersistent [external]

    +
    +

    |  \*TwoOpt

    +

    o*Class Members

    -

    \+File List

    -
    +

    o+Namespace List

    +
    +

    |\*Graph

    +
    +

    o*Namespace Members

    +

    \+File List

    +
    +

     o*city_swap.cpp

    +

     o*city_swap.h

    +

     o*edge_xover.cpp

    +

     o*edge_xover.h

    +

     o*graph.cpp

    +

     o*graph.h

    +

     o*hill_climbing.cpp

     o*index.h

    +

     o*iterated_local_search.cpp

    +

     o*mix.h

     o*mo.h

     o*moAlgo.h

     o*moAspirCrit.h

     o*moBestImprSelect.h

    -

     o*moComparator.h

     o*moCoolingSchedule.h

     o*moExponentialCoolingSchedule.h

     o*moFirstImprSelect.h

    -

     o*moFitComparator.h

     o*moFitSolContinue.h

     o*moGenSolContinue.h

     o*moHC.h

     o*moHCMoveLoopExpl.h

    -

     o*moILS.h

     o*moImprBestFitAspirCrit.h

     o*moItRandNextMove.h

     o*moLinearCoolingSchedule.h

    @@ -265,7 +333,39 @@

     o*moSteadyFitSolContinue.h

     o*moTabuList.h

     o*moTS.h

    -

     \*moTSMoveLoopExpl.h

    +

     o*moTSMoveLoopExpl.h

    +

     o*order_xover.cpp

    +

     o*order_xover.h

    +

     o*part_route_eval.cpp

    +

     o*part_route_eval.h

    +

     o*part_two_opt_init.cpp

    +

     o*part_two_opt_init.h

    +

     o*part_two_opt_next.cpp

    +

     o*part_two_opt_next.h

    +

     o*partial_mapped_xover.cpp

    +

     o*partial_mapped_xover.h

    +

     o*route.h

    +

     o*route_eval.cpp

    +

     o*route_eval.h

    +

     o*route_init.cpp

    +

     o*route_init.h

    +

     o*route_valid.cpp

    +

     o*route_valid.h

    +

     o*simulated_annealing.cpp

    +

     o*t-mo.cpp

    +

     o*tabu_search.cpp

    +

     o*two_opt.cpp

    +

     o*two_opt.h

    +

     o*two_opt_incr_eval.cpp

    +

     o*two_opt_incr_eval.h

    +

     o*two_opt_init.cpp

    +

     o*two_opt_init.h

    +

     o*two_opt_next.cpp

    +

     o*two_opt_next.h

    +

     o*two_opt_rand.cpp

    +

     o*two_opt_rand.h

    +

     o*two_opt_tabu_list.cpp

    +

     \*two_opt_tabu_list.h

    diff --git a/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html index c9640f156..8c3ee8a9b 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt.cpp Source File - +
    -
    -

    two_opt.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "two_opt.h"
-00013 
-00014 TwoOpt TwoOpt :: operator ! () const 
-00015 {
-00016   TwoOpt move = * this ;
-00017   std :: swap (move.first, move.second) ;
-00018   
-00019   return move ;
-00020 }
-00021 
-00022 void TwoOpt :: operator () (Route & __route) 
-00023 {
-00024   
-00025   std :: vector <unsigned int> seq_cities ;
-00026   
-00027   for (unsigned int i = second ; i > first ; i --)
-00028     {
-00029       seq_cities.push_back (__route [i]) ;
-00030     }
-00031   
-00032   unsigned int j = 0 ;
-00033   for (unsigned int i = first + 1 ; i < second + 1 ; i ++)
-00034     {
-00035       __route [i] = seq_cities [j ++] ;
-00036     }
-00037 }
+
    +

    two_opt.cpp

    00001 /* 
+00002 * <two_opt.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "two_opt.h"
 00038 
-00039 void TwoOpt :: readFrom (std :: istream & __is) 
-00040 {
-00041   __is >> first >> second ;
-00042 }
-00043 
-00044 void TwoOpt :: printOn (std :: ostream & __os) const 
-00045 {
-00046   __os << first << ' ' << second ;
-00047 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +00039 TwoOpt TwoOpt :: operator ! () const +00040 { +00041 TwoOpt move = * this ; +00042 std :: swap (move.first, move.second) ; +00043 +00044 return move ; +00045 } +00046 +00047 void TwoOpt :: operator () (Route & __route) +00048 { +00049 +00050 std :: vector <unsigned int> seq_cities ; +00051 +00052 for (unsigned int i = second ; i > first ; i --) +00053 { +00054 seq_cities.push_back (__route [i]) ; +00055 } +00056 +00057 unsigned int j = 0 ; +00058 for (unsigned int i = first + 1 ; i < second + 1 ; i ++) +00059 { +00060 __route [i] = seq_cities [j ++] ; +00061 } +00062 } +00063 +00064 void TwoOpt :: readFrom (std :: istream & __is) +00065 { +00066 __is >> first >> second ; +00067 } +00068 +00069 void TwoOpt :: printOn (std :: ostream & __os) const +00070 { +00071 __os << first << ' ' << second ; +00072 } +
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7 diff --git a/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html index b5796eb7f..c8f4c4be7 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt.h Source File - +
    -
    -

    two_opt.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef two_opt_h
-00013 #define two_opt_h
-00014 
-00015 #include <eoPersistent.h>
-00016 
-00017 #include <utility>
-00018 #include <moMove.h>
-00019 
-00020 #include "route.h"
-00021 
-00022 class TwoOpt : public moMove <Route>, public std :: pair <unsigned, unsigned>, public eoPersistent 
-00023 {
-00024   
-00025 public :
-00026   
-00027   TwoOpt operator ! () const ;
-00028   
-00029   void operator () (Route & __route) ;
-00030   
-00031   void readFrom (std :: istream & __is) ;
-00032   
-00033   void printOn (std :: ostream & __os) const ;
-00034 } ;
-00035 
-00036 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt.h

    00001 /* 
+00002 * <two_opt.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef two_opt_h
+00038 #define two_opt_h
+00039 
+00040 #include <eoPersistent.h>
+00041 
+00042 #include <utility>
+00043 #include <moMove.h>
+00044 
+00045 #include "route.h"
+00046 
+00047 class TwoOpt : public moMove <Route>, public std :: pair <unsigned, unsigned>, public eoPersistent 
+00048 {
+00049   
+00050 public :
+00051   
+00052   TwoOpt operator ! () const ;
+00053   
+00054   void operator () (Route & __route) ;
+00055   
+00056   void readFrom (std :: istream & __is) ;
+00057   
+00058   void printOn (std :: ostream & __os) const ;
+00059 } ;
+00060 
+00061 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html index 7f88d424a..108a18b4c 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_incr_eval.cpp Source File - +
    -
    -

    two_opt_incr_eval.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "TwoOptIncrEval.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "two_opt_incr_eval.h"
-00013 #include "graph.h"
-00014 
-00015 float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) 
-00016 {
-00017   // From
-00018   unsigned int v1 = __route [__move.first], v1_next = __route [__move.first + 1] ;
-00019   
-00020   // To
-00021   unsigned int v2 = __route [__move.second], v2_next = __route [__move.second + 1] ;
-00022   
-00023   return __route.fitness ()
-00024     - Graph :: distance (v1, v2)
-00025     - Graph :: distance (v1_next, v2_next)
-00026     + Graph :: distance (v1, v1_next)
-00027     + Graph :: distance (v2, v2_next)  ;
-00028 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_incr_eval.cpp

    00001 /* 
+00002 * <two_opt_incr_eval.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "two_opt_incr_eval.h"
+00038 #include "graph.h"
+00039 
+00040 float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) 
+00041 {
+00042   // From
+00043   unsigned int v1 = __route [__move.first], v1_next = __route [__move.first + 1] ;
+00044   
+00045   // To
+00046   unsigned int v2 = __route [__move.second], v2_next = __route [__move.second + 1] ;
+00047   
+00048   return __route.fitness ()
+00049     - Graph :: distance (v1, v2)
+00050     - Graph :: distance (v1_next, v2_next)
+00051     + Graph :: distance (v1, v1_next)
+00052     + Graph :: distance (v2, v2_next)  ;
+00053 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html index 000b6e9c9..2d177610e 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__incr__eval_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_incr_eval.h Source File - +
    -
    -

    two_opt_incr_eval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "TwoOptIncrEval.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef two_optincr_eval_h
-00013 #define two_optincr_eval_h
-00014 
-00015 #include <moMoveIncrEval.h>
-00016 #include "two_opt.h"
-00017 
-00018 class TwoOptIncrEval : public moMoveIncrEval <TwoOpt> 
-00019 {
-00020   
-00021 public :
-00022   
-00023   float operator () (const TwoOpt & __move, const Route & __route) ; 
-00024 
-00025 } ;
-00026 
-00027 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_incr_eval.h

    00001 /* 
+00002 * <two_opt_incr_eval.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef two_optincr_eval_h
+00038 #define two_optincr_eval_h
+00039 
+00040 #include <moMoveIncrEval.h>
+00041 #include "two_opt.h"
+00042 
+00043 class TwoOptIncrEval : public moMoveIncrEval <TwoOpt> 
+00044 {
+00045   
+00046 public :
+00047   
+00048   float operator () (const TwoOpt & __move, const Route & __route) ; 
+00049 
+00050 } ;
+00051 
+00052 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html index efa6a8be9..908b4c498 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__init_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_init.cpp Source File - +
    -
    -

    two_opt_init.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_init.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "two_opt_init.h"
-00013 
-00014 void TwoOptInit :: operator () (TwoOpt & __move, const Route & __route) 
-00015 {
-00016   __move.first = 0 ;
-00017   __move.second = 2 ;
-00018 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_init.cpp

    00001 /* 
+00002 * <two_opt_init.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "two_opt_init.h"
+00038 
+00039 void TwoOptInit :: operator () (TwoOpt & __move, const Route & __route) 
+00040 {
+00041   __move.first = 0 ;
+00042   __move.second = 2 ;
+00043 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html index 7399aa11a..35d4e7388 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__init_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_init.h Source File - +
    -
    -

    two_opt_init.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_init.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef two_opt_init_h
-00013 #define two_opt_init_h
-00014 
-00015 #include <moMoveInit.h>
-00016 
-00017 #include "two_opt.h"
-00018 
-00020 class TwoOptInit : public moMoveInit <TwoOpt> 
-00021 {
-00022   
-00023 public :
-00024   
-00025   void operator () (TwoOpt & __move, const Route & __route) ;
-00026   
-00027 } ;
-00028 
-00029 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_init.h

    00001 /* 
+00002 * <two_opt_init.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef two_opt_init_h
+00038 #define two_opt_init_h
+00039 
+00040 #include <moMoveInit.h>
+00041 
+00042 #include "two_opt.h"
+00043 
+00045 class TwoOptInit : public moMoveInit <TwoOpt> 
+00046 {
+00047   
+00048 public :
+00049   
+00050   void operator () (TwoOpt & __move, const Route & __route) ;
+00051   
+00052 } ;
+00053 
+00054 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html index eb7576154..6775378d7 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__next_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_next.cpp Source File - +
    -
    -

    two_opt_next.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_next.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "two_opt_next.h"
-00013 #include "graph.h"
-00014 
-00015 bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) 
-00016 {
-00017   if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2)
-00018     {
-00019       return false ;
-00020     }
-00021   else 
-00022     {
-00023       __move.second ++ ;
-00024       if (__move.second == Graph :: size () - 1) 
-00025         {
-00026           __move.first ++ ;
-00027           __move.second = __move.first + 2 ;
-00028         }
-00029       
-00030       return true ;
-00031     }
-00032 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_next.cpp

    00001 /* 
+00002 * <two_opt_next.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "two_opt_next.h"
+00038 #include "graph.h"
+00039 
+00040 bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) 
+00041 {
+00042   if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2)
+00043     {
+00044       return false ;
+00045     }
+00046   else 
+00047     {
+00048       __move.second ++ ;
+00049       if (__move.second == Graph :: size () - 1) 
+00050         {
+00051           __move.first ++ ;
+00052           __move.second = __move.first + 2 ;
+00053         }
+00054       
+00055       return true ;
+00056     }
+00057 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html index 4bc1d19c0..a30be4f8c 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__next_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_next.h Source File - +
    -
    -

    two_opt_next.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_next.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef two_opt_next_h
-00013 #define two_opt_next_h
-00014 
-00015 #include <moNextMove.h>
-00016 #include "two_opt.h"
-00017 
-00019 class TwoOptNext : public moNextMove <TwoOpt> 
-00020 {
-00021   
-00022 public :
-00023   
-00024   bool operator () (TwoOpt & __move, const Route & __route) ;
-00025   
-00026 } ;
-00027 
-00028 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_next.h

    00001 /* 
+00002 * <two_opt_next.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef two_opt_next_h
+00038 #define two_opt_next_h
+00039 
+00040 #include <moNextMove.h>
+00041 #include "two_opt.h"
+00042 
+00044 class TwoOptNext : public moNextMove <TwoOpt> 
+00045 {
+00046   
+00047 public :
+00048   
+00049   bool operator () (TwoOpt & __move, const Route & __route) ;
+00050   
+00051 } ;
+00052 
+00053 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html index 9cdf40e44..fe993b791 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__rand_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_rand.cpp Source File - +
    -
    -

    two_opt_rand.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_rand.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "two_opt_rand.h"
-00013 #include "graph.h"
-00014 #include <utils/eoRNG.h>
-00015 
-00016 void TwoOptRand :: operator () (TwoOpt & __move) 
-00017 {
-00018   __move.first = rng.random (Graph :: size () - 3) ;
-00019   __move.second = __move.first + 2 + rng.random (Graph :: size () - __move.first - 3) ;
-00020 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_rand.cpp

    00001 /* 
+00002 * <two_opt_rand.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "two_opt_rand.h"
+00038 #include "graph.h"
+00039 #include <utils/eoRNG.h>
+00040 
+00041 void TwoOptRand :: operator () (TwoOpt & __move) 
+00042 {
+00043   __move.first = rng.random (Graph :: size () - 3) ;
+00044   __move.second = __move.first + 2 + rng.random (Graph :: size () - __move.first - 3) ;
+00045 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html index b517b7d8b..4f31b5d1c 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__rand_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_rand.h Source File - +
    -
    -

    two_opt_rand.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_rand.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef two_opt_rand_h
-00013 #define two_opt_rand_h
-00014 
-00015 #include <moRandMove.h>
-00016 
-00017 #include "two_opt.h"
-00018 
-00019 class TwoOptRand : public moRandMove <TwoOpt> 
-00020 {
-00021   
-00022 public :
-00023   
-00024   void operator () (TwoOpt & __move) ;
-00025   
-00026 } ;
-00027 
-00028 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_rand.h

    00001 /* 
+00002 * <two_opt_rand.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef two_opt_rand_h
+00038 #define two_opt_rand_h
+00039 
+00040 #include <moRandMove.h>
+00041 
+00042 #include "two_opt.h"
+00043 
+00044 class TwoOptRand : public moRandMove <TwoOpt> 
+00045 {
+00046   
+00047 public :
+00048   
+00049   void operator () (TwoOpt & __move) ;
+00050   
+00051 } ;
+00052 
+00053 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html index a78d1e67c..5686c5094 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8cpp-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_tabu_list.cpp Source File - +
    -
    -

    two_opt_tabu_list.cpp

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_tabu_list.cpp"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #include "two_opt_tabu_list.h"
-00013 #include "graph.h"
-00014 
-00015 #define TABU_LENGTH 10
-00016 
-00017 void TwoOptTabuList :: init () 
-00018 {
-00019   // Size (eventually)
-00020   tabu_span.resize (Graph :: size ()) ;
-00021   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
-00022     {
-00023       tabu_span [i].resize (Graph :: size ()) ;  
-00024     }
-00025 
-00026   // Clear
-00027   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
-00028     {
-00029       for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++)
-00030         {
-00031           tabu_span [i] [j] = 0 ;
-00032         }
-00033     }
-00034 }
-00035 
-00036 bool TwoOptTabuList :: operator () (const TwoOpt & __move, const Route & __sol) 
-00037 {
-00038   return tabu_span [__move.first] [__move.second] > 0 ;
-00039 }
-00040 
-00041 void TwoOptTabuList :: add (const TwoOpt & __move, const Route & __sol) 
-00042 {
-00043   tabu_span [__move.first] [__move.second] = tabu_span [__move.second] [__move.first] = TABU_LENGTH ;
-00044 }
-00045 
-00046 void TwoOptTabuList :: update () 
-00047 {
-00048   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
-00049     {
-00050       for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++)
-00051         {
-00052           if (tabu_span [i] [j] > 0)
-00053             {
-00054               tabu_span [i] [j] -- ;
-00055             }
-00056         }
-00057     }
-00058 }
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_tabu_list.cpp

    00001 /* 
+00002 * <two_opt_tabu_list.cpp>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #include "two_opt_tabu_list.h"
+00038 #include "graph.h"
+00039 
+00040 #define TABU_LENGTH 10
+00041 
+00042 void TwoOptTabuList :: init () 
+00043 {
+00044   // Size (eventually)
+00045   tabu_span.resize (Graph :: size ()) ;
+00046   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
+00047     {
+00048       tabu_span [i].resize (Graph :: size ()) ;  
+00049     }
+00050 
+00051   // Clear
+00052   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
+00053     {
+00054       for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++)
+00055         {
+00056           tabu_span [i] [j] = 0 ;
+00057         }
+00058     }
+00059 }
+00060 
+00061 bool TwoOptTabuList :: operator () (const TwoOpt & __move, const Route & __sol) 
+00062 {
+00063   return tabu_span [__move.first] [__move.second] > 0 ;
+00064 }
+00065 
+00066 void TwoOptTabuList :: add (const TwoOpt & __move, const Route & __sol) 
+00067 {
+00068   tabu_span [__move.first] [__move.second] = tabu_span [__move.second] [__move.first] = TABU_LENGTH ;
+00069 }
+00070 
+00071 void TwoOptTabuList :: update () 
+00072 {
+00073   for (unsigned int i = 0 ; i < tabu_span.size () ; i ++)
+00074     {
+00075       for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++)
+00076         {
+00077           if (tabu_span [i] [j] > 0)
+00078             {
+00079               tabu_span [i] [j] -- ;
+00080             }
+00081         }
+00082     }
+00083 }
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html index 85bd91b23..338b3f243 100644 --- a/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html +++ b/trunk/paradiseo-mo/doc/html/two__opt__tabu__list_8h-source.html @@ -1,16 +1,16 @@ - + ParadisEO-MOMovingObjects: two_opt_tabu_list.h Source File - +
    -
    -

    two_opt_tabu_list.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
-00002 
-00003 // "two_opt_tabu_list.h"
-00004 
-00005 // (c) OPAC Team, LIFL, 2003-2006
-00006 
-00007 /* LICENCE TEXT
-00008    
-00009    Contact: paradiseo-help@lists.gforge.inria.fr
-00010 */
-00011 
-00012 #ifndef two_opt_tabu_list_h
-00013 #define two_opt_tabu_list_h
-00014 
-00015 #include <moTabuList.h>
-00016 #include "two_opt.h"
-00017 #include "route.h"
-00018 
-00020 class TwoOptTabuList : public moTabuList <TwoOpt> 
-00021 {
-00022 public :
-00023   
-00024   bool operator () (const TwoOpt & __move, const Route & __sol) ;
-00025   
-00026   void add (const TwoOpt & __move, const Route & __sol) ;
-00027   
-00028   void update () ;
-00029   
-00030   void init () ;
-00031   
-00032 private :
-00033   
-00034   std :: vector <std :: vector <unsigned> > tabu_span ;
-00035   
-00036 } ;
-00037 
-00038 #endif
-
    Generated on Thu Sep 20 11:30:28 2007 for ParadisEO-MOMovingObjects by  +
    +

    two_opt_tabu_list.h

    00001 /* 
+00002 * <two_opt_tabu_list.h>
+00003 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+00004 * (C) OPAC Team, LIFL, 2002-2007
+00005 *
+00006 * Sébastien Cahon, Jean-Charles Boisson
+00007 *
+00008 * This software is governed by the CeCILL license under French law and
+00009 * abiding by the rules of distribution of free software.  You can  use,
+00010 * modify and/ or redistribute the software under the terms of the CeCILL
+00011 * license as circulated by CEA, CNRS and INRIA at the following URL
+00012 * "http://www.cecill.info".
+00013 *
+00014 * As a counterpart to the access to the source code and  rights to copy,
+00015 * modify and redistribute granted by the license, users are provided only
+00016 * with a limited warranty  and the software's author,  the holder of the
+00017 * economic rights,  and the successive licensors  have only  limited liability.
+00018 *
+00019 * In this respect, the user's attention is drawn to the risks associated
+00020 * with loading,  using,  modifying and/or developing or reproducing the
+00021 * software by the user in light of its specific status of free software,
+00022 * that may mean  that it is complicated to manipulate,  and  that  also
+00023 * therefore means  that it is reserved for developers  and  experienced
+00024 * professionals having in-depth computer knowledge. Users are therefore
+00025 * encouraged to load and test the software's suitability as regards their
+00026 * requirements in conditions enabling the security of their systems and/or
+00027 * data to be ensured and,  more generally, to use and operate it in the
+00028 * same conditions as regards security.
+00029 * The fact that you are presently reading this means that you have had
+00030 * knowledge of the CeCILL license and that you accept its terms.
+00031 *
+00032 * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+00033 * Contact: paradiseo-help@lists.gforge.inria.fr
+00034 *
+00035 */
+00036 
+00037 #ifndef two_opt_tabu_list_h
+00038 #define two_opt_tabu_list_h
+00039 
+00040 #include <moTabuList.h>
+00041 #include "two_opt.h"
+00042 #include "route.h"
+00043 
+00045 class TwoOptTabuList : public moTabuList <TwoOpt> 
+00046 {
+00047 public :
+00048   
+00049   bool operator () (const TwoOpt & __move, const Route & __sol) ;
+00050   
+00051   void add (const TwoOpt & __move, const Route & __sol) ;
+00052   
+00053   void update () ;
+00054   
+00055   void init () ;
+00056   
+00057 private :
+00058   
+00059   std :: vector <std :: vector <unsigned> > tabu_span ;
+00060   
+00061 } ;
+00062 
+00063 #endif
+
    Generated on Mon Oct 8 09:55:33 2007 for ParadisEO-MOMovingObjects by  -doxygen 1.5.2
    +doxygen 1.4.7     diff --git a/trunk/paradiseo-mo/doc/latex/annotated.tex b/trunk/paradiseo-mo/doc/latex/annotated.tex index d2ebcce06..b6923971e 100644 --- a/trunk/paradiseo-mo/doc/latex/annotated.tex +++ b/trunk/paradiseo-mo/doc/latex/annotated.tex @@ -1,40 +1,52 @@ -\section{PARADISEO-MO Class List} +\section{Paradis\-EO-MOMoving\-Objects Class List} Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList} -\item\contentsline{section}{{\bf EmptySelection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} -\item\contentsline{section}{{\bf moAlgo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} -\item\contentsline{section}{{\bf moAspirCrit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} -\item\contentsline{section}{{\bf moBestImprSelect$<$ M $>$} (One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} -\item\contentsline{section}{{\bf moComparator$<$ EOT $>$} (Template for classes which need to compare two EOT and indicate if the first is \char`\"{}better\char`\"{} than the second )}{\pageref{classmo_comparator}}{} -\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 moFitComparator$<$ EOT $>$} (Comparison according to the fitness )}{\pageref{classmo_fit_comparator}}{} -\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 stop 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 moILS$<$ M $>$} (Iterated Local Search (ILS) )}{\pageref{classmo_i_l_s}}{} -\item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item\contentsline{section}{{\bf moItRandNextMove$<$ M $>$} (One of the possible \doxyref{moNextMove}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} -\item\contentsline{section}{{\bf moLinearCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} -\item\contentsline{section}{{\bf moLSCheckPoint$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} -\item\contentsline{section}{{\bf moMove$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} -\item\contentsline{section}{{\bf moMoveExpl$<$ M $>$} (Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} -\item\contentsline{section}{{\bf moMoveIncrEval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{} -\item\contentsline{section}{{\bf moMoveInit$<$ M $>$} (Move (\doxyref{moMove}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{} -\item\contentsline{section}{{\bf moMoveLoopExpl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{} -\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 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}}{} +\item\contentsline{section}{\bf{City\-Swap} (Its swaps two vertices randomly choosen )}{\pageref{class_city_swap}}{} +\item\contentsline{section}{\bf{Edge\-Xover} (Edge Crossover )}{\pageref{class_edge_xover}}{} +\item\contentsline{section}{\bf{Empty\-Selection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} +\item\contentsline{section}{\bf{mo\-Algo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} +\item\contentsline{section}{\bf{mo\-Aspir\-Crit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} +\item\contentsline{section}{\bf{mo\-Best\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} +\item\contentsline{section}{\bf{mo\-Cooling\-Schedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} +\item\contentsline{section}{\bf{mo\-Exponential\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} +\item\contentsline{section}{\bf{mo\-First\-Impr\-Select$<$ M $>$} (One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} +\item\contentsline{section}{\bf{mo\-Fit\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_fit_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-HC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} +\item\contentsline{section}{\bf{mo\-HCMove\-Loop\-Expl$<$ M $>$} (Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} +\item\contentsline{section}{\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} (One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} +\item\contentsline{section}{\bf{mo\-It\-Rand\-Next\-Move$<$ M $>$} (One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} +\item\contentsline{section}{\bf{mo\-Linear\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} +\item\contentsline{section}{\bf{mo\-LSCheck\-Point$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} +\item\contentsline{section}{\bf{mo\-Move$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} +\item\contentsline{section}{\bf{mo\-Move\-Expl$<$ M $>$} (Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} +\item\contentsline{section}{\bf{mo\-Move\-Incr\-Eval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{} +\item\contentsline{section}{\bf{mo\-Move\-Init$<$ M $>$} (Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{} +\item\contentsline{section}{\bf{mo\-Move\-Loop\-Expl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{} +\item\contentsline{section}{\bf{mo\-Move\-Select$<$ M $>$} (Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} +\item\contentsline{section}{\bf{mo\-Next\-Move$<$ M $>$} (Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} +\item\contentsline{section}{\bf{mo\-No\-Aspir\-Crit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} +\item\contentsline{section}{\bf{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_no_fit_impr_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Rand\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} +\item\contentsline{section}{\bf{mo\-Rand\-Move$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} +\item\contentsline{section}{\bf{mo\-SA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} +\item\contentsline{section}{\bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} +\item\contentsline{section}{\bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} +\item\contentsline{section}{\bf{mo\-Sol\-Continue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} (One possible stopping criterion for a solution-based heuristic )}{\pageref{classmo_steady_fit_sol_continue}}{} +\item\contentsline{section}{\bf{mo\-Tabu\-List$<$ M $>$} (Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} +\item\contentsline{section}{\bf{mo\-TS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} +\item\contentsline{section}{\bf{mo\-TSMove\-Loop\-Expl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} +\item\contentsline{section}{\bf{Order\-Xover} (Order Crossover )}{\pageref{class_order_xover}}{} +\item\contentsline{section}{\bf{Partial\-Mapped\-Xover} (Partial Mapped Crossover )}{\pageref{class_partial_mapped_xover}}{} +\item\contentsline{section}{\bf{Part\-Route\-Eval} (Route Evaluator )}{\pageref{class_part_route_eval}}{} +\item\contentsline{section}{\bf{Part\-Two\-Opt\-Init} (It sets the first couple of edges )}{\pageref{class_part_two_opt_init}}{} +\item\contentsline{section}{\bf{Part\-Two\-Opt\-Next} (It updates a couple of edges )}{\pageref{class_part_two_opt_next}}{} +\item\contentsline{section}{\bf{Route\-Eval} (Route Evaluator )}{\pageref{class_route_eval}}{} +\item\contentsline{section}{\bf{Route\-Init} }{\pageref{class_route_init}}{} +\item\contentsline{section}{\bf{Two\-Opt} }{\pageref{class_two_opt}}{} +\item\contentsline{section}{\bf{Two\-Opt\-Incr\-Eval} }{\pageref{class_two_opt_incr_eval}}{} +\item\contentsline{section}{\bf{Two\-Opt\-Init} (It sets the first couple of edges )}{\pageref{class_two_opt_init}}{} +\item\contentsline{section}{\bf{Two\-Opt\-Next} (It updates a couple of edges )}{\pageref{class_two_opt_next}}{} +\item\contentsline{section}{\bf{Two\-Opt\-Rand} }{\pageref{class_two_opt_rand}}{} +\item\contentsline{section}{\bf{Two\-Opt\-Tabu\-List} (The table of tabu movements, i.e )}{\pageref{class_two_opt_tabu_list}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/class_city_swap.tex b/trunk/paradiseo-mo/doc/latex/class_city_swap.tex index 55809249f..3bbebacd2 100644 --- a/trunk/paradiseo-mo/doc/latex/class_city_swap.tex +++ b/trunk/paradiseo-mo/doc/latex/class_city_swap.tex @@ -1,14 +1,20 @@ -\section{CitySwap Class Reference} +\section{City\-Swap Class Reference} \label{class_city_swap}\index{CitySwap@{CitySwap}} Its swaps two vertices randomly choosen. {\tt \#include $<$city\_\-swap.h$>$} +Inheritance diagram for City\-Swap::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_city_swap} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (Route \&\_\-\_\-route)\label{class_city_swap_7e6958b62048c89604cbf046b86bdf2d} +bool \bf{operator()} (\bf{Route} \&\_\-\_\-route)\label{class_city_swap_7e6958b62048c89604cbf046b86bdf2d} \end{CompactItemize} @@ -18,7 +24,7 @@ Its swaps two vertices randomly choosen. -Definition at line 21 of file city\_\-swap.h. +Definition at line 46 of file city\_\-swap.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex b/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex index a77bd26ea..688f58e34 100644 --- a/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex +++ b/trunk/paradiseo-mo/doc/latex/class_edge_xover.tex @@ -1,35 +1,41 @@ -\section{EdgeXover Class Reference} +\section{Edge\-Xover Class Reference} \label{class_edge_xover}\index{EdgeXover@{EdgeXover}} Edge Crossover. {\tt \#include $<$edge\_\-xover.h$>$} +Inheritance diagram for Edge\-Xover::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_edge_xover} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (Route \&\_\-\_\-route1, Route \&\_\-\_\-route2)\label{class_edge_xover_cb1c0a103106a4d3319540cb23163a79} +bool \bf{operator()} (\bf{Route} \&\_\-\_\-route1, \bf{Route} \&\_\-\_\-route2)\label{class_edge_xover_cb1c0a103106a4d3319540cb23163a79} \end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf cross} (const Route \&\_\-\_\-par1, const Route \&\_\-\_\-par2, Route \&\_\-\_\-child)\label{class_edge_xover_88c2d4c9a878454a32d56010f3dddc27} +void \bf{cross} (const \bf{Route} \&\_\-\_\-par1, const \bf{Route} \&\_\-\_\-par2, \bf{Route} \&\_\-\_\-child)\label{class_edge_xover_88c2d4c9a878454a32d56010f3dddc27} \item -void {\bf build\_\-map} (const Route \&\_\-\_\-par1, const Route \&\_\-\_\-par2)\label{class_edge_xover_04de96aa1016836e0ba5f4b952a5fa16} +void \bf{build\_\-map} (const \bf{Route} \&\_\-\_\-par1, const \bf{Route} \&\_\-\_\-par2)\label{class_edge_xover_04de96aa1016836e0ba5f4b952a5fa16} \item -void {\bf add\_\-vertex} (unsigned int \_\-\_\-vertex, Route \&\_\-\_\-child)\label{class_edge_xover_b590458c35c16a14896a4bcdf9674ade} +void \bf{add\_\-vertex} (unsigned int \_\-\_\-vertex, \bf{Route} \&\_\-\_\-child)\label{class_edge_xover_b590458c35c16a14896a4bcdf9674ade} \end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ std::set$<$ unsigned int $>$ $>$ {\bf \_\-map}\label{class_edge_xover_7d9272c12cfa55df4677d5ad837a0e5c} +std::vector$<$ std::set$<$ unsigned int $>$ $>$ \bf{\_\-map}\label{class_edge_xover_7d9272c12cfa55df4677d5ad837a0e5c} \item -std::vector$<$ bool $>$ {\bf visited}\label{class_edge_xover_46d4d4724cf6d660b1a7ab4a346573d4} +std::vector$<$ bool $>$ \bf{visited}\label{class_edge_xover_46d4d4724cf6d660b1a7ab4a346573d4} \end{CompactItemize} @@ -39,7 +45,7 @@ Edge Crossover. -Definition at line 23 of file edge\_\-xover.h. +Definition at line 48 of file edge\_\-xover.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex b/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex index 942fea7fc..e066852a4 100644 --- a/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex +++ b/trunk/paradiseo-mo/doc/latex/class_empty_selection.tex @@ -1,9 +1,9 @@ -\section{EmptySelection Class Reference} +\section{Empty\-Selection Class Reference} \label{class_empty_selection}\index{EmptySelection@{EmptySelection}} Special class that describes the case of no selection. -{\tt \#include $<$moMoveSelect.h$>$} +{\tt \#include $<$mo\-Move\-Select.h$>$} @@ -14,8 +14,8 @@ This class is used as an exception that can be thrown if a solution selector has -Definition at line 21 of file moMoveSelect.h. +Definition at line 46 of file mo\-Move\-Select.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveSelect.h\end{CompactItemize} +mo\-Move\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/class_order_xover.tex b/trunk/paradiseo-mo/doc/latex/class_order_xover.tex index c5bf6675e..fc55a68c5 100644 --- a/trunk/paradiseo-mo/doc/latex/class_order_xover.tex +++ b/trunk/paradiseo-mo/doc/latex/class_order_xover.tex @@ -1,20 +1,26 @@ -\section{OrderXover Class Reference} +\section{Order\-Xover Class Reference} \label{class_order_xover}\index{OrderXover@{OrderXover}} Order Crossover. {\tt \#include $<$order\_\-xover.h$>$} +Inheritance diagram for Order\-Xover::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_order_xover} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (Route \&\_\-\_\-route1, Route \&\_\-\_\-route2)\label{class_order_xover_0ff6aada669eb8173322ed68cda1ac61} +bool \bf{operator()} (\bf{Route} \&\_\-\_\-route1, \bf{Route} \&\_\-\_\-route2)\label{class_order_xover_0ff6aada669eb8173322ed68cda1ac61} \end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf cross} (const Route \&\_\-\_\-par1, const Route \&\_\-\_\-par2, Route \&\_\-\_\-child)\label{class_order_xover_d2bf90b5f46ac4a344777e17bc5f364d} +void \bf{cross} (const \bf{Route} \&\_\-\_\-par1, const \bf{Route} \&\_\-\_\-par2, \bf{Route} \&\_\-\_\-child)\label{class_order_xover_d2bf90b5f46ac4a344777e17bc5f364d} \end{CompactItemize} @@ -24,7 +30,7 @@ Order Crossover. -Definition at line 20 of file order\_\-xover.h. +Definition at line 45 of file order\_\-xover.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex b/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex index 72520a0c1..8874911e2 100644 --- a/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/class_part_route_eval.tex @@ -1,26 +1,32 @@ -\section{PartRouteEval Class Reference} +\section{Part\-Route\-Eval Class Reference} \label{class_part_route_eval}\index{PartRouteEval@{PartRouteEval}} Route Evaluator. {\tt \#include $<$part\_\-route\_\-eval.h$>$} +Inheritance diagram for Part\-Route\-Eval::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_part_route_eval} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf PartRouteEval} (float \_\-\_\-from, float \_\-\_\-to)\label{class_part_route_eval_a331566b29bc3227f377004232f05491} +\bf{Part\-Route\-Eval} (float \_\-\_\-from, float \_\-\_\-to)\label{class_part_route_eval_a331566b29bc3227f377004232f05491} \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -void {\bf operator()} (Route \&\_\-\_\-route)\label{class_part_route_eval_965fab875fb601f17934a6ece761beae} +void \bf{operator()} (\bf{Route} \&\_\-\_\-route)\label{class_part_route_eval_965fab875fb601f17934a6ece761beae} \end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -float {\bf from}\label{class_part_route_eval_5bde722e66378b2570ae6c4b4f8df58e} +float \bf{from}\label{class_part_route_eval_5bde722e66378b2570ae6c4b4f8df58e} \item -float {\bf to}\label{class_part_route_eval_de53cc919faa498663f327b72c357da3} +float \bf{to}\label{class_part_route_eval_de53cc919faa498663f327b72c357da3} \end{CompactItemize} @@ -30,7 +36,7 @@ Route Evaluator. -Definition at line 20 of file part\_\-route\_\-eval.h. +Definition at line 45 of file part\_\-route\_\-eval.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps index 94a58a350..63ce4d1f1 100644 --- a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 264.901 +%%BoundingBox: 0 0 500 529.801 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.94375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (PartTwoOptInit) cw (moMoveInit< TwoOpt >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (PartTwoOptInit) 0 0 box (moMoveInit< TwoOpt >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex index 181fc844f..3efcfe66b 100644 --- a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_init.tex @@ -1,20 +1,20 @@ -\section{PartTwoOptInit Class Reference} +\section{Part\-Two\-Opt\-Init Class Reference} \label{class_part_two_opt_init}\index{PartTwoOptInit@{PartTwoOptInit}} It sets the first couple of edges. {\tt \#include $<$part\_\-two\_\-opt\_\-init.h$>$} -Inheritance diagram for PartTwoOptInit::\begin{figure}[H] +Inheritance diagram for Part\-Two\-Opt\-Init::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_part_two_opt_init} +\includegraphics[height=4cm]{class_part_two_opt_init} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_part_two_opt_init_2f6190b1700ca1a12d0baaceaf75383c} +void \bf{operator()} (\bf{Two\-Opt} \&\_\-\_\-move, const \bf{Route} \&\_\-\_\-route)\label{class_part_two_opt_init_2f6190b1700ca1a12d0baaceaf75383c} \end{CompactItemize} @@ -24,7 +24,7 @@ It sets the first couple of edges. -Definition at line 20 of file part\_\-two\_\-opt\_\-init.h. +Definition at line 45 of file part\_\-two\_\-opt\_\-init.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps index f304c959b..c94702831 100644 --- a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 250 +%%BoundingBox: 0 0 500 500 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (PartTwoOptNext) cw (moNextMove< TwoOpt >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (PartTwoOptNext) 0 0 box (moNextMove< TwoOpt >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex index f91fb95c3..087ddaa71 100644 --- a/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex +++ b/trunk/paradiseo-mo/doc/latex/class_part_two_opt_next.tex @@ -1,14 +1,14 @@ -\section{PartTwoOptNext Class Reference} +\section{Part\-Two\-Opt\-Next Class Reference} \label{class_part_two_opt_next}\index{PartTwoOptNext@{PartTwoOptNext}} It updates a couple of edges. {\tt \#include $<$part\_\-two\_\-opt\_\-next.h$>$} -Inheritance diagram for PartTwoOptNext::\begin{figure}[H] +Inheritance diagram for Part\-Two\-Opt\-Next::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_part_two_opt_next} +\includegraphics[height=4cm]{class_part_two_opt_next} \end{center} \end{figure} @@ -18,7 +18,7 @@ It updates a couple of edges. -Definition at line 19 of file part\_\-two\_\-opt\_\-next.h. +Definition at line 44 of file part\_\-two\_\-opt\_\-next.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex b/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex index 3578de26a..81422bcdb 100644 --- a/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex +++ b/trunk/paradiseo-mo/doc/latex/class_partial_mapped_xover.tex @@ -1,20 +1,26 @@ -\section{PartialMappedXover Class Reference} +\section{Partial\-Mapped\-Xover Class Reference} \label{class_partial_mapped_xover}\index{PartialMappedXover@{PartialMappedXover}} Partial Mapped Crossover. {\tt \#include $<$partial\_\-mapped\_\-xover.h$>$} +Inheritance diagram for Partial\-Mapped\-Xover::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_partial_mapped_xover} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (Route \&\_\-\_\-route1, Route \&\_\-\_\-route2)\label{class_partial_mapped_xover_1cda6ea86ca36e5de0125f4ba5cfc695} +bool \bf{operator()} (\bf{Route} \&\_\-\_\-route1, \bf{Route} \&\_\-\_\-route2)\label{class_partial_mapped_xover_1cda6ea86ca36e5de0125f4ba5cfc695} \end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf repair} (Route \&\_\-\_\-route, unsigned \_\-\_\-cut1, unsigned \_\-\_\-cut2)\label{class_partial_mapped_xover_b6d4035544aff3b2b3fe4b0eeea185a2} +void \bf{repair} (\bf{Route} \&\_\-\_\-route, unsigned \_\-\_\-cut1, unsigned \_\-\_\-cut2)\label{class_partial_mapped_xover_b6d4035544aff3b2b3fe4b0eeea185a2} \end{CompactItemize} @@ -24,7 +30,7 @@ Partial Mapped Crossover. -Definition at line 20 of file partial\_\-mapped\_\-xover.h. +Definition at line 45 of file partial\_\-mapped\_\-xover.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_route_eval.tex b/trunk/paradiseo-mo/doc/latex/class_route_eval.tex index 656061643..15ec0637f 100644 --- a/trunk/paradiseo-mo/doc/latex/class_route_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/class_route_eval.tex @@ -1,14 +1,20 @@ -\section{RouteEval Class Reference} +\section{Route\-Eval Class Reference} \label{class_route_eval}\index{RouteEval@{RouteEval}} Route Evaluator. {\tt \#include $<$route\_\-eval.h$>$} +Inheritance diagram for Route\-Eval::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_route_eval} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} (Route \&\_\-\_\-route)\label{class_route_eval_e10bbe6f792e6f44405953de4f703901} +void \bf{operator()} (\bf{Route} \&\_\-\_\-route)\label{class_route_eval_e10bbe6f792e6f44405953de4f703901} \end{CompactItemize} @@ -18,7 +24,7 @@ Route Evaluator. -Definition at line 20 of file route\_\-eval.h. +Definition at line 45 of file route\_\-eval.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_route_init.tex b/trunk/paradiseo-mo/doc/latex/class_route_init.tex index aabbfd29f..fdbeebecd 100644 --- a/trunk/paradiseo-mo/doc/latex/class_route_init.tex +++ b/trunk/paradiseo-mo/doc/latex/class_route_init.tex @@ -1,9 +1,15 @@ -\section{RouteInit Class Reference} +\section{Route\-Init Class Reference} \label{class_route_init}\index{RouteInit@{RouteInit}} +Inheritance diagram for Route\-Init::\begin{figure}[H] +\begin{center} +\leavevmode +\includegraphics[height=4cm]{class_route_init} +\end{center} +\end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} (Route \&\_\-\_\-route)\label{class_route_init_b65a7137e114458faadb6a5510c001f7} +void \bf{operator()} (\bf{Route} \&\_\-\_\-route)\label{class_route_init_b65a7137e114458faadb6a5510c001f7} \end{CompactItemize} @@ -13,7 +19,7 @@ void {\bf operator()} (Route \&\_\-\_\-route)\label{class_route_init_b65a7137e11 -Definition at line 19 of file route\_\-init.h. +Definition at line 44 of file route\_\-init.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt.eps index e9c3ce886..288f14f2f 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt.eps +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 322.581 +%%BoundingBox: 0 0 500 273.973 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,13 +19,13 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.55 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.825 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def -/cols 1 def +/rows 4 def +/cols 2 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -174,7 +174,11 @@ boxfont setfont 1 boundaspect scale (TwoOpt) cw -(moMove< Route >) cw +(moMove< EOT >) cw +(eoPersistent) cw +(eoUF< EOT &, void >) cw +(eoPrintable) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -186,12 +190,32 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (TwoOpt) 0 0 box - (moMove< Route >) 0 1 box + (TwoOpt) 0.5 0 box + (moMove< EOT >) 0 1 box + (eoPersistent) 1 1 box + (eoUF< EOT &, void >) 0 2 box + (eoPrintable) 1 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- solid -0 0 0 out +0 0.5 0 out +solid +0 1 1 conn solid 1 0 1 in +solid +0 0 1 out +solid +1 1 1 in +solid +0 1 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 1 2 in +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt.tex index 15f41db39..9c289f4ae 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt.tex +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt.tex @@ -1,24 +1,24 @@ -\section{TwoOpt Class Reference} +\section{Two\-Opt Class Reference} \label{class_two_opt}\index{TwoOpt@{TwoOpt}} -Inheritance diagram for TwoOpt::\begin{figure}[H] +Inheritance diagram for Two\-Opt::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_two_opt} +\includegraphics[height=4cm]{class_two_opt} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf TwoOpt} {\bf operator!} () const\label{class_two_opt_bc412d9f7fe3617cafef364f860d8d41} +\bf{Two\-Opt} \bf{operator!} () const \label{class_two_opt_9fa462668a6f7293d11082d8dae26b6a} \item -void {\bf operator()} (Route \&\_\-\_\-route)\label{class_two_opt_ff87d1649a33d42a6d64e8d314ed1af0} +void \bf{operator()} (\bf{Route} \&\_\-\_\-route)\label{class_two_opt_ff87d1649a33d42a6d64e8d314ed1af0} \item -void {\bf readFrom} (std::istream \&\_\-\_\-is)\label{class_two_opt_feccfecca2a6bd2d3a12afdf3f724be0} +void \bf{read\-From} (std::istream \&\_\-\_\-is)\label{class_two_opt_feccfecca2a6bd2d3a12afdf3f724be0} \item -void {\bf printOn} (std::ostream \&\_\-\_\-os) const\label{class_two_opt_77ea59d81dd829ee3190219fa8659adc} +void \bf{print\-On} (std::ostream \&\_\-\_\-os) const \label{class_two_opt_2400db18998b93bfb35783f6681ccd8a} \end{CompactItemize} @@ -28,7 +28,7 @@ void {\bf printOn} (std::ostream \&\_\-\_\-os) const\label{class_two_opt_77ea59d -Definition at line 22 of file two\_\-opt.h. +Definition at line 47 of file two\_\-opt.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps index bf3b9428f..a770c36fb 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 219.78 +%%BoundingBox: 0 0 500 439.56 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.275 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.1375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (TwoOptIncrEval) cw (moMoveIncrEval< TwoOpt >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (TwoOptIncrEval) 0 0 box (moMoveIncrEval< TwoOpt >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex index 73a736caa..1fae81186 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_incr_eval.tex @@ -1,15 +1,15 @@ -\section{TwoOptIncrEval Class Reference} +\section{Two\-Opt\-Incr\-Eval Class Reference} \label{class_two_opt_incr_eval}\index{TwoOptIncrEval@{TwoOptIncrEval}} -Inheritance diagram for TwoOptIncrEval::\begin{figure}[H] +Inheritance diagram for Two\-Opt\-Incr\-Eval::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_two_opt_incr_eval} +\includegraphics[height=4cm]{class_two_opt_incr_eval} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -float {\bf operator()} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_two_opt_incr_eval_4574d0b22065be5b59b88791e2b61138} +float \bf{operator()} (const \bf{Two\-Opt} \&\_\-\_\-move, const \bf{Route} \&\_\-\_\-route)\label{class_two_opt_incr_eval_4574d0b22065be5b59b88791e2b61138} \end{CompactItemize} @@ -19,7 +19,7 @@ float {\bf operator()} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\ -Definition at line 18 of file two\_\-opt\_\-incr\_\-eval.h. +Definition at line 43 of file two\_\-opt\_\-incr\_\-eval.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps index 29f75025b..de0163043 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 264.901 +%%BoundingBox: 0 0 500 529.801 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.94375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (TwoOptInit) cw (moMoveInit< TwoOpt >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (TwoOptInit) 0 0 box (moMoveInit< TwoOpt >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex index 92af43cce..11d7e2e1f 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_init.tex @@ -1,20 +1,20 @@ -\section{TwoOptInit Class Reference} +\section{Two\-Opt\-Init Class Reference} \label{class_two_opt_init}\index{TwoOptInit@{TwoOptInit}} It sets the first couple of edges. {\tt \#include $<$two\_\-opt\_\-init.h$>$} -Inheritance diagram for TwoOptInit::\begin{figure}[H] +Inheritance diagram for Two\-Opt\-Init::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_two_opt_init} +\includegraphics[height=4cm]{class_two_opt_init} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_two_opt_init_5bf6af064d37ebd955ffb5a623e78e1b} +void \bf{operator()} (\bf{Two\-Opt} \&\_\-\_\-move, const \bf{Route} \&\_\-\_\-route)\label{class_two_opt_init_5bf6af064d37ebd955ffb5a623e78e1b} \end{CompactItemize} @@ -24,7 +24,7 @@ It sets the first couple of edges. -Definition at line 20 of file two\_\-opt\_\-init.h. +Definition at line 45 of file two\_\-opt\_\-init.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps index f9ec94747..898b3cd03 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 250 +%%BoundingBox: 0 0 500 500 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (TwoOptNext) cw (moNextMove< TwoOpt >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (TwoOptNext) 0 0 box (moNextMove< TwoOpt >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex index 72c11bd39..9285f405e 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_next.tex @@ -1,20 +1,20 @@ -\section{TwoOptNext Class Reference} +\section{Two\-Opt\-Next Class Reference} \label{class_two_opt_next}\index{TwoOptNext@{TwoOptNext}} It updates a couple of edges. {\tt \#include $<$two\_\-opt\_\-next.h$>$} -Inheritance diagram for TwoOptNext::\begin{figure}[H] +Inheritance diagram for Two\-Opt\-Next::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_two_opt_next} +\includegraphics[height=4cm]{class_two_opt_next} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-route)\label{class_two_opt_next_baf229b2e056f39ab971cf2ac66a833e} +bool \bf{operator()} (\bf{Two\-Opt} \&\_\-\_\-move, const \bf{Route} \&\_\-\_\-route)\label{class_two_opt_next_baf229b2e056f39ab971cf2ac66a833e} \end{CompactItemize} @@ -24,7 +24,7 @@ It updates a couple of edges. -Definition at line 19 of file two\_\-opt\_\-next.h. +Definition at line 44 of file two\_\-opt\_\-next.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps index c8b101630..c39e6fa40 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 243.902 +%%BoundingBox: 0 0 500 487.805 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.05 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.025 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (TwoOptRand) cw (moRandMove< TwoOpt >) cw +(eoUF< TwoOpt &, void >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (TwoOptRand) 0 0 box (moRandMove< TwoOpt >) 0 1 box + (eoUF< TwoOpt &, void >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex index 51435f1ab..0c27fb739 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_rand.tex @@ -1,15 +1,15 @@ -\section{TwoOptRand Class Reference} +\section{Two\-Opt\-Rand Class Reference} \label{class_two_opt_rand}\index{TwoOptRand@{TwoOptRand}} -Inheritance diagram for TwoOptRand::\begin{figure}[H] +Inheritance diagram for Two\-Opt\-Rand::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_two_opt_rand} +\includegraphics[height=4cm]{class_two_opt_rand} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move)\label{class_two_opt_rand_bcba673ec71e565f536674bfe5bab609} +void \bf{operator()} (\bf{Two\-Opt} \&\_\-\_\-move)\label{class_two_opt_rand_bcba673ec71e565f536674bfe5bab609} \end{CompactItemize} @@ -19,7 +19,7 @@ void {\bf operator()} ({\bf TwoOpt} \&\_\-\_\-move)\label{class_two_opt_rand_bcb -Definition at line 19 of file two\_\-opt\_\-rand.h. +Definition at line 44 of file two\_\-opt\_\-rand.h. The documentation for this class was generated from the following files:\begin{CompactItemize} \item diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps index 50975105c..06a8e7b9c 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 266.667 +%%BoundingBox: 0 0 500 533.333 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.9375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 2 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -175,6 +175,8 @@ boxfont setfont 1 boundaspect scale (TwoOptTabuList) cw (moTabuList< TwoOpt >) cw +(eoBF< A1, A2, R >) cw +(eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -188,6 +190,8 @@ boundx scalefactor div boundy scalefactor div scale (TwoOptTabuList) 0 0 box (moTabuList< TwoOpt >) 0 1 box + (eoBF< A1, A2, R >) 0 2 box + (eoFunctorBase) 0 3 box % ----- relations ----- @@ -195,3 +199,11 @@ solid 0 0 0 out solid 1 0 1 in +solid +0 0 1 out +solid +1 0 2 in +solid +0 0 2 out +solid +1 0 3 in diff --git a/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex index e86575335..2d7774de2 100644 --- a/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/class_two_opt_tabu_list.tex @@ -1,33 +1,33 @@ -\section{TwoOptTabuList Class Reference} +\section{Two\-Opt\-Tabu\-List Class Reference} \label{class_two_opt_tabu_list}\index{TwoOptTabuList@{TwoOptTabuList}} The table of tabu movements, i.e. {\tt \#include $<$two\_\-opt\_\-tabu\_\-list.h$>$} -Inheritance diagram for TwoOptTabuList::\begin{figure}[H] +Inheritance diagram for Two\-Opt\-Tabu\-List::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=2cm]{class_two_opt_tabu_list} +\includegraphics[height=4cm]{class_two_opt_tabu_list} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-sol)\label{class_two_opt_tabu_list_94eb6bced415ff97cec89107cc6eebab} +bool \bf{operator()} (const \bf{Two\-Opt} \&\_\-\_\-move, const \bf{Route} \&\_\-\_\-sol)\label{class_two_opt_tabu_list_94eb6bced415ff97cec89107cc6eebab} \item -void {\bf add} (const {\bf TwoOpt} \&\_\-\_\-move, const Route \&\_\-\_\-sol)\label{class_two_opt_tabu_list_10436d67bef09f5893df2d85549d1dbd} +void \bf{add} (const \bf{Two\-Opt} \&\_\-\_\-move, const \bf{Route} \&\_\-\_\-sol)\label{class_two_opt_tabu_list_10436d67bef09f5893df2d85549d1dbd} \item -void {\bf update} () +void \bf{update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ std::vector$<$ unsigned $>$ $>$ {\bf tabu\_\-span}\label{class_two_opt_tabu_list_cbcdf3b501f624a14f3c767652609382} +std::vector$<$ std::vector$<$ unsigned $>$ $>$ \bf{tabu\_\-span}\label{class_two_opt_tabu_list_cbcdf3b501f624a14f3c767652609382} \end{CompactItemize} @@ -39,34 +39,34 @@ forbidden edges -Definition at line 20 of file two\_\-opt\_\-tabu\_\-list.h. +Definition at line 45 of file two\_\-opt\_\-tabu\_\-list.h. \subsection{Member Function Documentation} -\index{TwoOptTabuList@{TwoOptTabuList}!update@{update}} -\index{update@{update}!TwoOptTabuList@{TwoOptTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void TwoOptTabuList::update ()\hspace{0.3cm}{\tt [virtual]}}\label{class_two_opt_tabu_list_c460034b7debe7198c6df046855155da} +\index{TwoOptTabuList@{Two\-Opt\-Tabu\-List}!update@{update}} +\index{update@{update}!TwoOptTabuList@{Two\-Opt\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Two\-Opt\-Tabu\-List::update ()\hspace{0.3cm}{\tt [virtual]}}\label{class_two_opt_tabu_list_c460034b7debe7198c6df046855155da} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf moTabuList$<$ TwoOpt $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements \bf{mo\-Tabu\-List$<$ Two\-Opt $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 46 of file two\_\-opt\_\-tabu\_\-list.cpp. +Definition at line 71 of file two\_\-opt\_\-tabu\_\-list.cpp. -References tabu\_\-span.\index{TwoOptTabuList@{TwoOptTabuList}!init@{init}} -\index{init@{init}!TwoOptTabuList@{TwoOptTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void TwoOptTabuList::init ()\hspace{0.3cm}{\tt [virtual]}}\label{class_two_opt_tabu_list_2d3101e6045700b0e32f5e82672a175e} +References tabu\_\-span.\index{TwoOptTabuList@{Two\-Opt\-Tabu\-List}!init@{init}} +\index{init@{init}!TwoOptTabuList@{Two\-Opt\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Two\-Opt\-Tabu\-List::init ()\hspace{0.3cm}{\tt [virtual]}}\label{class_two_opt_tabu_list_2d3101e6045700b0e32f5e82672a175e} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf moTabuList$<$ TwoOpt $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements \bf{mo\-Tabu\-List$<$ Two\-Opt $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 17 of file two\_\-opt\_\-tabu\_\-list.cpp. +Definition at line 42 of file two\_\-opt\_\-tabu\_\-list.cpp. References Graph::size(), and tabu\_\-span. diff --git a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex index 6564c8f7a..e1536fefb 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_algo.tex @@ -1,11 +1,11 @@ -\section{moAlgo$<$ EOT $>$ Class Template Reference} +\section{mo\-Algo$<$ EOT $>$ Class Template Reference} \label{classmo_algo}\index{moAlgo@{moAlgo}} Description of an algorithm of the paradiseo-mo library. -{\tt \#include $<$moAlgo.h$>$} +{\tt \#include $<$mo\-Algo.h$>$} -Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_algo} @@ -14,16 +14,16 @@ Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moAlgo$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Algo$<$ EOT $>$} Description of an algorithm of the paradiseo-mo library. -\doxyref{moHC}{p.}{classmo_h_c}, \doxyref{moTS}{p.}{classmo_t_s} and \doxyref{moSA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library. +\doxyref{mo\-HC}{p.}{classmo_h_c}, \doxyref{mo\-TS}{p.}{classmo_t_s} and \doxyref{mo\-SA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library. -Definition at line 21 of file moAlgo.h. +Definition at line 46 of file mo\-Algo.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moAlgo.h\end{CompactItemize} +mo\-Algo.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps index da056c4c6..7a0252d70 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 119.76 +%%BoundingBox: 0 0 500 218.579 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 4.175 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw (moImprBestFitAspirCrit< M >) cw (moNoAspirCrit< M >) cw @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moAspirCrit< M >) 0.5 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0.5 2 box + (eoBF< A1, A2, R >) 0.5 2 box (eoFunctorBase) 0.5 3 box (moImprBestFitAspirCrit< M >) 0 0 box (moNoAspirCrit< M >) 1 0 box diff --git a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex index 78dea621f..42d118ec7 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_aspir_crit.tex @@ -1,46 +1,46 @@ -\section{moAspirCrit$<$ M $>$ Class Template Reference} +\section{mo\-Aspir\-Crit$<$ M $>$ Class Template Reference} \label{classmo_aspir_crit}\index{moAspirCrit@{moAspirCrit}} Description of the conditions in which a tabu move could be accepted. -{\tt \#include $<$moAspirCrit.h$>$} +{\tt \#include $<$mo\-Aspir\-Crit.h$>$} -Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.35329cm]{classmo_aspir_crit} +\includegraphics[height=4cm]{classmo_aspir_crit} \end{center} \end{figure} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} ()=0 +virtual void \bf{init} ()=0 \begin{CompactList}\small\item\em Procedure which initialises all that needs a aspiration criterion. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moAspirCrit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Aspir\-Crit$<$ M $>$} Description of the conditions in which a tabu move could be accepted. -It is only a description... An object that herits from this class is needed to be used in a \doxyref{moTS}{p.}{classmo_t_s}. See moNoAspriCrit for example. +It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. See mo\-No\-Aspri\-Crit for example. -Definition at line 22 of file moAspirCrit.h. +Definition at line 47 of file mo\-Aspir\-Crit.h. \subsection{Member Function Documentation} -\index{moAspirCrit@{moAspirCrit}!init@{init}} -\index{init@{init}!moAspirCrit@{moAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140} +\index{moAspirCrit@{mo\-Aspir\-Crit}!init@{init}} +\index{init@{init}!moAspirCrit@{mo\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140} Procedure which initialises all that needs a aspiration criterion. It can be possible that this procedure do nothing... -Implemented in {\bf moImprBestFitAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and {\bf moNoAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}. +Implemented in \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and \bf{mo\-No\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moAspirCrit.h\end{CompactItemize} +mo\-Aspir\-Crit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex index 42525f20e..34bd702cd 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_best_impr_select.tex @@ -1,11 +1,11 @@ -\section{moBestImprSelect$<$ M $>$ Class Template Reference} +\section{mo\-Best\-Impr\-Select$<$ M $>$ Class Template Reference} \label{classmo_best_impr_select}\index{moBestImprSelect@{moBestImprSelect}} -One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. -{\tt \#include $<$moBestImprSelect.h$>$} +{\tt \#include $<$mo\-Best\-Impr\-Select.h$>$} -Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_best_impr_select} @@ -14,53 +14,53 @@ Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_best_impr_select_c4ae17435221fb0a8e8acd285210cfcb} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956} +void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956} \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item -bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) +bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -bool {\bf first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13} +bool \bf{first\_\-time}\label{classmo_best_impr_select_352b14d206b0772eb9f40efb7beb0f13} \begin{CompactList}\small\item\em Allowing to know if at least one move has been generated. \item\end{CompactList}\item -M {\bf best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a} +M \bf{best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8ff6a} \begin{CompactList}\small\item\em The best move. \item\end{CompactList}\item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_best_impr_select_dcac897424b5805f146bb1dbb429f2fe} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_best_impr_select_dcac897424b5805f146bb1dbb429f2fe} \begin{CompactList}\small\item\em The best fitness. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moBestImprSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Best\-Impr\-Select$<$ M $>$} -One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. All neighbors are considered, and the movement which enables the best improvement is selected. -Definition at line 22 of file moBestImprSelect.h. +Definition at line 47 of file mo\-Best\-Impr\-Select.h. \subsection{Member Function Documentation} -\index{moBestImprSelect@{moBestImprSelect}!update@{update}} -\index{update@{update}!moBestImprSelect@{moBestImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moBestImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} +\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!update@{update}} +\index{update@{update}!moBestImprSelect@{mo\-Best\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} -{\bf Function} that indicates if the current move has not improved the fitness. +\doxyref{Function} that indicates if the current move has not improved the fitness. -If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) and the fitness linked to this move are saved. +If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) and the fitness linked to this move are saved. \begin{Desc} \item[Parameters:] @@ -71,13 +71,13 @@ If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{class \item[Returns:]TRUE if the move does not improve the fitness. \end{Desc} -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. -Definition at line 47 of file moBestImprSelect.h. +Definition at line 72 of file mo\-Best\-Impr\-Select.h. -References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.\index{moBestImprSelect@{moBestImprSelect}!operator()@{operator()}} -\index{operator()@{operator()}!moBestImprSelect@{moBestImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} +References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}} +\index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -90,16 +90,16 @@ Procedure which saved the best move and fitness. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} +\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 68 of file moBestImprSelect.h. +Definition at line 93 of file mo\-Best\-Impr\-Select.h. -References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time. +References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moBestImprSelect.h\end{CompactItemize} +mo\-Best\-Impr\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex index 47648d9d0..c2d7c4613 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{moCoolingSchedule Class Reference} +\section{mo\-Cooling\-Schedule Class Reference} \label{classmo_cooling_schedule}\index{moCoolingSchedule@{moCoolingSchedule}} This class gives the description of a cooling schedule. -{\tt \#include $<$moCoolingSchedule.h$>$} +{\tt \#include $<$mo\-Cooling\-Schedule.h$>$} -Inheritance diagram for moCoolingSchedule::\begin{figure}[H] +Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_cooling_schedule} @@ -16,12 +16,12 @@ Inheritance diagram for moCoolingSchedule::\begin{figure}[H] \subsection{Detailed Description} This class gives the description of a cooling schedule. -It is only a description... An object that herits from this class is needed to be used in a \doxyref{moSA}{p.}{classmo_s_a}. See \doxyref{moExponentialCoolingSchedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{moLinearCoolingSchedule}{p.}{classmo_linear_cooling_schedule} for example. +It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-SA}{p.}{classmo_s_a}. See \doxyref{mo\-Exponential\-Cooling\-Schedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{mo\-Linear\-Cooling\-Schedule}{p.}{classmo_linear_cooling_schedule} for example. -Definition at line 22 of file moCoolingSchedule.h. +Definition at line 47 of file mo\-Cooling\-Schedule.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moCoolingSchedule.h\end{CompactItemize} +mo\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex index 3bf1211a8..b1943e775 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_exponential_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{moExponentialCoolingSchedule Class Reference} +\section{mo\-Exponential\-Cooling\-Schedule Class Reference} \label{classmo_exponential_cooling_schedule}\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. -{\tt \#include $<$moExponentialCoolingSchedule.h$>$} +{\tt \#include $<$mo\-Exponential\-Cooling\-Schedule.h$>$} -Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] +Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_exponential_cooling_schedule} @@ -14,34 +14,34 @@ Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moExponentialCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) +\bf{mo\-Exponential\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item -bool {\bf operator()} (double \&\_\-\_\-temp) -\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (double \&\_\-\_\-temp) +\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -double {\bf threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} +double \bf{threshold}\label{classmo_exponential_cooling_schedule_8d4327c0bb33b7121a322279eea97f84} \begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item -double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} +double \bf{ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253efb938a740846fa} \begin{CompactList}\small\item\em The decreasing factor of the temperature. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold. -Definition at line 22 of file moExponentialCoolingSchedule.h. +Definition at line 47 of file mo\-Exponential\-Cooling\-Schedule.h. \subsection{Constructor \& Destructor Documentation} -\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moExponentialCoolingSchedule::moExponentialCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} +\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Exponential\-Cooling\-Schedule::mo\-Exponential\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} Simple constructor. @@ -53,15 +53,15 @@ Simple constructor. \end{Desc} -Definition at line 31 of file moExponentialCoolingSchedule.h. +Definition at line 56 of file mo\-Exponential\-Cooling\-Schedule.h. \subsection{Member Function Documentation} -\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!operator()@{operator()}} -\index{operator()@{operator()}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} +\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}} +\index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} -{\bf Function} which proceeds to the cooling. +\doxyref{Function} which proceeds to the cooling. It decreases the temperature and indicates if it is greater than the threshold. @@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. +Implements \bf{eo\-UF$<$ double \&, bool $>$}. -Definition at line 41 of file moExponentialCoolingSchedule.h. +Definition at line 66 of file mo\-Exponential\-Cooling\-Schedule.h. References ratio, and threshold. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moExponentialCoolingSchedule.h\end{CompactItemize} +mo\-Exponential\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex index 45653d427..2b90fd727 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_first_impr_select.tex @@ -1,11 +1,11 @@ -\section{moFirstImprSelect$<$ M $>$ Class Template Reference} +\section{mo\-First\-Impr\-Select$<$ M $>$ Class Template Reference} \label{classmo_first_impr_select}\index{moFirstImprSelect@{moFirstImprSelect}} -One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. -{\tt \#include $<$moFirstImprSelect.h$>$} +{\tt \#include $<$mo\-First\-Impr\-Select.h$>$} -Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_first_impr_select} @@ -14,68 +14,68 @@ Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_first_impr_select_64763ce3e6d2873266624382b407fa5a} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) +virtual void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item -bool {\bf update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit) -\begin{CompactList}\small\item\em {\bf Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) +bool \bf{update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the current move has not improved the fitness. \item\end{CompactList}\item +void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -bool {\bf valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c} +bool \bf{valid}\label{classmo_first_impr_select_a99c0586ba07449234705c17a258d58c} \begin{CompactList}\small\item\em Allow to know if at least one move has improved the solution. \item\end{CompactList}\item -M {\bf best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c} +M \bf{best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f1279cb8c} \begin{CompactList}\small\item\em Best stored movement. \item\end{CompactList}\item -{\bf Fitness} {\bf init\_\-fit}\label{classmo_first_impr_select_ce7ba63e8cc3a9164f4e546477e98ca8} +\bf{Fitness} \bf{init\_\-fit}\label{classmo_first_impr_select_ce7ba63e8cc3a9164f4e546477e98ca8} \begin{CompactList}\small\item\em Initial fitness. \item\end{CompactList}\item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_first_impr_select_e1190347b76ec6fe717be32354b4a9a9} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_first_impr_select_e1190347b76ec6fe717be32354b4a9a9} \begin{CompactList}\small\item\em Best stored fitness. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moFirstImprSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-First\-Impr\-Select$<$ M $>$} -One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. +One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. The neighborhood is explored until a move enables an improvment of the current solution. -Definition at line 23 of file moFirstImprSelect.h. +Definition at line 48 of file mo\-First\-Impr\-Select.h. \subsection{Member Function Documentation} -\index{moFirstImprSelect@{moFirstImprSelect}!init@{init}} -\index{init@{init}!moFirstImprSelect@{moFirstImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moFirstImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055} +\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!init@{init}} +\index{init@{init}!moFirstImprSelect@{mo\-First\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-First\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055} Procedure which initialise the exploration. It save the current fitness as the initial value for the fitness. -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. -Definition at line 35 of file moFirstImprSelect.h. +Definition at line 60 of file mo\-First\-Impr\-Select.h. -References moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!update@{update}} -\index{update@{update}!moFirstImprSelect@{moFirstImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moFirstImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} +References mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!update@{update}} +\index{update@{update}!moFirstImprSelect@{mo\-First\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} -{\bf Function} that indicates if the current move has not improved the fitness. +\doxyref{Function} that indicates if the current move has not improved the fitness. -If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) should be applied to the current solution. +If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) should be applied to the current solution. \begin{Desc} \item[Parameters:] @@ -86,11 +86,11 @@ If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{class \item[Returns:]TRUE if the move does not improve the fitness. \end{Desc} -Definition at line 52 of file moFirstImprSelect.h. +Definition at line 77 of file mo\-First\-Impr\-Select.h. -References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!operator()@{operator()}} -\index{operator()@{operator()}!moFirstImprSelect@{moFirstImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moFirstImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} +References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}} +\index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -103,16 +103,16 @@ Procedure which saved the best move and fitness. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} +\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 76 of file moFirstImprSelect.h. +Definition at line 101 of file mo\-First\-Impr\-Select.h. -References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid. +References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moFirstImprSelect.h\end{CompactItemize} +mo\-First\-Impr\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex index ef837c7dd..ed82c4d46 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_fit_sol_continue.tex @@ -1,11 +1,11 @@ -\section{moFitSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Fit\-Sol\-Continue$<$ 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$>$} +{\tt \#include $<$mo\-Fit\-Sol\-Continue.h$>$} -Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_fit_sol_continue} @@ -14,28 +14,28 @@ Inheritance diagram for moFitSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness {\bf Fitness}\label{classmo_fit_sol_continue_369ed94a788d8bdc08d5554f7669376f} +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) +\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} \_\-\_\-fitness) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} () +bool \bf{operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stopping criterion. \item\end{CompactList}\item +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} +\bf{Fitness} \bf{fitness}\label{classmo_fit_sol_continue_87d0ba8f2f76f61c89317eed5f094dfc} \begin{CompactList}\small\item\em Fitness target. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moFitSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Fit\-Sol\-Continue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -43,12 +43,12 @@ The stop criterion corresponds to a fitness threshold gained. -Definition at line 21 of file moFitSolContinue.h. +Definition at line 46 of file mo\-Fit\-Sol\-Continue.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})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_b14f37ba88de4e12583b22f5aabeb682} +\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!moFitSolContinue@{moFitSolContinue}} +\index{moFitSolContinue@{moFitSolContinue}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Fit\-Sol\-Continue} (\bf{Fitness} {\em \_\-\_\-fitness})\hspace{0.3cm}{\tt [inline]}}\label{classmo_fit_sol_continue_b14f37ba88de4e12583b22f5aabeb682} Basic constructor. @@ -60,15 +60,15 @@ Basic constructor. \end{Desc} -Definition at line 33 of file moFitSolContinue.h. +Definition at line 58 of file mo\-Fit\-Sol\-Continue.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} +\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_fa9f0a15f99c998115cae9b456403a27} -{\bf Function} that activates the stopping criterion. +\doxyref{Function} that activates the stopping criterion. Indicates if the fitness threshold has not yet been reached. @@ -81,23 +81,23 @@ Indicates if the fitness threshold has not yet been reached. \item[Returns:]true or false according to the value of the fitness. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. -Definition at line 43 of file moFitSolContinue.h. +Definition at line 68 of file mo\-Fit\-Sol\-Continue.h. -References moFitSolContinue$<$ EOT $>$::fitness.\index{moFitSolContinue@{moFitSolContinue}!init@{init}} -\index{init@{init}!moFitSolContinue@{moFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} +References mo\-Fit\-Sol\-Continue$<$ EOT $>$::fitness.\index{moFitSolContinue@{mo\-Fit\-Sol\-Continue}!init@{init}} +\index{init@{init}!moFitSolContinue@{mo\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c} Procedure which allows to initialise all the stuff needed. It can be also used to reinitialize all the needed things. -Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 57 of file moFitSolContinue.h. +Definition at line 82 of file mo\-Fit\-Sol\-Continue.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moFitSolContinue.h\end{CompactItemize} +mo\-Fit\-Sol\-Continue.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 ad11108c8..9366abd43 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_gen_sol_continue.tex @@ -1,11 +1,11 @@ -\section{moGenSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Gen\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_gen_sol_continue}\index{moGenSolContinue@{moGenSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$moGenSolContinue.h$>$} +{\tt \#include $<$mo\-Gen\-Sol\-Continue.h$>$} -Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_gen_sol_continue} @@ -14,25 +14,25 @@ Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moGenSolContinue} (unsigned int \_\-\_\-maxNumGen) +\bf{mo\-Gen\-Sol\-Continue} (unsigned int \_\-\_\-max\-Num\-Gen) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} that activates the stop criterion. \item\end{CompactList}\item -void {\bf init} () +bool \bf{operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stop criterion. \item\end{CompactList}\item +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the generation counter. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxNumGen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a} +unsigned int \bf{max\-Num\-Gen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a} \begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item -unsigned int {\bf numGen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c} +unsigned int \bf{num\-Gen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c} \begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moGenSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Gen\-Sol\-Continue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -40,12 +40,12 @@ The stop criterion corresponds to a maximum number of iteration. -Definition at line 21 of file moGenSolContinue.h. +Definition at line 46 of file mo\-Gen\-Sol\-Continue.h. \subsection{Constructor \& Destructor Documentation} -\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}} -\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}} -\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} +\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!moGenSolContinue@{moGenSolContinue}} +\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Gen\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Num\-Gen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b} Simple constructor. @@ -53,19 +53,19 @@ Simple constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumGen}]the maximum number of generation. \end{description} +\item[{\em \_\-\_\-max\-Num\-Gen}]the maximum number of generation. \end{description} \end{Desc} -Definition at line 30 of file moGenSolContinue.h. +Definition at line 55 of file mo\-Gen\-Sol\-Continue.h. \subsection{Member Function Documentation} -\index{moGenSolContinue@{moGenSolContinue}!operator()@{operator()}} -\index{operator()@{operator()}!moGenSolContinue@{moGenSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moGenSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} +\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} -{\bf Function} that activates the stop criterion. +\doxyref{Function} that activates the stop criterion. Increments the counter and returns TRUE if the current number of iteration is lower than the given maximum number of iterations. @@ -78,25 +78,25 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. -Definition at line 44 of file moGenSolContinue.h. +Definition at line 69 of file mo\-Gen\-Sol\-Continue.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} +References mo\-Gen\-Sol\-Continue$<$ EOT $>$::max\-Num\-Gen, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}} +\index{init@{init}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} 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}. +Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 54 of file moGenSolContinue.h. +Definition at line 79 of file mo\-Gen\-Sol\-Continue.h. -References moGenSolContinue$<$ EOT $>$::numGen. +References mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moGenSolContinue.h\end{CompactItemize} +mo\-Gen\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex index 3bb303687..17a819494 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c.tex @@ -1,11 +1,11 @@ -\section{moHC$<$ M $>$ Class Template Reference} +\section{mo\-HC$<$ M $>$ Class Template Reference} \label{classmo_h_c}\index{moHC@{moHC}} Hill Climbing (HC). -{\tt \#include $<$moHC.h$>$} +{\tt \#include $<$mo\-HC.h$>$} -Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_h_c} @@ -14,34 +14,34 @@ Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item -bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} which launches the HC. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which launches the HC. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb} +typedef M::EOType \bf{EOT}\label{classmo_h_c_d219296ede03c679646bce2fe8ff96cb} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027} +typedef EOT::Fitness \bf{Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd45027} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} +\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moHC$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-HC$<$ M $>$} Hill Climbing (HC). @@ -49,17 +49,17 @@ Class which describes the algorithm for a hill climbing. -Definition at line 25 of file moHC.h. +Definition at line 50 of file mo\-HC.h. \subsection{Constructor \& Destructor Documentation} -\index{moHC@{moHC}!moHC@{moHC}} -\index{moHC@{moHC}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} +\index{moHC@{mo\-HC}!moHC@{moHC}} +\index{moHC@{moHC}!moHC@{mo\-HC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} Full constructor. -All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}. +All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}. \begin{Desc} \item[Parameters:] @@ -68,14 +68,14 @@ All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{ \end{Desc} -Definition at line 52 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}} -\index{moHC@{moHC}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} +Definition at line 77 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}} +\index{moHC@{moHC}!moHC@{mo\-HC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HC}$<$ M $>$::\bf{mo\-HC} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} Light constructor. -This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl} (generally not a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}). +This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_expl} (generally not a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}). \begin{Desc} \item[Parameters:] @@ -84,17 +84,17 @@ This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl \end{Desc} -Definition at line 66 of file moHC.h. +Definition at line 91 of file mo\-HC.h. \subsection{Member Function Documentation} -\index{moHC@{moHC}!operator()@{operator()}} -\index{operator()@{operator()}!moHC@{moHC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moHC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} +\index{moHC@{mo\-HC}!operator()@{operator()}} +\index{operator()@{operator()}!moHC@{mo\-HC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-HC}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} -{\bf Function} which launches the HC. +\doxyref{Function} which launches the HC. -The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. +The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. \begin{Desc} \item[Parameters:] @@ -105,12 +105,12 @@ The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a} \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. +Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}. -Definition at line 81 of file moHC.h. +Definition at line 106 of file mo\-HC.h. -References moHC$<$ M $>$::full\_\-eval, and moHC$<$ M $>$::move\_\-expl. +References mo\-HC$<$ M $>$::full\_\-eval, and mo\-HC$<$ M $>$::move\_\-expl. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moHC.h\end{CompactItemize} +mo\-HC.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex index 776f8a638..7920ccf5d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_h_c_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{moHCMoveLoopExpl$<$ M $>$ Class Template Reference} +\section{mo\-HCMove\-Loop\-Expl$<$ M $>$ Class Template Reference} \label{classmo_h_c_move_loop_expl}\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}} -Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. +Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. -{\tt \#include $<$moHCMoveLoopExpl.h$>$} +{\tt \#include $<$mo\-HCMove\-Loop\-Expl.h$>$} -Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_h_c_move_loop_expl} @@ -14,49 +14,49 @@ Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select) +\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol) +void \bf{operator()} (const \bf{EOT} \&\_\-\_\-old\_\-sol, \bf{EOT} \&\_\-\_\-new\_\-sol) \begin{CompactList}\small\item\em Procedure which launches the explorer. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9} +typedef M::EOType \bf{EOT}\label{classmo_h_c_move_loop_expl_077befd4106c201eafd3ea22bcea2fe9} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_h_c_move_loop_expl_f24871224316d5549b9013a2d27ab465} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc} +\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc} \begin{CompactList}\small\item\em Move initialiser. \item\end{CompactList}\item -{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443} +\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779} +\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779} \begin{CompactList}\small\item\em (generally) Efficient evaluation. \item\end{CompactList}\item -{\bf moMoveSelect}$<$ M $>$ \& {\bf move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb} +\bf{mo\-Move\-Select}$<$ M $>$ \& \bf{move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb} \begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moHCMoveLoopExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-HCMove\-Loop\-Expl$<$ M $>$} -Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. +Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. -Definition at line 23 of file moHCMoveLoopExpl.h. +Definition at line 48 of file mo\-HCMove\-Loop\-Expl.h. \subsection{Constructor \& Destructor Documentation} -\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHCMoveLoopExpl}$<$ M $>$::{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5} +\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} +\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-HCMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5} Constructor. @@ -70,12 +70,12 @@ All the boxes have to be specified. \end{Desc} -Definition at line 43 of file moHCMoveLoopExpl.h. +Definition at line 68 of file mo\-HCMove\-Loop\-Expl.h. \subsection{Member Function Documentation} -\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!operator()@{operator()}} -\index{operator()@{operator()}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moHCMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} +\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}} +\index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-\_\-old\_\-sol}, \bf{EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,12 +89,12 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Implements \bf{eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. -Definition at line 59 of file moHCMoveLoopExpl.h. +Definition at line 84 of file mo\-HCMove\-Loop\-Expl.h. -References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move. +References mo\-HCMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-select, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moHCMoveLoopExpl.h\end{CompactItemize} +mo\-HCMove\-Loop\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps index b569936e2..a00a3c3cb 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 239.521 +%%BoundingBox: 0 0 500 437.158 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.14375 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moImprBestFitAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moImprBestFitAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex index fdc60cdaf..f8f676652 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_impr_best_fit_aspir_crit.tex @@ -1,11 +1,11 @@ -\section{moImprBestFitAspirCrit$<$ M $>$ Class Template Reference} +\section{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$ Class Template Reference} \label{classmo_impr_best_fit_aspir_crit}\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}} -One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. +One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. -{\tt \#include $<$moImprBestFitAspirCrit.h$>$} +{\tt \#include $<$mo\-Impr\-Best\-Fit\-Aspir\-Crit.h$>$} -Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit} @@ -14,49 +14,49 @@ Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_impr_best_fit_aspir_crit_0bc1a8c9af99781e662570c04750cca8} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moImprBestFitAspirCrit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340} +\bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340} \begin{CompactList}\small\item\em Contructor. \item\end{CompactList}\item -void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630} +void \bf{init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630} \begin{CompactList}\small\item\em Initialisation procedure. \item\end{CompactList}\item -bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em {\bf Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if the fit is better that the already saved fit. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3} +\bf{Fitness} \bf{best\_\-fit}\label{classmo_impr_best_fit_aspir_crit_9e52383f0af8013b4aff0942325e1bf3} \begin{CompactList}\small\item\em Best fitness found until now. \item\end{CompactList}\item -bool {\bf first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265} +bool \bf{first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33011402dbbbe78265} \begin{CompactList}\small\item\em Indicates that a fitness has been already saved or not. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moImprBestFitAspirCrit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} -One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. +One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. This criterion is satisfied when a given fitness is the best ever considered. -Definition at line 22 of file moImprBestFitAspirCrit.h. +Definition at line 47 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h. \subsection{Member Function Documentation} -\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}!operator()@{operator()}} -\index{operator()@{operator()}!moImprBestFitAspirCrit@{moImprBestFitAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moImprBestFitAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} +\index{moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}!operator()@{operator()}} +\index{operator()@{operator()}!moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Impr\-Best\-Fit\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} -{\bf Function} that indicates if the fit is better that the already saved fit. +\doxyref{Function} that indicates if the fit is better that the already saved fit. The first time, the function only saved the current move and fitness. @@ -69,12 +69,10 @@ The first time, the function only saved the current move and fitness. \item[Returns:]TRUE the first time and if \_\-\_\-fit $>$ best\_\-fit, else FALSE. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>$}. +Definition at line 77 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h. -Definition at line 52 of file moImprBestFitAspirCrit.h. - -References moImprBestFitAspirCrit$<$ M $>$::best\_\-fit, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time. +References mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::best\_\-fit, and mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::first\_\-time. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moImprBestFitAspirCrit.h\end{CompactItemize} +mo\-Impr\-Best\-Fit\-Aspir\-Crit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps index 3c5267824..5f2df0014 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 316.206 +%%BoundingBox: 0 0 500 490.798 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moItRandNextMove< M >) cw (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moItRandNextMove< M >) 0 0 box (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex index e7abc9a90..cafbfb9cf 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_it_rand_next_move.tex @@ -1,11 +1,11 @@ -\section{moItRandNextMove$<$ M $>$ Class Template Reference} +\section{mo\-It\-Rand\-Next\-Move$<$ M $>$ Class Template Reference} \label{classmo_it_rand_next_move}\index{moItRandNextMove@{moItRandNextMove}} -One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. +One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. -{\tt \#include $<$moItRandNextMove.h$>$} +{\tt \#include $<$mo\-It\-Rand\-Next\-Move.h$>$} -Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_it_rand_next_move} @@ -14,50 +14,50 @@ Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter) +\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter) \begin{CompactList}\small\item\em The constructor. \item\end{CompactList}\item -bool {\bf operator()} (M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Generation of a new move. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf} +typedef M::EOType \bf{EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0cd065e5671cf} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moRandMove}$<$ M $>$ \& {\bf rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459} +\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459} \begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item -unsigned int {\bf max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033} +unsigned int \bf{max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033} \begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item -unsigned int {\bf num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b} +unsigned int \bf{num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b} \begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moItRandNextMove$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-It\-Rand\-Next\-Move$<$ M $>$} -One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. +One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. -This class is a move (\doxyref{moMove}{p.}{classmo_move}) generator with a bound for the maximum number of iterations. +This class is a move (\doxyref{mo\-Move}{p.}{classmo_move}) generator with a bound for the maximum number of iterations. -Definition at line 22 of file moItRandNextMove.h. +Definition at line 47 of file mo\-It\-Rand\-Next\-Move.h. \subsection{Constructor \& Destructor Documentation} -\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}} -\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moItRandNextMove}$<$ M $>$::{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a} +\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!moItRandNextMove@{moItRandNextMove}} +\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::\bf{mo\-It\-Rand\-Next\-Move} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a} The constructor. -{\bf Parameters} only for initialising the attributes. +\doxyref{Parameters} only for initialising the attributes. \begin{Desc} \item[Parameters:] @@ -66,12 +66,12 @@ The constructor. \end{Desc} -Definition at line 37 of file moItRandNextMove.h. +Definition at line 62 of file mo\-It\-Rand\-Next\-Move.h. \subsection{Member Function Documentation} -\index{moItRandNextMove@{moItRandNextMove}!operator()@{operator()}} -\index{operator()@{operator()}!moItRandNextMove@{moItRandNextMove}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moItRandNextMove}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} +\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!operator()@{operator()}} +\index{operator()@{operator()}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-It\-Rand\-Next\-Move}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} Generation of a new move. @@ -87,12 +87,10 @@ If the maximum number is not already reached, the current move is forgotten and \item[Returns:]FALSE if the maximum number of iteration is reached, else TRUE. \end{Desc} -Implements {\bf eoBF$<$ M \&, const M::EOType \&, bool $>$}. +Definition at line 77 of file mo\-It\-Rand\-Next\-Move.h. -Definition at line 52 of file moItRandNextMove.h. - -References moItRandNextMove$<$ M $>$::max\_\-iter, moItRandNextMove$<$ M $>$::num\_\-iter, and moItRandNextMove$<$ M $>$::rand\_\-move. +References mo\-It\-Rand\-Next\-Move$<$ M $>$::max\_\-iter, mo\-It\-Rand\-Next\-Move$<$ M $>$::num\_\-iter, and mo\-It\-Rand\-Next\-Move$<$ M $>$::rand\_\-move. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moItRandNextMove.h\end{CompactItemize} +mo\-It\-Rand\-Next\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps index 1c276f23e..dfd4f441a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 208.333 +%%BoundingBox: 0 0 500 400 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.4 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moLSCheckPoint< M >) cw -(eoBF< const M &, const M::EOType &, void >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -188,7 +188,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moLSCheckPoint< M >) 0 0 box - (eoBF< const M &, const M::EOType &, void >) 0 1 box + (eoBF< A1, A2, R >) 0 1 box (eoFunctorBase) 0 2 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex index 4f8c5e09f..b7ac440bf 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_l_s_check_point.tex @@ -1,11 +1,11 @@ -\section{moLSCheckPoint$<$ M $>$ Class Template Reference} +\section{mo\-LSCheck\-Point$<$ M $>$ Class Template Reference} \label{classmo_l_s_check_point}\index{moLSCheckPoint@{moLSCheckPoint}} Class which allows a checkpointing system. -{\tt \#include $<$moLSCheckPoint.h$>$} +{\tt \#include $<$mo\-LSCheck\-Point.h$>$} -Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_l_s_check_point} @@ -14,20 +14,20 @@ Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} which launches the checkpointing. \item\end{CompactList}\item -void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) +void \bf{operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which launches the checkpointing. \item\end{CompactList}\item +void \bf{add} (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ {\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} +std::vector$<$ \bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ \bf{func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} \begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moLSCheckPoint$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-LSCheck\-Point$<$ M $>$} Class which allows a checkpointing system. @@ -35,15 +35,15 @@ Thanks to this class, at each iteration, additionnal function can be used (and n -Definition at line 21 of file moLSCheckPoint.h. +Definition at line 46 of file mo\-LSCheck\-Point.h. \subsection{Member Function Documentation} -\index{moLSCheckPoint@{moLSCheckPoint}!operator()@{operator()}} -\index{operator()@{operator()}!moLSCheckPoint@{moLSCheckPoint}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} +\index{moLSCheckPoint@{mo\-LSCheck\-Point}!operator()@{operator()}} +\index{operator()@{operator()}!moLSCheckPoint@{mo\-LSCheck\-Point}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} -{\bf Function} which launches the checkpointing. +\doxyref{Function} which launches the checkpointing. Each saved function is used on the current move and the current solution. @@ -54,11 +54,11 @@ Each saved function is used on the current move and the current solution. \end{Desc} -Definition at line 34 of file moLSCheckPoint.h. +Definition at line 59 of file mo\-LSCheck\-Point.h. -References moLSCheckPoint$<$ M $>$::func.\index{moLSCheckPoint@{moLSCheckPoint}!add@{add}} -\index{add@{add}!moLSCheckPoint@{moLSCheckPoint}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::add ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} +References mo\-LSCheck\-Point$<$ M $>$::func.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}} +\index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-LSCheck\-Point}$<$ M $>$::add (\bf{eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} Procedure which add a new function to the function vector. @@ -70,10 +70,10 @@ The new function is added at the end of the vector. \begin{Desc} \end{Desc} -Definition at line 49 of file moLSCheckPoint.h. +Definition at line 74 of file mo\-LSCheck\-Point.h. -References moLSCheckPoint$<$ M $>$::func. +References mo\-LSCheck\-Point$<$ M $>$::func. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moLSCheckPoint.h\end{CompactItemize} +mo\-LSCheck\-Point.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex index 130374224..ed4fcc331 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_linear_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{moLinearCoolingSchedule Class Reference} +\section{mo\-Linear\-Cooling\-Schedule Class Reference} \label{classmo_linear_cooling_schedule}\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. -{\tt \#include $<$moLinearCoolingSchedule.h$>$} +{\tt \#include $<$mo\-Linear\-Cooling\-Schedule.h$>$} -Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H] +Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_linear_cooling_schedule} @@ -14,34 +14,34 @@ Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moLinearCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) +\bf{mo\-Linear\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item -bool {\bf operator()} (double \&\_\-\_\-temp) -\begin{CompactList}\small\item\em {\bf Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (double \&\_\-\_\-temp) +\begin{CompactList}\small\item\em \doxyref{Function} which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -double {\bf threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} +double \bf{threshold}\label{classmo_linear_cooling_schedule_e7f539f986801ea71392c4a55ba08a76} \begin{CompactList}\small\item\em The temperature threhold. \item\end{CompactList}\item -double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} +double \bf{quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffdab3d6ce8d8ed} \begin{CompactList}\small\item\em The quantity that allows the temperature to decrease. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. -Definition at line 22 of file moLinearCoolingSchedule.h. +Definition at line 47 of file mo\-Linear\-Cooling\-Schedule.h. \subsection{Constructor \& Destructor Documentation} -\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moLinearCoolingSchedule::moLinearCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} +\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} +\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Linear\-Cooling\-Schedule::mo\-Linear\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} Simple constructor. @@ -53,15 +53,15 @@ Simple constructor. \end{Desc} -Definition at line 31 of file moLinearCoolingSchedule.h. +Definition at line 56 of file mo\-Linear\-Cooling\-Schedule.h. \subsection{Member Function Documentation} -\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!operator()@{operator()}} -\index{operator()@{operator()}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} +\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}} +\index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} -{\bf Function} which proceeds to the cooling. +\doxyref{Function} which proceeds to the cooling. It decreases the temperature and indicates if it is greater than the threshold. @@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} -Implements {\bf eoUF$<$ double \&, bool $>$}. +Implements \bf{eo\-UF$<$ double \&, bool $>$}. -Definition at line 41 of file moLinearCoolingSchedule.h. +Definition at line 66 of file mo\-Linear\-Cooling\-Schedule.h. References quantity, and threshold. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moLinearCoolingSchedule.h\end{CompactItemize} +mo\-Linear\-Cooling\-Schedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_move.eps index 68c490c6c..245574ea6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 410.959 +%%BoundingBox: 0 0 500 547.945 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,12 +19,12 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.21667 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.9125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def /yspacing 0 def -/rows 3 def +/rows 4 def /cols 1 def /scalefactor 0 def /boxfont /Times-Roman findfont fontheight scalefont def @@ -176,6 +176,7 @@ boxfont setfont (moMove< EOT >) cw (eoUF< EOT &, void >) cw (eoFunctorBase) cw +(TwoOpt) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def /yspacing boxheight disty add def @@ -187,17 +188,22 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- - (moMove< EOT >) 0 0 box - (eoUF< EOT &, void >) 0 1 box - (eoFunctorBase) 0 2 box + (moMove< EOT >) 0 1 box + (eoUF< EOT &, void >) 0 2 box + (eoFunctorBase) 0 3 box + (TwoOpt) 0 0 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 +solid +1 0 0.25 out +solid +0 0 0.75 in diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_move.tex index e178fa21e..ee76bd49d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move.tex @@ -1,26 +1,26 @@ -\section{moMove$<$ EOT $>$ Class Template Reference} +\section{mo\-Move$<$ EOT $>$ Class Template Reference} \label{classmo_move}\index{moMove@{moMove}} Definition of a move. -{\tt \#include $<$moMove.h$>$} +{\tt \#include $<$mo\-Move.h$>$} -Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3cm]{classmo_move} +\includegraphics[height=4cm]{classmo_move} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT {\bf EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba} +typedef EOT \bf{EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moMove$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Move$<$ EOT $>$} Definition of a move. @@ -28,8 +28,8 @@ A move transforms a solution to another close solution. It describes how a solut -Definition at line 23 of file moMove.h. +Definition at line 48 of file mo\-Move.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMove.h\end{CompactItemize} +mo\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex index 0e4a7e621..74504c401 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_expl.tex @@ -1,11 +1,11 @@ -\section{moMoveExpl$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Expl$<$ M $>$ Class Template Reference} \label{classmo_move_expl}\index{moMoveExpl@{moMoveExpl}} -Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. +Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. -{\tt \#include $<$moMoveExpl.h$>$} +{\tt \#include $<$mo\-Move\-Expl.h$>$} -Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4.59016cm]{classmo_move_expl} @@ -14,16 +14,16 @@ Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Expl$<$ M $>$} -Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. +Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. -Only a description...See \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}. +Only a description...See \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}. -Definition at line 21 of file moMoveExpl.h. +Definition at line 46 of file mo\-Move\-Expl.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveExpl.h\end{CompactItemize} +mo\-Move\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps index bbff52acc..1f107a403 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 160.858 +%%BoundingBox: 0 0 500 400 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.10833 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moMoveIncrEval< M >) cw -(eoBF< const M &, const M::EOType &, M::EOType::Fitness >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -188,7 +188,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveIncrEval< M >) 0 0 box - (eoBF< const M &, const M::EOType &, M::EOType::Fitness >) 0 1 box + (eoBF< A1, A2, R >) 0 1 box (eoFunctorBase) 0 2 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex index 85bba26c1..1152069a6 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_incr_eval.tex @@ -1,11 +1,11 @@ -\section{moMoveIncrEval$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Incr\-Eval$<$ M $>$ Class Template Reference} \label{classmo_move_incr_eval}\index{moMoveIncrEval@{moMoveIncrEval}} (generally) Efficient evaluation function based a move and a solution. -{\tt \#include $<$moMoveIncrEval.h$>$} +{\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$} -Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move_incr_eval} @@ -14,7 +14,7 @@ Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveIncrEval$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Incr\-Eval$<$ M $>$} (generally) Efficient evaluation function based a move and a solution. @@ -22,8 +22,8 @@ From a move and a solution, it computes a new fitness that could be associated t -Definition at line 24 of file moMoveIncrEval.h. +Definition at line 49 of file mo\-Move\-Incr\-Eval.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveIncrEval.h\end{CompactItemize} +mo\-Move\-Incr\-Eval.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps b/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps index 783ab9a81..e04209e70 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_init.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 237.154 +%%BoundingBox: 0 0 500 454.545 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.10833 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.1 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moMoveInit< M >) cw -(eoBF< M &, const M::EOType &, void >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -188,7 +188,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moMoveInit< M >) 0 0 box - (eoBF< M &, const M::EOType &, void >) 0 1 box + (eoBF< A1, A2, R >) 0 1 box (eoFunctorBase) 0 2 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex index 904ac7911..df4cfe81b 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_init.tex @@ -1,11 +1,11 @@ -\section{moMoveInit$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Init$<$ M $>$ Class Template Reference} \label{classmo_move_init}\index{moMoveInit@{moMoveInit}} -Move (\doxyref{moMove}{p.}{classmo_move}) initializer. +Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. -{\tt \#include $<$moMoveInit.h$>$} +{\tt \#include $<$mo\-Move\-Init.h$>$} -Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move_init} @@ -14,16 +14,16 @@ Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveInit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Init$<$ M $>$} -Move (\doxyref{moMove}{p.}{classmo_move}) initializer. +Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used. -Definition at line 22 of file moMoveInit.h. +Definition at line 47 of file mo\-Move\-Init.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveInit.h\end{CompactItemize} +mo\-Move\-Init.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex index 15968268f..1bfe7cf70 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{moMoveLoopExpl$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Loop\-Expl$<$ M $>$ Class Template Reference} \label{classmo_move_loop_expl}\index{moMoveLoopExpl@{moMoveLoopExpl}} Class which describes an iterative explorer. -{\tt \#include $<$moMoveLoopExpl.h$>$} +{\tt \#include $<$mo\-Move\-Loop\-Expl.h$>$} -Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4.59016cm]{classmo_move_loop_expl} @@ -14,16 +14,16 @@ Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveLoopExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Loop\-Expl$<$ M $>$} Class which describes an iterative explorer. -Only a description... \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}. +Only a description... \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}. -Definition at line 21 of file moMoveLoopExpl.h. +Definition at line 46 of file mo\-Move\-Loop\-Expl.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveLoopExpl.h\end{CompactItemize} +mo\-Move\-Loop\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex index 5a128a357..1ec2f3602 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_move_select.tex @@ -1,11 +1,11 @@ -\section{moMoveSelect$<$ M $>$ Class Template Reference} +\section{mo\-Move\-Select$<$ M $>$ Class Template Reference} \label{classmo_move_select}\index{moMoveSelect@{moMoveSelect}} -Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). +Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). -{\tt \#include $<$moMoveSelect.h$>$} +{\tt \#include $<$mo\-Move\-Select.h$>$} -Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2.82828cm]{classmo_move_select} @@ -14,33 +14,33 @@ Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_move_select_8148ccc0e6fbd209c3fe6829559895c8} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)=0 +virtual void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit)=0 \begin{CompactList}\small\item\em Procedure which initialises all that the move selector needs including the initial fitness. \item\end{CompactList}\item -virtual bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit)=0 -\begin{CompactList}\small\item\em {\bf Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize} +virtual bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit)=0 +\begin{CompactList}\small\item\em \doxyref{Function} which updates the best solutions. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moMoveSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Move\-Select$<$ M $>$} -Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). +Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). -It iteratively considers some moves (\doxyref{moMove}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. +It iteratively considers some moves (\doxyref{mo\-Move}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. -Definition at line 32 of file moMoveSelect.h. +Definition at line 57 of file mo\-Move\-Select.h. \subsection{Member Function Documentation} -\index{moMoveSelect@{moMoveSelect}!init@{init}} -\index{init@{init}!moMoveSelect@{moMoveSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moMoveSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e} +\index{moMoveSelect@{mo\-Move\-Select}!init@{init}} +\index{init@{init}!moMoveSelect@{mo\-Move\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Move\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e} Procedure which initialises all that the move selector needs including the initial fitness. @@ -54,12 +54,12 @@ In order to know the fitness of the solution, for which the neighborhood will be \end{Desc} -Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, {\bf moFirstImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{moMoveSelect}!update@{update}} -\index{update@{update}!moMoveSelect@{moMoveSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf moMoveSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} +Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, \bf{mo\-First\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{mo\-Move\-Select}!update@{update}} +\index{update@{update}!moMoveSelect@{mo\-Move\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool \bf{mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} -{\bf Function} which updates the best solutions. +\doxyref{Function} which updates the best solutions. \begin{Desc} \item[Parameters:] @@ -70,8 +70,8 @@ Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_ \item[Returns:]a boolean that expresses the need to resume the exploration. \end{Desc} -Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}. +Implemented in \bf{mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and \bf{mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moMoveSelect.h\end{CompactItemize} +mo\-Move\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps index dfda1c365..08b997f12 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 316.206 +%%BoundingBox: 0 0 500 490.798 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moNextMove< M >) cw -(eoBF< M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw (moItRandNextMove< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -189,7 +189,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moNextMove< M >) 0 1 box - (eoBF< M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box (moItRandNextMove< M >) 0 0 box diff --git a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex index 3fdea7d9d..038a60577 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_next_move.tex @@ -1,11 +1,11 @@ -\section{moNextMove$<$ M $>$ Class Template Reference} +\section{mo\-Next\-Move$<$ M $>$ Class Template Reference} \label{classmo_next_move}\index{moNextMove@{moNextMove}} -Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). +Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}). -{\tt \#include $<$moNextMove.h$>$} +{\tt \#include $<$mo\-Next\-Move.h$>$} -Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_next_move} @@ -14,16 +14,16 @@ Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moNextMove$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Next\-Move$<$ M $>$} -Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). +Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}). -Useful for the explorer (for \doxyref{moTS}{p.}{classmo_t_s} or \doxyref{moHC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used. +Useful for the explorer (for \doxyref{mo\-TS}{p.}{classmo_t_s} or \doxyref{mo\-HC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used. -Definition at line 22 of file moNextMove.h. +Definition at line 47 of file mo\-Next\-Move.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moNextMove.h\end{CompactItemize} +mo\-Next\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps index 8bc333965..f5d50a373 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 239.521 +%%BoundingBox: 0 0 500 583.942 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moNoAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< const M &, const M::EOType::Fitness &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moNoAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex index e338ac1b4..e8ab9624a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_no_aspir_crit.tex @@ -1,11 +1,11 @@ -\section{moNoAspirCrit$<$ M $>$ Class Template Reference} +\section{mo\-No\-Aspir\-Crit$<$ M $>$ Class Template Reference} \label{classmo_no_aspir_crit}\index{moNoAspirCrit@{moNoAspirCrit}} -One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}). +One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}). -{\tt \#include $<$moNoAspirCrit.h$>$} +{\tt \#include $<$mo\-No\-Aspir\-Crit.h$>$} -Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_no_aspir_crit} @@ -14,30 +14,30 @@ Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H] \subsection*{Private Member Functions} \begin{CompactItemize} \item -bool {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item -void {\bf init} () -\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which describes the aspiration criterion behaviour. \item\end{CompactList}\item +void \bf{init} () +\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moNoAspirCrit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-No\-Aspir\-Crit$<$ M $>$} -One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}). +One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}). The simplest : never satisfied. -Definition at line 21 of file moNoAspirCrit.h. +Definition at line 46 of file mo\-No\-Aspir\-Crit.h. \subsection{Member Function Documentation} -\index{moNoAspirCrit@{moNoAspirCrit}!operator()@{operator()}} -\index{operator()@{operator()}!moNoAspirCrit@{moNoAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moNoAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} +\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!operator()@{operator()}} +\index{operator()@{operator()}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} -{\bf Function} which describes the aspiration criterion behaviour. +\doxyref{Function} which describes the aspiration criterion behaviour. Does nothing. @@ -50,19 +50,19 @@ Does nothing. \item[Returns:]FALSE. \end{Desc} -Definition at line 32 of file moNoAspirCrit.h.\index{moNoAspirCrit@{moNoAspirCrit}!init@{init}} -\index{init@{init}!moNoAspirCrit@{moNoAspirCrit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moNoAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} +Definition at line 57 of file mo\-No\-Aspir\-Crit.h.\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!init@{init}} +\index{init@{init}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-No\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} -Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. +Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. Nothing... -Implements {\bf moAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}. +Implements \bf{mo\-Aspir\-Crit$<$ M $>$} \doxyref{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}. -Definition at line 43 of file moNoAspirCrit.h. +Definition at line 68 of file mo\-No\-Aspir\-Crit.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moNoAspirCrit.h\end{CompactItemize} +mo\-No\-Aspir\-Crit.h\end{CompactItemize} 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 index 84d1a2396..dd301eb4b 100644 --- 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 @@ -1,11 +1,11 @@ -\section{moNoFitImprSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ 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$>$} +{\tt \#include $<$mo\-No\-Fit\-Impr\-Sol\-Continue.h$>$} -Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_no_fit_impr_sol_continue} @@ -14,37 +14,37 @@ Inheritance diagram for moNoFitImprSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness {\bf Fitness}\label{classmo_no_fit_impr_sol_continue_64c184de66bb37d75d53aa600ac947b3} +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 \_\-\_\-maxNumberOfIterationWithoutImprovement) +\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} () +bool \bf{operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stopping criterion. \item\end{CompactList}\item +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise all the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxNumberOfIterationsWithoutImprovement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b} +unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_no_fit_impr_sol_continue_03612ffc3af9d943c1b1d2cde09d461b} \begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item -bool {\bf firstFitnessSaved}\label{classmo_no_fit_impr_sol_continue_ca3591e47a075b59e0826f31234c71ef} +bool \bf{first\-Fitness\-Saved}\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} +\bf{Fitness} \bf{fitness}\label{classmo_no_fit_impr_sol_continue_3d3d2b43a4dd73e38689cc0018d44ee7} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -unsigned int {\bf counter}\label{classmo_no_fit_impr_sol_continue_46fc008a8f7cd06dcaaeb4016b433adb} +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 $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -52,12 +52,12 @@ The stop criterion corresponds to a maximum number of iterations without improve -Definition at line 21 of file moNoFitImprSolContinue.h. +Definition at line 46 of file mo\-No\-Fit\-Impr\-Sol\-Continue.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 \_\-\_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_a447aa0d8ed4ddf6fe47c805269cac6c} +\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} +\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-No\-Fit\-Impr\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_no_fit_impr_sol_continue_a447aa0d8ed4ddf6fe47c805269cac6c} Basic constructor. @@ -65,19 +65,19 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} +\item[{\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 33 of file moNoFitImprSolContinue.h. +Definition at line 58 of file mo\-No\-Fit\-Impr\-Sol\-Continue.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} +\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_dbd663623cae56ec76ee504ecb226fed} -{\bf Function} that activates the stopping criterion. +\doxyref{Function} that activates the stopping criterion. Indicates if the fitness has not been improved since a given number of iterations (after a minimum of iterations). \begin{Desc} \item[Parameters:] @@ -88,25 +88,25 @@ Indicates if the fitness has not been improved since a given number of iteration \item[Returns:]true or false. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. -Definition at line 43 of file moNoFitImprSolContinue.h. +Definition at line 68 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. -References moNoFitImprSolContinue$<$ EOT $>$::counter, moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved, moNoFitImprSolContinue$<$ EOT $>$::fitness, and moNoFitImprSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moNoFitImprSolContinue@{moNoFitImprSolContinue}!init@{init}} -\index{init@{init}!moNoFitImprSolContinue@{moNoFitImprSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moNoFitImprSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} +References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::fitness, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}!init@{init}} +\index{init@{init}!moNoFitImprSolContinue@{mo\-No\-Fit\-Impr\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-No\-Fit\-Impr\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4} Procedure which allows to initialise all the stuff needed. It can be also used to reinitialize all the needed things. -Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 77 of file moNoFitImprSolContinue.h. +Definition at line 102 of file mo\-No\-Fit\-Impr\-Sol\-Continue.h. -References moNoFitImprSolContinue$<$ EOT $>$::counter, and moNoFitImprSolContinue$<$ EOT $>$::firstFitnessSaved. +References mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::counter, and mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moNoFitImprSolContinue.h\end{CompactItemize} +mo\-No\-Fit\-Impr\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex index 640633c84..ae3b75c91 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_impr_select.tex @@ -1,11 +1,11 @@ -\section{moRandImprSelect$<$ M $>$ Class Template Reference} +\section{mo\-Rand\-Impr\-Select$<$ M $>$ Class Template Reference} \label{classmo_rand_impr_select}\index{moRandImprSelect@{moRandImprSelect}} -One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}). +One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}). -{\tt \#include $<$moRandImprSelect.h$>$} +{\tt \#include $<$mo\-Rand\-Impr\-Select.h$>$} -Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_rand_impr_select} @@ -14,50 +14,50 @@ Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_rand_impr_select_3bff2fdb963297430543c82ffb567a5c} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item -bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em {\bf Function} that updates the fitness and move vectors. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) +void \bf{init} (const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item +bool \bf{update} (const M \&\_\-\_\-move, const \bf{Fitness} \&\_\-\_\-fit) +\begin{CompactList}\small\item\em \doxyref{Function} that updates the fitness and move vectors. \item\end{CompactList}\item +void \bf{operator()} (M \&\_\-\_\-move, \bf{Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) \begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf Fitness} {\bf init\_\-fit}\label{classmo_rand_impr_select_d153c277a0a2ea95ac484210d445b40e} +\bf{Fitness} \bf{init\_\-fit}\label{classmo_rand_impr_select_d153c277a0a2ea95ac484210d445b40e} \begin{CompactList}\small\item\em Fitness of the current solution. \item\end{CompactList}\item -std::vector$<$ {\bf Fitness} $>$ {\bf vect\_\-better\_\-fit}\label{classmo_rand_impr_select_05c7c3b858e8a25632f2f5c86b0c97a3} +std::vector$<$ \bf{Fitness} $>$ \bf{vect\_\-better\_\-fit}\label{classmo_rand_impr_select_05c7c3b858e8a25632f2f5c86b0c97a3} \begin{CompactList}\small\item\em Candidate fitnesse vector. \item\end{CompactList}\item -std::vector$<$ M $>$ {\bf vect\_\-better\_\-moves}\label{classmo_rand_impr_select_2ace12bd179144fa71d56324694201f5} +std::vector$<$ M $>$ \bf{vect\_\-better\_\-moves}\label{classmo_rand_impr_select_2ace12bd179144fa71d56324694201f5} \begin{CompactList}\small\item\em Candidate move vector. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moRandImprSelect$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Rand\-Impr\-Select$<$ M $>$} -One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}). +One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}). All the neighbors are considered. One of them that enables an improvment of the objective function is choosen. -Definition at line 25 of file moRandImprSelect.h. +Definition at line 50 of file mo\-Rand\-Impr\-Select.h. \subsection{Member Function Documentation} -\index{moRandImprSelect@{moRandImprSelect}!init@{init}} -\index{init@{init}!moRandImprSelect@{moRandImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9} +\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!init@{init}} +\index{init@{init}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::init (const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9} -Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. +Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. Give a value to the initialise fitness. Clean the move and fitness vectors. @@ -68,16 +68,16 @@ Give a value to the initialise fitness. Clean the move and fitness vectors. \end{Desc} -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. -Definition at line 40 of file moRandImprSelect.h. +Definition at line 65 of file mo\-Rand\-Impr\-Select.h. -References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!update@{update}} -\index{update@{update}!moRandImprSelect@{moRandImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moRandImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} +References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!update@{update}} +\index{update@{update}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const \bf{Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} -{\bf Function} that updates the fitness and move vectors. +\doxyref{Function} that updates the fitness and move vectors. if a move give a better fitness than the initial fitness, it is saved and the fitness too. @@ -90,13 +90,13 @@ if a move give a better fitness than the initial fitness, it is saved and the fi \item[Returns:]TRUE. \end{Desc} -Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. +Implements \bf{mo\-Move\-Select$<$ M $>$} \doxyref{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. -Definition at line 56 of file moRandImprSelect.h. +Definition at line 81 of file mo\-Rand\-Impr\-Select.h. -References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!operator()@{operator()}} -\index{operator()@{operator()}!moRandImprSelect@{moRandImprSelect}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} +References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}} +\index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, \bf{Fitness} \& {\em \_\-\_\-fit}) throw (\bf{Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -111,16 +111,16 @@ One the saved move is randomly chosen. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description} +\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description} \end{Desc} -Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements \bf{eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 77 of file moRandImprSelect.h. +Definition at line 102 of file mo\-Rand\-Impr\-Select.h. -References eoRng::random(), moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves. +References eo\-Rng::random(), mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moRandImprSelect.h\end{CompactItemize} +mo\-Rand\-Impr\-Select.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex index 665d27245..135c99254 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_rand_move.tex @@ -1,11 +1,11 @@ -\section{moRandMove$<$ M $>$ Class Template Reference} +\section{mo\-Rand\-Move$<$ M $>$ Class Template Reference} \label{classmo_rand_move}\index{moRandMove@{moRandMove}} Random move generator. -{\tt \#include $<$moRandMove.h$>$} +{\tt \#include $<$mo\-Rand\-Move.h$>$} -Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_rand_move} @@ -14,16 +14,16 @@ Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moRandMove$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Rand\-Move$<$ M $>$} Random move generator. -Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{moSA}{p.}{classmo_s_a}. +Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{mo\-SA}{p.}{classmo_s_a}. -Definition at line 21 of file moRandMove.h. +Definition at line 46 of file mo\-Rand\-Move.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moRandMove.h\end{CompactItemize} +mo\-Rand\-Move.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex index a58e3a510..84781ea99 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_s_a.tex @@ -1,11 +1,11 @@ -\section{moSA$<$ M $>$ Class Template Reference} +\section{mo\-SA$<$ M $>$ Class Template Reference} \label{classmo_s_a}\index{moSA@{moSA}} Simulated Annealing (SA). -{\tt \#include $<$moSA.h$>$} +{\tt \#include $<$mo\-SA.h$>$} -Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_s_a} @@ -14,44 +14,44 @@ Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, \bf{mo\-Cooling\-Schedule} \&\_\-\_\-cool\_\-sched, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item -bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5} +typedef M::EOType \bf{EOT}\label{classmo_s_a_d5d64a8797bdedc7b3af7893aded0bd5} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b} +typedef EOT::Fitness \bf{Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b34804b} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moRandMove}$<$ M $>$ \& {\bf move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec} +\bf{mo\-Rand\-Move}$<$ M $>$ \& \bf{move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec} \begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item -{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc} +\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc} \begin{CompactList}\small\item\em A (generally) efficient evaluation function. \item\end{CompactList}\item -{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716} +\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716} \begin{CompactList}\small\item\em Stopping criterion before temperature update. \item\end{CompactList}\item -double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} +double \bf{init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} \begin{CompactList}\small\item\em Initial temperature. \item\end{CompactList}\item -{\bf moCoolingSchedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} +\bf{mo\-Cooling\-Schedule} \& \bf{cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moSA$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-SA$<$ M $>$} Simulated Annealing (SA). @@ -59,12 +59,12 @@ Class that describes a Simulated Annealing algorithm. -Definition at line 30 of file moSA.h. +Definition at line 55 of file mo\-SA.h. \subsection{Constructor \& Destructor Documentation} -\index{moSA@{moSA}!moSA@{moSA}} -\index{moSA@{moSA}!moSA@{moSA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSA}$<$ M $>$::{\bf moSA} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} +\index{moSA@{mo\-SA}!moSA@{moSA}} +\index{moSA@{moSA}!moSA@{mo\-SA}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-SA}$<$ M $>$::\bf{mo\-SA} (\bf{mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, \bf{mo\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} SA constructor. @@ -78,17 +78,17 @@ All the boxes used by a SA need to be given. \end{Desc} -Definition at line 58 of file moSA.h. +Definition at line 83 of file mo\-SA.h. \subsection{Member Function Documentation} -\index{moSA@{moSA}!operator()@{operator()}} -\index{operator()@{operator()}!moSA@{moSA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} +\index{moSA@{mo\-SA}!operator()@{operator()}} +\index{operator()@{operator()}!moSA@{mo\-SA}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-SA}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} function that launches the SA algorithm. -As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm. +As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm. \begin{Desc} \item[Parameters:] @@ -99,12 +99,12 @@ As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the S \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. +Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}. -Definition at line 80 of file moSA.h. +Definition at line 105 of file mo\-SA.h. -References moSA$<$ M $>$::cont, moSA$<$ M $>$::cool\_\-sched, moSA$<$ M $>$::full\_\-eval, moSA$<$ M $>$::incr\_\-eval, moSA$<$ M $>$::init\_\-temp, moSA$<$ M $>$::move\_\-rand, and eoRng::uniform(). +References mo\-SA$<$ M $>$::cont, mo\-SA$<$ M $>$::cool\_\-sched, mo\-SA$<$ M $>$::full\_\-eval, mo\-SA$<$ M $>$::incr\_\-eval, mo\-SA$<$ M $>$::init\_\-temp, mo\-SA$<$ M $>$::move\_\-rand, and eo\-Rng::uniform(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSA.h\end{CompactItemize} +mo\-SA.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps index 95d9a8476..b0dcef476 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 277.778 +%%BoundingBox: 0 0 500 427.807 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.16875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moSimpleMoveTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleMoveTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex index 0d6402705..f99f1c919 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_move_tabu_list.tex @@ -1,11 +1,11 @@ -\section{moSimpleMoveTabuList$<$ M $>$ Class Template Reference} +\section{mo\-Simple\-Move\-Tabu\-List$<$ M $>$ Class Template Reference} \label{classmo_simple_move_tabu_list}\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}} Class describing a move tabu list with a limited memory. -{\tt \#include $<$moSimpleMoveTabuList.h$>$} +{\tt \#include $<$mo\-Simple\-Move\-Tabu\-List.h$>$} -Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_simple_move_tabu_list} @@ -14,75 +14,73 @@ Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7} +typedef M::EOType \bf{EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e1db9e4fdade2edb7} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSimpleMoveTabuList} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79} +\bf{mo\-Simple\-Move\-Tabu\-List} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79} \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item -void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item -void {\bf update} () +void \bf{update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf removeMove} (const M \&\_\-\_\-move) +void \bf{remove\-Move} (const M \&\_\-\_\-move) \begin{CompactList}\small\item\em Procedure that removes a given move from the tabu list (if it is into, else do nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxSize}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23} +unsigned int \bf{max\-Size}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23} \begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item -unsigned int {\bf currentSize}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb} +unsigned int \bf{current\-Size}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb} \begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item -std::list$<$ M $>$ {\bf tabuList}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} +std::list$<$ M $>$ \bf{tabu\-List}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} \begin{CompactList}\small\item\em The move tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moSimpleMoveTabuList$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Simple\-Move\-Tabu\-List$<$ M $>$} Class describing a move tabu list with a limited memory. -Definition at line 22 of file moSimpleMoveTabuList.h. +Definition at line 47 of file mo\-Simple\-Move\-Tabu\-List.h. \subsection{Member Function Documentation} -\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!operator()@{operator()}} -\index{operator()@{operator()}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleMoveTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} +\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} -{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. +\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} \end{Desc} \begin{Desc} \item[Returns:]true or false. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. +Definition at line 71 of file mo\-Simple\-Move\-Tabu\-List.h. -Definition at line 46 of file moSimpleMoveTabuList.h. - -References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}} -\index{add@{add}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!add@{add}} +\index{add@{add}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} Procedure to add a move in the tabu list. @@ -96,35 +94,35 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. -Definition at line 60 of file moSimpleMoveTabuList.h. +Definition at line 85 of file mo\-Simple\-Move\-Tabu\-List.h. -References moSimpleMoveTabuList$<$ M $>$::currentSize, moSimpleMoveTabuList$<$ M $>$::maxSize, moSimpleMoveTabuList$<$ M $>$::removeMove(), and moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!update@{update}} -\index{update@{update}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::remove\-Move(), and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}} +\index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 82 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!init@{init}} -\index{init@{init}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} +Definition at line 107 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}} +\index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 88 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!removeMove@{removeMove}} -\index{removeMove@{removeMove}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::removeMove (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} +Definition at line 113 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!removeMove@{removeMove}} +\index{removeMove@{removeMove}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::remove\-Move (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} Procedure that removes a given move from the tabu list (if it is into, else do nothing). @@ -132,16 +130,16 @@ Procedure that removes a given move from the tabu list (if it is into, else do n \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \end{description} \end{Desc} -Definition at line 100 of file moSimpleMoveTabuList.h. +Definition at line 125 of file mo\-Simple\-Move\-Tabu\-List.h. -References moSimpleMoveTabuList$<$ M $>$::tabuList. +References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List. -Referenced by moSimpleMoveTabuList$<$ M $>$::add(). +Referenced by mo\-Simple\-Move\-Tabu\-List$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSimpleMoveTabuList.h\end{CompactItemize} +mo\-Simple\-Move\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps index c673817e4..06f8e8fc5 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 277.778 +%%BoundingBox: 0 0 500 400 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moSimpleSolutionTabuList< M >) cw (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleSolutionTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< const M &, const M::EOType &, bool >) 0 2 box + (eoBF< A1, A2, R >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex index a81499907..a60c91c07 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_simple_solution_tabu_list.tex @@ -1,11 +1,11 @@ -\section{moSimpleSolutionTabuList$<$ M $>$ Class Template Reference} +\section{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$ Class Template Reference} \label{classmo_simple_solution_tabu_list}\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} Class describing a solution tabu list with limited length. -{\tt \#include $<$moSimpleSolutionTabuList.h$>$} +{\tt \#include $<$mo\-Simple\-Solution\-Tabu\-List.h$>$} -Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_simple_solution_tabu_list} @@ -14,54 +14,54 @@ Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} +typedef M::EOType \bf{EOT}\label{classmo_simple_solution_tabu_list_881060871a6b49e5e8554c5df85176d9} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moSimpleSolutionTabuList} (unsigned int \_\-\_\-size) +\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int \_\-\_\-size) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item -void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) +bool \bf{operator()} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item +void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item -void {\bf update} () +void \bf{update} () \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -void {\bf init} () +void \bf{init} () \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf removeSolution} (const {\bf EOT} \&\_\-\_\-sol) +void \bf{remove\-Solution} (const \bf{EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure that removes a given solution from the tabu list (if it is into, else does nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxSize}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845} +unsigned int \bf{max\-Size}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845} \begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item -unsigned int {\bf currentSize}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf} +unsigned int \bf{current\-Size}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf} \begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item -std::list$<$ {\bf EOT} $>$ {\bf tabuList}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} +std::list$<$ \bf{EOT} $>$ \bf{tabu\-List}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} \begin{CompactList}\small\item\em The solution tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moSimpleSolutionTabuList$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} Class describing a solution tabu list with limited length. -Definition at line 22 of file moSimpleSolutionTabuList.h. +Definition at line 47 of file mo\-Simple\-Solution\-Tabu\-List.h. \subsection{Constructor \& Destructor Documentation} -\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSimpleSolutionTabuList}$<$ M $>$::{\bf moSimpleSolutionTabuList} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178} +\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::\bf{mo\-Simple\-Solution\-Tabu\-List} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178} Constructor. @@ -73,34 +73,32 @@ Constructor. \end{Desc} -Definition at line 34 of file moSimpleSolutionTabuList.h. +Definition at line 59 of file mo\-Simple\-Solution\-Tabu\-List.h. -References moSimpleSolutionTabuList$<$ M $>$::currentSize. +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size. \subsection{Member Function Documentation} -\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!operator()@{operator()}} -\index{operator()@{operator()}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleSolutionTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} +\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} -{\bf Function} that indicates if, in a given state, the \_\-move is tabu or not. +\doxyref{Function} that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} \end{Desc} \begin{Desc} \item[Returns:]true or false. \end{Desc} -Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. +Definition at line 70 of file mo\-Simple\-Solution\-Tabu\-List.h. -Definition at line 45 of file moSimpleSolutionTabuList.h. - -References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}} -\index{add@{add}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!add@{add}} +\index{add@{add}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} Procedure to add a move in the tabu list. @@ -114,35 +112,35 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. -Definition at line 64 of file moSimpleSolutionTabuList.h. +Definition at line 89 of file mo\-Simple\-Solution\-Tabu\-List.h. -References moSimpleSolutionTabuList$<$ M $>$::currentSize, moSimpleSolutionTabuList$<$ M $>$::maxSize, moSimpleSolutionTabuList$<$ M $>$::removeSolution(), and moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!update@{update}} -\index{update@{update}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::remove\-Solution(), and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}} +\index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 91 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!init@{init}} -\index{init@{init}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} +Definition at line 116 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}} +\index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements \bf{mo\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 97 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!removeSolution@{removeSolution}} -\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::removeSolution (const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} +Definition at line 122 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!removeSolution@{removeSolution}} +\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::remove\-Solution (const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} Procedure that removes a given solution from the tabu list (if it is into, else does nothing). @@ -154,12 +152,12 @@ Procedure that removes a given solution from the tabu list (if it is into, else \end{Desc} -Definition at line 109 of file moSimpleSolutionTabuList.h. +Definition at line 134 of file mo\-Simple\-Solution\-Tabu\-List.h. -References moSimpleSolutionTabuList$<$ M $>$::tabuList. +References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List. -Referenced by moSimpleSolutionTabuList$<$ M $>$::add(). +Referenced by mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSimpleSolutionTabuList.h\end{CompactItemize} +mo\-Simple\-Solution\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex index e573dca89..789edbc89 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_sol_continue.tex @@ -1,11 +1,11 @@ -\section{moSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Sol\-Continue$<$ EOT $>$ Class Template Reference} \label{classmo_sol_continue}\index{moSolContinue@{moSolContinue}} Class that describes a stop criterion for a solution-based heuristic. -{\tt \#include $<$moSolContinue.h$>$} +{\tt \#include $<$mo\-Sol\-Continue.h$>$} -Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2.70531cm]{classmo_sol_continue} @@ -14,33 +14,33 @@ Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf init} ()=0 +virtual void \bf{init} ()=0 \begin{CompactList}\small\item\em Procedure which initialises all that the stop criterion needs. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class moSolContinue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Sol\-Continue$<$ EOT $>$} Class that describes a stop criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}). +It allows to add an initialisation procedure to an object that is a unary function (\doxyref{eo\-UF}). -Definition at line 22 of file moSolContinue.h. +Definition at line 47 of file mo\-Sol\-Continue.h. \subsection{Member Function Documentation} -\index{moSolContinue@{moSolContinue}!init@{init}} -\index{init@{init}!moSolContinue@{moSolContinue}} -\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} +\index{moSolContinue@{mo\-Sol\-Continue}!init@{init}} +\index{init@{init}!moSolContinue@{mo\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void \bf{mo\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7} Procedure which initialises all that the stop criterion needs. Generally, it allocates some data structures or initialises some counters. -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}. +Implemented in \bf{mo\-Fit\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_fit_sol_continue_670bd895b4edfcd3aebb40d2295d7f7c}, \bf{mo\-Gen\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}, \bf{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_no_fit_impr_sol_continue_21641c0a38a4501baae6133cbc591de4}, and \bf{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSolContinue.h\end{CompactItemize} +mo\-Sol\-Continue.h\end{CompactItemize} 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 index 217779653..8d2662a21 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_steady_fit_sol_continue.tex @@ -1,11 +1,11 @@ -\section{moSteadyFitSolContinue$<$ EOT $>$ Class Template Reference} +\section{mo\-Steady\-Fit\-Sol\-Continue$<$ 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$>$} +{\tt \#include $<$mo\-Steady\-Fit\-Sol\-Continue.h$>$} -Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_steady_fit_sol_continue} @@ -14,43 +14,43 @@ Inheritance diagram for moSteadyFitSolContinue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Types} \begin{CompactItemize} \item -typedef EOT::Fitness {\bf Fitness}\label{classmo_steady_fit_sol_continue_c289721abbbafe50f6e3b8305dd31007} +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 \_\-\_\-maxNumberOfIterationWithoutImprovement) +\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int \_\-\_\-max\-Number\-Of\-Iterations, unsigned int \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement) \begin{CompactList}\small\item\em Basic constructor. \item\end{CompactList}\item -bool {\bf operator()} (const EOT \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} that activates the stopping criterion. \item\end{CompactList}\item -void {\bf init} () +bool \bf{operator()} (const EOT \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} that activates the stopping criterion. \item\end{CompactList}\item +void \bf{init} () \begin{CompactList}\small\item\em Procedure which allows to initialise the stuff needed. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned int {\bf maxNumberOfIterations}\label{classmo_steady_fit_sol_continue_36b43c2a252887ad027165ac32393fe8} +unsigned int \bf{max\-Number\-Of\-Iterations}\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 maxNumberOfIterationsWithoutImprovement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40} +unsigned int \bf{max\-Number\-Of\-Iterations\-Without\-Improvement}\label{classmo_steady_fit_sol_continue_cde593c09f497a5fa66ff62732544f40} \begin{CompactList}\small\item\em Maximum number of iterations without improvement allowed. \item\end{CompactList}\item -bool {\bf maxNumberOfIterationsReached}\label{classmo_steady_fit_sol_continue_7d88c0eb91b2a12121ba1c3ae9139887} +bool \bf{max\-Number\-Of\-Iterations\-Reached}\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 indicates that the max\-Number\-Iteration have been reached. \item\end{CompactList}\item +bool \bf{first\-Fitness\-Saved}\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} +\bf{Fitness} \bf{fitness}\label{classmo_steady_fit_sol_continue_a5c62e7049b36f6e71e92b559568c09e} \begin{CompactList}\small\item\em Current Fitness. \item\end{CompactList}\item -unsigned int {\bf counter}\label{classmo_steady_fit_sol_continue_245c9099a2c40dfc4f34b3ff216d13ce} +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 $>$} +\subsubsection*{template$<$class EOT$>$ class mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$} One possible stopping criterion for a solution-based heuristic. @@ -58,12 +58,12 @@ The stop criterion corresponds to a maximum number of iterations without improve -Definition at line 21 of file moSteadyFitSolContinue.h. +Definition at line 46 of file mo\-Steady\-Fit\-Sol\-Continue.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 \_\-\_\-maxNumberOfIterationWithoutImprovement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_5f50fb18e380230e37301f33319786a4} +\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} +\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::\bf{mo\-Steady\-Fit\-Sol\-Continue} (unsigned int {\em \_\-\_\-max\-Number\-Of\-Iterations}, unsigned int {\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement})\hspace{0.3cm}{\tt [inline]}}\label{classmo_steady_fit_sol_continue_5f50fb18e380230e37301f33319786a4} Basic constructor. @@ -71,19 +71,19 @@ Basic constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-maxNumberOfIterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-maxNumberOfIterationWithoutImprovement}]The number of iterations without fitness improvement to reach for stop. \end{description} +\item[{\em \_\-\_\-max\-Number\-Of\-Iterations}]The number of iterations to reach before looking for the fitness. \item[{\em \_\-\_\-max\-Number\-Of\-Iteration\-Without\-Improvement}]The number of iterations without fitness improvement to reach for stop. \end{description} \end{Desc} -Definition at line 34 of file moSteadyFitSolContinue.h. +Definition at line 59 of file mo\-Steady\-Fit\-Sol\-Continue.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} +\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!operator()@{operator()}} +\index{operator()@{operator()}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_942e58ec00bb61000a83c80176e14bc3} -{\bf Function} that activates the stopping criterion. +\doxyref{Function} that activates the stopping criterion. Indicates if the fitness has not been improved since a number of iterations (after a minimum of iterations). @@ -96,25 +96,25 @@ Indicates if the fitness has not been improved since a number of iterations (aft \item[Returns:]true or false. \end{Desc} -Implements {\bf eoUF$<$ const EOT \&, bool $>$}. +Implements \bf{eo\-UF$<$ const EOT \&, bool $>$}. -Definition at line 46 of file moSteadyFitSolContinue.h. +Definition at line 71 of file mo\-Steady\-Fit\-Sol\-Continue.h. -References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, moSteadyFitSolContinue$<$ EOT $>$::fitness, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterations, moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsWithoutImprovement.\index{moSteadyFitSolContinue@{moSteadyFitSolContinue}!init@{init}} -\index{init@{init}!moSteadyFitSolContinue@{moSteadyFitSolContinue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moSteadyFitSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} +References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::fitness, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Without\-Improvement.\index{moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}!init@{init}} +\index{init@{init}!moSteadyFitSolContinue@{mo\-Steady\-Fit\-Sol\-Continue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void \bf{mo\-Steady\-Fit\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_steady_fit_sol_continue_87563493addc8e4b58982c55a67179b9} Procedure which allows to initialise the stuff needed. It can be also used to reinitialize the counter all the needed things. -Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements \bf{mo\-Sol\-Continue$<$ EOT $>$} \doxyref{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 90 of file moSteadyFitSolContinue.h. +Definition at line 115 of file mo\-Steady\-Fit\-Sol\-Continue.h. -References moSteadyFitSolContinue$<$ EOT $>$::counter, moSteadyFitSolContinue$<$ EOT $>$::firstFitnessSaved, and moSteadyFitSolContinue$<$ EOT $>$::maxNumberOfIterationsReached. +References mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::counter, mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::first\-Fitness\-Saved, and mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$::max\-Number\-Of\-Iterations\-Reached. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moSteadyFitSolContinue.h\end{CompactItemize} +mo\-Steady\-Fit\-Sol\-Continue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex index d548f3f3a..fcfef71f7 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s.tex @@ -1,11 +1,11 @@ -\section{moTS$<$ M $>$ Class Template Reference} +\section{mo\-TS$<$ M $>$ Class Template Reference} \label{classmo_t_s}\index{moTS@{moTS}} Tabu Search (TS). -{\tt \#include $<$moTS.h$>$} +{\tt \#include $<$mo\-TS.h$>$} -Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_t_s} @@ -14,37 +14,37 @@ Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) -\begin{CompactList}\small\item\em Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item +\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \&\_\-\_\-cont, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item -bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) -\begin{CompactList}\small\item\em {\bf Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} +bool \bf{operator()} (\bf{EOT} \&\_\-\_\-sol) +\begin{CompactList}\small\item\em \doxyref{Function} which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1} +typedef M::EOType \bf{EOT}\label{classmo_t_s_90d19d468c12ab5bd796948ce1ce79b1} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca} +typedef EOT::Fitness \bf{Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f876fca} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865} +\bf{mo\-Move\-Expl}$<$ M $>$ \& \bf{move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} +\bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& \bf{cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} +\bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& \bf{full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTS$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-TS$<$ M $>$} Tabu Search (TS). @@ -52,17 +52,17 @@ Generic algorithm that describes a tabu search. -Definition at line 29 of file moTS.h. +Definition at line 54 of file mo\-TS.h. \subsection{Constructor \& Destructor Documentation} -\index{moTS@{moTS}!moTS@{moTS}} -\index{moTS@{moTS}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} +\index{moTS@{mo\-TS}!moTS@{moTS}} +\index{moTS@{moTS}!moTS@{mo\-TS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} -Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. +Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. -In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} is instanciated. +In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} is instanciated. \begin{Desc} \item[Parameters:] @@ -71,9 +71,9 @@ In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl \end{Desc} -Definition at line 58 of file moTS.h.\index{moTS@{moTS}!moTS@{moTS}} -\index{moTS@{moTS}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +Definition at line 83 of file mo\-TS.h.\index{moTS@{mo\-TS}!moTS@{moTS}} +\index{moTS@{moTS}!moTS@{mo\-TS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TS}$<$ M $>$::\bf{mo\-TS} (\bf{mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, \bf{mo\-Sol\-Continue}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-cont}, \bf{eo\-Eval\-Func}$<$ \bf{EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -83,21 +83,21 @@ The explorer is given in the parameters. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description} +\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description} \end{Desc} -Definition at line 71 of file moTS.h. +Definition at line 96 of file mo\-TS.h. \subsection{Member Function Documentation} -\index{moTS@{moTS}!operator()@{operator()}} -\index{operator()@{operator()}!moTS@{moTS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moTS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} +\index{moTS@{mo\-TS}!operator()@{operator()}} +\index{operator()@{operator()}!moTS@{mo\-TS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool \bf{mo\-TS}$<$ M $>$::operator() (\bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} -{\bf Function} which launchs the Tabu Search. +\doxyref{Function} which launchs the Tabu Search. -Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm. +Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm. \begin{Desc} \item[Parameters:] @@ -108,12 +108,12 @@ Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref \item[Returns:]TRUE. \end{Desc} -Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. +Implements \bf{eo\-UF$<$ M::EOType \&, bool $>$}. -Definition at line 85 of file moTS.h. +Definition at line 110 of file mo\-TS.h. -References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, and moTS$<$ M $>$::move\_\-expl. +References mo\-TS$<$ M $>$::cont, mo\-TS$<$ M $>$::full\_\-eval, and mo\-TS$<$ M $>$::move\_\-expl. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moTS.h\end{CompactItemize} +mo\-TS.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex index 2a5d367c6..34402231d 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_t_s_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{moTSMoveLoopExpl$<$ M $>$ Class Template Reference} +\section{mo\-TSMove\-Loop\-Expl$<$ M $>$ Class Template Reference} \label{classmo_t_s_move_loop_expl}\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}} Explorer for a Tabu Search algorithm. -{\tt \#include $<$moTSMoveLoopExpl.h$>$} +{\tt \#include $<$mo\-TSMove\-Loop\-Expl.h$>$} -Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_t_s_move_loop_expl} @@ -14,57 +14,57 @@ Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit) +\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, \bf{mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, \bf{mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, \bf{mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item -void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol) +void \bf{operator()} (const \bf{EOT} \&\_\-\_\-old\_\-sol, \bf{EOT} \&\_\-\_\-new\_\-sol) \begin{CompactList}\small\item\em Procedure which lauches the exploration. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527} +typedef M::EOType \bf{EOT}\label{classmo_t_s_move_loop_expl_47f42225e2ed096374b818bdb848a527} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\item -typedef M::EOType::Fitness {\bf Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018} +typedef M::EOType::Fitness \bf{Fitness}\label{classmo_t_s_move_loop_expl_a1ba36c937b195ca2f7d1a24adaa7018} \begin{CompactList}\small\item\em Alias for the fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400} +\bf{mo\-Move\-Init}$<$ M $>$ \& \bf{move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400} \begin{CompactList}\small\item\em Move initialisation. \item\end{CompactList}\item -{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49} +\bf{mo\-Next\-Move}$<$ M $>$ \& \bf{next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c} +\bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& \bf{incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c} \begin{CompactList}\small\item\em Efficient evaluation. \item\end{CompactList}\item -{\bf moBestImprSelect}$<$ M $>$ {\bf move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1} +\bf{mo\-Best\-Impr\-Select}$<$ M $>$ \bf{move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1} \begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\item -{\bf moTabuList}$<$ M $>$ \& {\bf tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790} +\bf{mo\-Tabu\-List}$<$ M $>$ \& \bf{tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790} \begin{CompactList}\small\item\em Tabu list. \item\end{CompactList}\item -{\bf moAspirCrit}$<$ M $>$ \& {\bf aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f} +\bf{mo\-Aspir\-Crit}$<$ M $>$ \& \bf{aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f} \begin{CompactList}\small\item\em Aspiration criterion. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTSMoveLoopExpl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-TSMove\-Loop\-Expl$<$ M $>$} Explorer for a Tabu Search algorithm. -It is used by a \doxyref{moTS}{p.}{classmo_t_s}. +It is used by a \doxyref{mo\-TS}{p.}{classmo_t_s}. -Definition at line 30 of file moTSMoveLoopExpl.h. +Definition at line 55 of file mo\-TSMove\-Loop\-Expl.h. \subsection{Constructor \& Destructor Documentation} -\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTSMoveLoopExpl}$<$ M $>$::{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381} +\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} +\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::\bf{mo\-TSMove\-Loop\-Expl} (\bf{mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, \bf{mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, \bf{mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, \bf{mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, \bf{mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381} Constructor. @@ -76,14 +76,14 @@ Constructor. \end{Desc} -Definition at line 49 of file moTSMoveLoopExpl.h. +Definition at line 74 of file mo\-TSMove\-Loop\-Expl.h. -References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. +References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. \subsection{Member Function Documentation} -\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!operator()@{operator()}} -\index{operator()@{operator()}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moTSMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} +\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}} +\index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void \bf{mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const \bf{EOT} \& {\em \_\-\_\-old\_\-sol}, \bf{EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,12 +97,12 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} -Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Implements \bf{eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. -Definition at line 69 of file moTSMoveLoopExpl.h. +Definition at line 94 of file mo\-TSMove\-Loop\-Expl.h. -References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, moTSMoveLoopExpl$<$ M $>$::incr\_\-eval, moTSMoveLoopExpl$<$ M $>$::move\_\-init, moTSMoveLoopExpl$<$ M $>$::move\_\-select, moTSMoveLoopExpl$<$ M $>$::next\_\-move, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. +References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, mo\-TSMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-select, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moTSMoveLoopExpl.h\end{CompactItemize} +mo\-TSMove\-Loop\-Expl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps index 2aee2f1b6..43c125a8a 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps +++ b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 138.889 +%%BoundingBox: 0 0 500 200 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 3.6 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moTabuList< M >) cw -(eoBF< const M &, const M::EOType &, bool >) cw +(eoBF< A1, A2, R >) cw (eoFunctorBase) cw (moSimpleMoveTabuList< M >) cw (moSimpleSolutionTabuList< M >) cw @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moTabuList< M >) 0.5 1 box - (eoBF< const M &, const M::EOType &, bool >) 0.5 2 box + (eoBF< A1, A2, R >) 0.5 2 box (eoFunctorBase) 0.5 3 box (moSimpleMoveTabuList< M >) 0 0 box (moSimpleSolutionTabuList< M >) 1 0 box diff --git a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex index 1ed7c1b47..7163fdf47 100644 --- a/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/doc/latex/classmo_tabu_list.tex @@ -1,48 +1,48 @@ -\section{moTabuList$<$ M $>$ Class Template Reference} +\section{mo\-Tabu\-List$<$ M $>$ Class Template Reference} \label{classmo_tabu_list}\index{moTabuList@{moTabuList}} -Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. +Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. -{\tt \#include $<$moTabuList.h$>$} +{\tt \#include $<$mo\-Tabu\-List.h$>$} -Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H] +Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=3.88889cm]{classmo_tabu_list} +\includegraphics[height=4cm]{classmo_tabu_list} \end{center} \end{figure} \subsection*{Public Types} \begin{CompactItemize} \item -typedef M::EOType {\bf EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df} +typedef M::EOType \bf{EOT}\label{classmo_tabu_list_e219715cc3fdd5626764bc50ce6357df} \begin{CompactList}\small\item\em Alias for the type. \item\end{CompactList}\end{CompactItemize} \subsection*{Public Member Functions} \begin{CompactItemize} \item -virtual void {\bf add} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol)=0 +virtual void \bf{add} (const M \&\_\-\_\-move, const \bf{EOT} \&\_\-\_\-sol)=0 \begin{CompactList}\small\item\em Procedure to add a move in the tabu list. \item\end{CompactList}\item -virtual void {\bf update} ()=0 +virtual void \bf{update} ()=0 \begin{CompactList}\small\item\em Procedure that updates the tabu list content. \item\end{CompactList}\item -virtual void {\bf init} ()=0 +virtual void \bf{init} ()=0 \begin{CompactList}\small\item\em Procedure which initialises the tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class moTabuList$<$ M $>$} +\subsubsection*{template$<$class M$>$ class mo\-Tabu\-List$<$ M $>$} -Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. +Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. -It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{moTS}{p.}{classmo_t_s}. +It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. -Definition at line 22 of file moTabuList.h. +Definition at line 47 of file mo\-Tabu\-List.h. \subsection{Member Function Documentation} -\index{moTabuList@{moTabuList}!add@{add}} -\index{add@{add}!moTabuList@{moTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286} +\index{moTabuList@{mo\-Tabu\-List}!add@{add}} +\index{add@{add}!moTabuList@{mo\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const \bf{EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286} Procedure to add a move in the tabu list. @@ -56,26 +56,26 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{moTabuList}!update@{update}} -\index{update@{update}!moTabuList@{moTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} +Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{mo\-Tabu\-List}!update@{update}} +\index{update@{update}!moTabuList@{mo\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{moTabuList}!init@{init}} -\index{init@{init}!moTabuList@{moTabuList}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} +Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}, and \bf{Two\-Opt\-Tabu\-List} \doxyref{p.}{class_two_opt_tabu_list_c460034b7debe7198c6df046855155da}.\index{moTabuList@{mo\-Tabu\-List}!init@{init}} +\index{init@{init}!moTabuList@{mo\-Tabu\-List}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void \bf{mo\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. +Implemented in \bf{mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, \bf{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}, and \bf{Two\-Opt\-Tabu\-List} \doxyref{p.}{class_two_opt_tabu_list_2d3101e6045700b0e32f5e82672a175e}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -moTabuList.h\end{CompactItemize} +mo\-Tabu\-List.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/doxygen.sty b/trunk/paradiseo-mo/doc/latex/doxygen.sty index cff826bea..cb8fbc06b 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 Tue Sep 25 16:25:46 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 25 16:25:46 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Mon Oct 8 09:55:33 2007 for Paradis\-EO-MOMoving\-Objects by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Mon Oct 8 09:55:33 2007 for Paradis\-EO-MOMoving\-Objects 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 a8e65d556..738bc76e3 100644 --- a/trunk/paradiseo-mo/doc/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/doc/latex/hierarchy.tex @@ -1,99 +1,138 @@ -\section{PARADISEO-MO Class Hierarchy} +\section{Paradis\-EO-MOMoving\-Objects Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} -\item \contentsline{section}{EmptySelection}{\pageref{class_empty_selection}}{} -\item eoFunctorBase{\tt [external]}\begin{CompactList} -\item eoBF$<$ const EOT \&, const EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moComparator$<$ EOT $>$}{\pageref{classmo_comparator}}{} +\item \contentsline{section}{Empty\-Selection}{\pageref{class_empty_selection}}{} +\item eo\-Functor\-Base{\tt [external]}\begin{CompactList} +\item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \begin{CompactList} -\item \contentsline{section}{moFitComparator$<$ EOT $>$}{\pageref{classmo_fit_comparator}}{} +\item \contentsline{section}{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} +\item \contentsline{section}{mo\-No\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} +\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} +\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ Two\-Opt $>$}{\pageref{classmo_move_incr_eval}}{} \begin{CompactList} -\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} -\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} +\item \contentsline{section}{Two\-Opt\-Incr\-Eval}{\pageref{class_two_opt_incr_eval}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, M::EOType::Fitness $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} -\end{CompactList} -\item eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moAspirCrit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} +\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{} +\item \contentsline{section}{mo\-Move\-Init$<$ Two\-Opt $>$}{\pageref{classmo_move_init}}{} \begin{CompactList} -\item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} +\item \contentsline{section}{Part\-Two\-Opt\-Init}{\pageref{class_part_two_opt_init}}{} +\item \contentsline{section}{Two\-Opt\-Init}{\pageref{class_two_opt_init}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{} +\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{} \begin{CompactList} -\item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} +\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\end{CompactList} +\item \contentsline{section}{mo\-Next\-Move$<$ Two\-Opt $>$}{\pageref{classmo_next_move}}{} \begin{CompactList} -\item \contentsline{section}{moHCMoveLoopExpl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{} -\item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} +\item \contentsline{section}{Part\-Two\-Opt\-Next}{\pageref{class_part_two_opt_next}}{} +\item \contentsline{section}{Two\-Opt\-Next}{\pageref{class_two_opt_next}}{} \end{CompactList} -\end{CompactList} -\end{CompactList} -\item eoBF$<$ M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{} +\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} \begin{CompactList} -\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} +\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} \end{CompactList} -\end{CompactList} -\item eoBF$<$ M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveInit$<$ M $>$}{\pageref{classmo_move_init}}{} -\end{CompactList} -\item eoBF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMoveSelect$<$ M $>$}{\pageref{classmo_move_select}}{} +\item \contentsline{section}{mo\-Tabu\-List$<$ Two\-Opt $>$}{\pageref{classmo_tabu_list}}{} \begin{CompactList} -\item \contentsline{section}{moBestImprSelect$<$ M $>$}{\pageref{classmo_best_impr_select}}{} -\item \contentsline{section}{moFirstImprSelect$<$ M $>$}{\pageref{classmo_first_impr_select}}{} -\item \contentsline{section}{moRandImprSelect$<$ M $>$}{\pageref{classmo_rand_impr_select}}{} +\item \contentsline{section}{Two\-Opt\-Tabu\-List}{\pageref{class_two_opt_tabu_list}}{} \end{CompactList} \end{CompactList} -\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} +\item eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{} \begin{CompactList} -\item \contentsline{section}{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} -\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{} +\item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} \begin{CompactList} -\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{} -\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{} +\item \contentsline{section}{mo\-HCMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{} +\item \contentsline{section}{mo\-TSMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} \end{CompactList} \end{CompactList} -\item eoUF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ EOT $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\end{CompactList} +\item eo\-BF$<$ EOType \&, EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Quad\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{Edge\-Xover}{\pageref{class_edge_xover}}{} +\item \contentsline{section}{Order\-Xover}{\pageref{class_order_xover}}{} +\item \contentsline{section}{Partial\-Mapped\-Xover}{\pageref{class_partial_mapped_xover}}{} \end{CompactList} \end{CompactList} -\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{} -\end{CompactList} -\item eoUF$<$ EOType \&, bool $>${\tt [external]}\item eoUF$<$ M \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{} -\end{CompactList} -\item eoUF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ M::EOType $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\item eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move\-Select$<$ M $>$}{\pageref{classmo_move_select}}{} \begin{CompactList} -\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{moILS$<$ M $>$}{\pageref{classmo_i_l_s}}{} -\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{} -\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{} +\item \contentsline{section}{mo\-Best\-Impr\-Select$<$ M $>$}{\pageref{classmo_best_impr_select}}{} +\item \contentsline{section}{mo\-First\-Impr\-Select$<$ M $>$}{\pageref{classmo_first_impr_select}}{} +\item \contentsline{section}{mo\-Rand\-Impr\-Select$<$ M $>$}{\pageref{classmo_rand_impr_select}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ A1, R $>${\tt [external]}\begin{CompactList} +\item eo\-Eval\-Func$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{Part\-Route\-Eval}{\pageref{class_part_route_eval}}{} +\item \contentsline{section}{Route\-Eval}{\pageref{class_route_eval}}{} +\end{CompactList} +\item eo\-Init$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{Route\-Init}{\pageref{class_route_init}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_fit_sol_continue}}{} +\item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} +\item \contentsline{section}{mo\-No\-Fit\-Impr\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_no_fit_impr_sol_continue}}{} +\item \contentsline{section}{mo\-Steady\-Fit\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_steady_fit_sol_continue}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{} +\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} +\begin{CompactList} +\item \contentsline{section}{Two\-Opt}{\pageref{class_two_opt}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{City\-Swap}{\pageref{class_city_swap}}{} +\end{CompactList} +\end{CompactList} +\item eo\-UF$<$ eo\-Vector$<$ float, unsigned int $>$ \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Move$<$ eo\-Vector$<$ float, unsigned int $>$ $>$}{\pageref{classmo_move}}{} +\end{CompactList} +\item eo\-UF$<$ M \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} +\end{CompactList} +\item eo\-UF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\begin{CompactList} +\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} +\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} \end{CompactList} \end{CompactList} \end{CompactList} +\item eo\-UF$<$ Two\-Opt \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{mo\-Rand\-Move$<$ Two\-Opt $>$}{\pageref{classmo_rand_move}}{} +\begin{CompactList} +\item \contentsline{section}{Two\-Opt\-Rand}{\pageref{class_two_opt_rand}}{} +\end{CompactList} +\end{CompactList} +\end{CompactList} +\item eo\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} +\item eo\-Mon\-Op$<$ EOType $>${\tt [external]}\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\item eo\-Quad\-Op$<$ EOType $>${\tt [external]}\end{CompactList} +\item eo\-Printable{\tt [external]}\begin{CompactList} +\item eo\-Persistent{\tt [external]}\begin{CompactList} +\item \contentsline{section}{Two\-Opt}{\pageref{class_two_opt}}{} +\end{CompactList} \end{CompactList} -\item eoOp$<$ EOType $>${\tt [external]}\begin{CompactList} -\item eoMonOp$<$ EOT $>${\tt [external]}\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/main.tex b/trunk/paradiseo-mo/doc/latex/main.tex index 8aed09f85..db32f5c4f 100644 --- a/trunk/paradiseo-mo/doc/latex/main.tex +++ b/trunk/paradiseo-mo/doc/latex/main.tex @@ -1,5 +1,5 @@ \section{Introduction}\label{main_Introduction} -MO is an extension of the ANSI-C++ compliant evolutionary computation library {\bf EO}. \par +MO is an extension of the ANSI-C++ compliant evolutionary computation library \doxyref{EO}. \par It contains classes for almost any kind of one solution based heuristics.\section{AUTHORS}\label{main_authors} \begin{TabularC}{1} \hline @@ -7,6 +7,12 @@ Sebastien CAHON \\\hline {\tt Jean-Charles BOISSON} \\\hline \end{TabularC} \section{LICENCE}\label{main_LICENCE} -\section{Home Page}\label{main_Paradiseo} +This software is governed by the Ce\-CILL license under French law and abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the Ce\-CILL license as circulated by CEA, CNRS and INRIA at the following URL \char`\"{}http://www.cecill.info\char`\"{}. + +As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability. + +In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security. The fact that you are presently reading this means that you have had knowledge of the Ce\-CILL license and that you accept its terms. + +Paradis\-EO Web\-Site : \tt{http://paradiseo.gforge.inria.fr} Contact: \tt{paradiseo-help@lists.gforge.inria.fr}\section{Home Page}\label{main_Paradiseo} {\tt http://paradiseo.gforge.inria.fr}\section{Installation}\label{main_Installation} The installation procedure of the package is detailed in the {\tt README} file in the top-directory of the source-tree. \ No newline at end of file diff --git a/trunk/paradiseo-mo/doc/latex/namespace_graph.tex b/trunk/paradiseo-mo/doc/latex/namespace_graph.tex index c4e7f4315..990617089 100644 --- a/trunk/paradiseo-mo/doc/latex/namespace_graph.tex +++ b/trunk/paradiseo-mo/doc/latex/namespace_graph.tex @@ -5,24 +5,24 @@ \subsection*{Functions} \begin{CompactItemize} \item -unsigned {\bf size} ()\label{namespace_graph_28d00fd97d57e79738e7df7ba8214f5c} +unsigned \bf{size} ()\label{namespace_graph_28d00fd97d57e79738e7df7ba8214f5c} \item -void {\bf computeDistances} ()\label{namespace_graph_517d15215e1529a6585e15949f29c326} +void \bf{compute\-Distances} ()\label{namespace_graph_517d15215e1529a6585e15949f29c326} \item -void {\bf load} (const char $\ast$\_\-\_\-fileName)\label{namespace_graph_95f0bc08fa93f8f4abf1801674488b30} +void \bf{load} (const char $\ast$\_\-\_\-file\-Name)\label{namespace_graph_95f0bc08fa93f8f4abf1801674488b30} \item -float {\bf distance} (unsigned int \_\-\_\-from, unsigned int \_\-\_\-to)\label{namespace_graph_510a8b9e849ec2c3241a09cac9d45cc6} +float \bf{distance} (unsigned int \_\-\_\-from, unsigned int \_\-\_\-to)\label{namespace_graph_510a8b9e849ec2c3241a09cac9d45cc6} \end{CompactItemize} \subsection*{Variables} \begin{CompactItemize} \item -static std::vector$<$ std::pair$<$ double, double $>$ $>$ {\bf vectCoord}\label{namespace_graph_4199f2387f0cda6c75804c94b635e24c} +static std::vector$<$ std::pair$<$ double, double $>$ $>$ \bf{vect\-Coord}\label{namespace_graph_4199f2387f0cda6c75804c94b635e24c} \item -static std::vector$<$ std::vector$<$ unsigned int $>$ $>$ {\bf dist}\label{namespace_graph_c1316f71ab101e1f63eecd81a8d7a400} +static std::vector$<$ std::vector$<$ unsigned int $>$ $>$ \bf{dist}\label{namespace_graph_c1316f71ab101e1f63eecd81a8d7a400} \end{CompactItemize} diff --git a/trunk/paradiseo-mo/doc/latex/namespaces.tex b/trunk/paradiseo-mo/doc/latex/namespaces.tex index dda2d6978..39a4c19f3 100644 --- a/trunk/paradiseo-mo/doc/latex/namespaces.tex +++ b/trunk/paradiseo-mo/doc/latex/namespaces.tex @@ -1,4 +1,4 @@ -\section{ParadisEO-MOMovingObjects Namespace List} +\section{Paradis\-EO-MOMoving\-Objects Namespace List} Here is a list of all documented namespaces with brief descriptions:\begin{CompactList} -\item\contentsline{section}{{\bf Graph} }{\pageref{namespace_graph}}{} +\item\contentsline{section}{\bf{Graph} }{\pageref{namespace_graph}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/doc/latex/refman.tex b/trunk/paradiseo-mo/doc/latex/refman.tex index e45c14d62..579ebce65 100644 --- a/trunk/paradiseo-mo/doc/latex/refman.tex +++ b/trunk/paradiseo-mo/doc/latex/refman.tex @@ -7,7 +7,6 @@ \usepackage{float} \usepackage{textcomp} \usepackage{alltt} -\usepackage[utf8]{inputenc} \usepackage{doxygen} \makeindex \setcounter{tocdepth}{1} @@ -16,11 +15,11 @@ \begin{titlepage} \vspace*{7cm} \begin{center} -{\Large PARADISEO-MO Reference Manual\\[1ex]\large 0.1 }\\ +{\Large Paradis\-EO-MOMoving\-Objects Reference Manual\\[1ex]\large 1.0 }\\ \vspace*{1cm} -{\large Generated by Doxygen 1.5.2}\\ +{\large Generated by Doxygen 1.4.7}\\ \vspace*{0.5cm} -{\small Tue Sep 25 16:25:46 2007}\\ +{\small Mon Oct 8 09:55:33 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage @@ -30,25 +29,28 @@ \pagenumbering{arabic} \chapter{Welcome to PARADISEO-Moving Objects } \label{index}\input{main} -\chapter{PARADISEO-MO Hierarchical Index} +\chapter{Paradis\-EO-MOMoving\-Objects Namespace Index} +\input{namespaces} +\chapter{Paradis\-EO-MOMoving\-Objects Hierarchical Index} \input{hierarchy} -\chapter{PARADISEO-MO Class Index} +\chapter{Paradis\-EO-MOMoving\-Objects Class Index} \input{annotated} -\chapter{PARADISEO-MO Class Documentation} -\input{class_empty_selection} +\chapter{Paradis\-EO-MOMoving\-Objects Namespace Documentation} +\input{namespace_graph} +\chapter{Paradis\-EO-MOMoving\-Objects Class Documentation} +\input{class_city_swap} +\include{class_edge_xover} +\include{class_empty_selection} \include{classmo_algo} \include{classmo_aspir_crit} \include{classmo_best_impr_select} -\include{classmo_comparator} \include{classmo_cooling_schedule} \include{classmo_exponential_cooling_schedule} \include{classmo_first_impr_select} -\include{classmo_fit_comparator} \include{classmo_fit_sol_continue} \include{classmo_gen_sol_continue} \include{classmo_h_c} \include{classmo_h_c_move_loop_expl} -\include{classmo_i_l_s} \include{classmo_impr_best_fit_aspir_crit} \include{classmo_it_rand_next_move} \include{classmo_linear_cooling_schedule} @@ -72,5 +74,18 @@ \include{classmo_tabu_list} \include{classmo_t_s} \include{classmo_t_s_move_loop_expl} +\include{class_order_xover} +\include{class_partial_mapped_xover} +\include{class_part_route_eval} +\include{class_part_two_opt_init} +\include{class_part_two_opt_next} +\include{class_route_eval} +\include{class_route_init} +\include{class_two_opt} +\include{class_two_opt_incr_eval} +\include{class_two_opt_init} +\include{class_two_opt_next} +\include{class_two_opt_rand} +\include{class_two_opt_tabu_list} \printindex \end{document} diff --git a/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/doc/man/man3/EmptySelection.3 index c6bde461f..9bdabbe28 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,8 +16,8 @@ Special class that describes the case of no selection. This class is used as an exception that can be thrown if a solution selector has completly failed. .PP -Definition at line 21 of file moMoveSelect.h. +Definition at line 46 of file moMoveSelect.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 b/trunk/paradiseo-mo/doc/man/man3/moAlgo.3 index 4dd81ad69..67c2cc3d5 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -20,8 +20,8 @@ Description of an algorithm of the paradiseo-mo library. \fBmoHC\fP, \fBmoTS\fP and \fBmoSA\fP are 3 examples of algorithm of the paradiseo-mo library. .PP -Definition at line 21 of file moAlgo.h. +Definition at line 46 of file moAlgo.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moAspirCrit.3 index 286b4a21f..3ee849ebc 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType::Fitness &, bool >\fP. .PP Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .PP @@ -30,7 +30,7 @@ Description of the conditions in which a tabu move could be accepted. It is only a description... An object that herits from this class is needed to be used in a \fBmoTS\fP. See moNoAspriCrit for example. .PP -Definition at line 22 of file moAspirCrit.h. +Definition at line 47 of file moAspirCrit.h. .SH "Member Function Documentation" .PP .SS "template virtual void \fBmoAspirCrit\fP< M >::init ()\fC [pure virtual]\fP" @@ -43,4 +43,4 @@ Implemented in \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moBestImprSelect.3 index a1edfe69a..87b579fe9 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -60,7 +60,7 @@ One of the possible \fBmoMoveSelect\fP. All neighbors are considered, and the movement which enables the best improvement is selected. .PP -Definition at line 22 of file moBestImprSelect.h. +Definition at line 47 of file moBestImprSelect.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoBestImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" @@ -85,7 +85,7 @@ TRUE if the move does not improve the fitness. .PP Implements \fBmoMoveSelect< M >\fP. .PP -Definition at line 47 of file moBestImprSelect.h. +Definition at line 72 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. .SS "template void \fBmoBestImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" @@ -108,10 +108,10 @@ Procedure which saved the best move and fitness. .PP Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP -Definition at line 68 of file moBestImprSelect.h. +Definition at line 93 of file moBestImprSelect.h. .PP References moBestImprSelect< M >::best_fit, moBestImprSelect< M >::best_move, and moBestImprSelect< M >::first_time. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moCoolingSchedule.3 index 34ed0e61a..1f2c670fb 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -20,8 +20,8 @@ This class gives the description of a cooling schedule. It is only a description... An object that herits from this class is needed to be used in a \fBmoSA\fP. See \fBmoExponentialCoolingSchedule\fP or \fBmoLinearCoolingSchedule\fP for example. .PP -Definition at line 22 of file moCoolingSchedule.h. +Definition at line 47 of file moCoolingSchedule.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moExponentialCoolingSchedule.3 index a3188b4d9..cc336ef48 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -42,7 +42,7 @@ One of the possible \fBmoCoolingSchedule\fP. An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold. .PP -Definition at line 22 of file moExponentialCoolingSchedule.h. +Definition at line 47 of file moExponentialCoolingSchedule.h. .SH "Constructor & Destructor Documentation" .PP .SS "moExponentialCoolingSchedule::moExponentialCoolingSchedule (double __threshold, double __ratio)\fC [inline]\fP" @@ -58,7 +58,7 @@ Simple constructor. .PP .PP -Definition at line 31 of file moExponentialCoolingSchedule.h. +Definition at line 56 of file moExponentialCoolingSchedule.h. .SH "Member Function Documentation" .PP .SS "bool moExponentialCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" @@ -81,10 +81,10 @@ if the new temperature (current temperature * ratio) is greater than the thresho .PP Implements \fBeoUF< double &, bool >\fP. .PP -Definition at line 41 of file moExponentialCoolingSchedule.h. +Definition at line 66 of file moExponentialCoolingSchedule.h. .PP References ratio, and threshold. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moFirstImprSelect.3 index 6a11400c7..a7b95c973 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -64,7 +64,7 @@ One possible \fBmoMoveSelect\fP. The neighborhood is explored until a move enables an improvment of the current solution. .PP -Definition at line 23 of file moFirstImprSelect.h. +Definition at line 48 of file moFirstImprSelect.h. .SH "Member Function Documentation" .PP .SS "template virtual void \fBmoFirstImprSelect\fP< M >::init (const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" @@ -75,7 +75,7 @@ It save the current fitness as the initial value for the fitness. .PP Implements \fBmoMoveSelect< M >\fP. .PP -Definition at line 35 of file moFirstImprSelect.h. +Definition at line 60 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. .SS "template bool \fBmoFirstImprSelect\fP< M >::update (const M & __move, const typename M::EOType::Fitness & __fit)\fC [inline]\fP" @@ -98,7 +98,7 @@ TRUE if the move does not improve the fitness. .PP .PP -Definition at line 52 of file moFirstImprSelect.h. +Definition at line 77 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, moFirstImprSelect< M >::init_fit, and moFirstImprSelect< M >::valid. .SS "template void \fBmoFirstImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" @@ -121,10 +121,10 @@ Procedure which saved the best move and fitness. .PP Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP -Definition at line 76 of file moFirstImprSelect.h. +Definition at line 101 of file moFirstImprSelect.h. .PP References moFirstImprSelect< M >::best_fit, moFirstImprSelect< M >::best_move, and moFirstImprSelect< M >::valid. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 index c2c42dd5e..03400b549 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moFitSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moFitSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFitSolContinue" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -52,7 +52,7 @@ 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. +Definition at line 46 of file moFitSolContinue.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoFitSolContinue\fP< EOT >::\fBmoFitSolContinue\fP (\fBFitness\fP __fitness)\fC [inline]\fP" @@ -66,7 +66,7 @@ Basic constructor. .PP .PP -Definition at line 33 of file moFitSolContinue.h. +Definition at line 58 of file moFitSolContinue.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" @@ -89,7 +89,7 @@ true or false according to the value of the fitness. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 43 of file moFitSolContinue.h. +Definition at line 68 of file moFitSolContinue.h. .PP References moFitSolContinue< EOT >::fitness. .SS "template void \fBmoFitSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" @@ -100,8 +100,8 @@ It can be also used to reinitialize all the needed things. .PP Implements \fBmoSolContinue< EOT >\fP. .PP -Definition at line 57 of file moFitSolContinue.h. +Definition at line 82 of file moFitSolContinue.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects 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 023d19a8d..12aebcc08 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moGenSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moGenSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -48,7 +48,7 @@ One possible stop criterion for a solution-based heuristic. The stop criterion corresponds to a maximum number of iteration. .PP -Definition at line 21 of file moGenSolContinue.h. +Definition at line 46 of file moGenSolContinue.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoGenSolContinue\fP< EOT >::\fBmoGenSolContinue\fP (unsigned int __maxNumGen)\fC [inline]\fP" @@ -62,7 +62,7 @@ Simple constructor. .PP .PP -Definition at line 30 of file moGenSolContinue.h. +Definition at line 55 of file moGenSolContinue.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoGenSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" @@ -85,7 +85,7 @@ TRUE or FALSE according to the current generation number. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 44 of file moGenSolContinue.h. +Definition at line 69 of file moGenSolContinue.h. .PP References moGenSolContinue< EOT >::maxNumGen, and moGenSolContinue< EOT >::numGen. .SS "template void \fBmoGenSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" @@ -96,10 +96,10 @@ It can also be used to reset the iteration counter. .PP Implements \fBmoSolContinue< EOT >\fP. .PP -Definition at line 54 of file moGenSolContinue.h. +Definition at line 79 of file moGenSolContinue.h. .PP References moGenSolContinue< EOT >::numGen. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moHC.3 b/trunk/paradiseo-mo/doc/man/man3/moHC.3 index 9abd07847..893d4fe8c 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -60,7 +60,7 @@ Hill Climbing (HC). Class which describes the algorithm for a hill climbing. .PP -Definition at line 25 of file moHC.h. +Definition at line 50 of file moHC.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" @@ -84,7 +84,7 @@ All the boxes are given in order the HC to use a \fBmoHCMoveLoopExpl\fP. .PP .PP -Definition at line 52 of file moHC.h. +Definition at line 77 of file moHC.h. .SS "template \fBmoHC\fP< M >::\fBmoHC\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Light constructor. @@ -100,7 +100,7 @@ This constructor allow to use another \fBmoMoveExpl\fP (generally not a \fBmoHCM .PP .PP -Definition at line 66 of file moHC.h. +Definition at line 91 of file moHC.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoHC\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" @@ -123,10 +123,10 @@ TRUE. .PP Implements \fBeoUF< M::EOType &, bool >\fP. .PP -Definition at line 81 of file moHC.h. +Definition at line 106 of file moHC.h. .PP References moHC< M >::full_eval, and moHC< M >::move_expl. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moHCMoveLoopExpl.3 index 2cd3fe87e..fb38b2712 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -62,7 +62,7 @@ Inherits \fBmoMoveLoopExpl< M >< M >\fP. .SS "template class moHCMoveLoopExpl< M >" Iterative explorer used by a \fBmoHC\fP. .PP -Definition at line 23 of file moHCMoveLoopExpl.h. +Definition at line 48 of file moHCMoveLoopExpl.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoHCMoveLoopExpl\fP< M >::\fBmoHCMoveLoopExpl\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoMoveSelect\fP< M > & __move_select)\fC [inline]\fP" @@ -84,7 +84,7 @@ All the boxes have to be specified. .PP .PP -Definition at line 43 of file moHCMoveLoopExpl.h. +Definition at line 68 of file moHCMoveLoopExpl.h. .SH "Member Function Documentation" .PP .SS "template void \fBmoHCMoveLoopExpl\fP< M >::operator() (const \fBEOT\fP & __old_sol, \fBEOT\fP & __new_sol)\fC [inline, virtual]\fP" @@ -104,10 +104,10 @@ The exploration starts from an old solution and provides a new solution. .PP Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP -Definition at line 59 of file moHCMoveLoopExpl.h. +Definition at line 84 of file moHCMoveLoopExpl.h. .PP References moHCMoveLoopExpl< M >::incr_eval, moHCMoveLoopExpl< M >::move_init, moHCMoveLoopExpl< M >::move_select, and moHCMoveLoopExpl< M >::next_move. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moImprBestFitAspirCrit.3 index e88777845..a8049a372 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -56,10 +56,10 @@ One of the possible \fBmoAspirCrit\fP. This criterion is satisfied when a given fitness is the best ever considered. .PP -Definition at line 22 of file moImprBestFitAspirCrit.h. +Definition at line 47 of file moImprBestFitAspirCrit.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" +.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline]\fP" .PP \fBFunction\fP that indicates if the fit is better that the already saved fit. .PP @@ -79,12 +79,10 @@ TRUE the first time and if __fit > best_fit, else FALSE. .PP .PP -Implements \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. -.PP -Definition at line 52 of file moImprBestFitAspirCrit.h. +Definition at line 77 of file moImprBestFitAspirCrit.h. .PP References moImprBestFitAspirCrit< M >::best_fit, and moImprBestFitAspirCrit< M >::first_time. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moItRandNextMove.3 index 459274ce3..e3f7c3e46 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -56,7 +56,7 @@ One of the possible \fBmoNextMove\fP. This class is a move (\fBmoMove\fP) generator with a bound for the maximum number of iterations. .PP -Definition at line 22 of file moItRandNextMove.h. +Definition at line 47 of file moItRandNextMove.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoItRandNextMove\fP< M >::\fBmoItRandNextMove\fP (\fBmoRandMove\fP< M > & __rand_move, unsigned int __max_iter)\fC [inline]\fP" @@ -74,10 +74,10 @@ The constructor. .PP .PP -Definition at line 37 of file moItRandNextMove.h. +Definition at line 62 of file moItRandNextMove.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP Generation of a new move. .PP @@ -97,12 +97,10 @@ FALSE if the maximum number of iteration is reached, else TRUE. .PP .PP -Implements \fBeoBF< M &, const M::EOType &, bool >\fP. -.PP -Definition at line 52 of file moItRandNextMove.h. +Definition at line 77 of file moItRandNextMove.h. .PP References moItRandNextMove< M >::max_iter, moItRandNextMove< M >::num_iter, and moItRandNextMove< M >::rand_move. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/doc/man/man3/moLSCheckPoint.3 index 17e5de91c..12e4cf1bb 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moLSCheckPoint \- Class which allows a checkpointing system. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP. .PP .SS "Public Member Functions" @@ -40,7 +40,7 @@ Class which allows a checkpointing system. Thanks to this class, at each iteration, additionnal function can be used (and not only one). .PP -Definition at line 21 of file moLSCheckPoint.h. +Definition at line 46 of file moLSCheckPoint.h. .SH "Member Function Documentation" .PP .SS "template void \fBmoLSCheckPoint\fP< M >::operator() (const M & __move, const typename M::EOType & __sol)\fC [inline]\fP" @@ -58,7 +58,7 @@ Each saved function is used on the current move and the current solution. .PP .PP -Definition at line 34 of file moLSCheckPoint.h. +Definition at line 59 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::func. .SS "template void \fBmoLSCheckPoint\fP< M >::add (\fBeoBF\fP< const M &, const typename M::EOType &, void > & __f)\fC [inline]\fP" @@ -74,10 +74,10 @@ The new function is added at the end of the vector. .PP .PP -Definition at line 49 of file moLSCheckPoint.h. +Definition at line 74 of file moLSCheckPoint.h. .PP References moLSCheckPoint< M >::func. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/doc/man/man3/moLinearCoolingSchedule.3 index c8314c9bf..c78066299 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -42,7 +42,7 @@ One of the possible \fBmoCoolingSchedule\fP. An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. .PP -Definition at line 22 of file moLinearCoolingSchedule.h. +Definition at line 47 of file moLinearCoolingSchedule.h. .SH "Constructor & Destructor Documentation" .PP .SS "moLinearCoolingSchedule::moLinearCoolingSchedule (double __threshold, double __quantity)\fC [inline]\fP" @@ -58,7 +58,7 @@ Simple constructor. .PP .PP -Definition at line 31 of file moLinearCoolingSchedule.h. +Definition at line 56 of file moLinearCoolingSchedule.h. .SH "Member Function Documentation" .PP .SS "bool moLinearCoolingSchedule::operator() (double & __temp)\fC [inline, virtual]\fP" @@ -81,10 +81,10 @@ if the new temperature (current temperature - quantity) is greater than the thre .PP Implements \fBeoUF< double &, bool >\fP. .PP -Definition at line 41 of file moLinearCoolingSchedule.h. +Definition at line 66 of file moLinearCoolingSchedule.h. .PP References quantity, and threshold. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMove.3 b/trunk/paradiseo-mo/doc/man/man3/moMove.3 index 53375366c..0138b301a 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -12,6 +12,8 @@ moMove \- Definition of a move. .PP Inherits \fBeoUF< EOT &, void >\fP. .PP +Inherited by \fBTwoOpt\fP. +.PP .SS "Public Types" .in +1c @@ -28,8 +30,8 @@ Definition of a move. A move transforms a solution to another close solution. It describes how a solution can be modified to another one. .PP -Definition at line 23 of file moMove.h. +Definition at line 48 of file moMove.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveExpl.3 index 32d421e0f..4e0661a14 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,8 +22,8 @@ Description of a move (\fBmoMove\fP) explorer. Only a description...See \fBmoMoveLoopExpl\fP. .PP -Definition at line 21 of file moMoveExpl.h. +Definition at line 46 of file moMoveExpl.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveIncrEval.3 index 880642625..97fb97fd6 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness >\fP. .PP .SH "Detailed Description" .PP @@ -20,8 +20,8 @@ Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP. From a move and a solution, it computes a new fitness that could be associated to the solution if this one is updated. .PP -Definition at line 24 of file moMoveIncrEval.h. +Definition at line 49 of file moMoveIncrEval.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveInit.3 index 1236af218..22789dedc 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moMoveInit \- Move (\fBmoMove\fP) initializer. .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, void >\fP. +Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, void >\fP. .PP .SH "Detailed Description" .PP @@ -20,8 +20,8 @@ Move (\fBmoMove\fP) initializer. Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used. .PP -Definition at line 22 of file moMoveInit.h. +Definition at line 47 of file moMoveInit.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveLoopExpl.3 index 76967a5b7..cce384472 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -22,8 +22,8 @@ Class which describes an iterative explorer. Only a description... \fBmoHCMoveLoopExpl\fP and \fBmoTSMoveLoopExpl\fP are exemples of class that are a \fBmoMoveLoopExpl\fP. .PP -Definition at line 21 of file moMoveLoopExpl.h. +Definition at line 46 of file moMoveLoopExpl.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/doc/man/man3/moMoveSelect.3 index eb557b317..0bb4ac67b 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -42,7 +42,7 @@ Class that describes a move selector (\fBmoMove\fP). It iteratively considers some moves (\fBmoMove\fP) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. .PP -Definition at line 32 of file moMoveSelect.h. +Definition at line 57 of file moMoveSelect.h. .SH "Member Function Documentation" .PP .SS "template virtual void \fBmoMoveSelect\fP< M >::init (const \fBFitness\fP & __fit)\fC [pure virtual]\fP" @@ -81,4 +81,4 @@ Implemented in \fBmoBestImprSelect< M >\fP, and \fBmoRandImprSelect< M >\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 b/trunk/paradiseo-mo/doc/man/man3/moNextMove.3 index dbb9dc42c..145b45dbe 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< M &, const M::EOType &, bool >\fP. +Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, bool >\fP. .PP Inherited by \fBmoItRandNextMove< M >\fP. .PP @@ -22,8 +22,8 @@ Class which allows to generate a new move (\fBmoMove\fP). Useful for the explorer (for \fBmoTS\fP or \fBmoHC\fP). Does nothing... An object that herits from this class needs to be designed for being used. .PP -Definition at line 22 of file moNextMove.h. +Definition at line 47 of file moNextMove.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/doc/man/man3/moNoAspirCrit.3 index f4b026952..0452ecd36 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -32,7 +32,7 @@ One of the possible aspiration criterion (\fBmoAspirCrit\fP). The simplest : never satisfied. .PP -Definition at line 21 of file moNoAspirCrit.h. +Definition at line 46 of file moNoAspirCrit.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoNoAspirCrit\fP< M >::operator() (const M & __move, const typename M::EOType::Fitness & __sol)\fC [inline, private]\fP" @@ -55,7 +55,7 @@ FALSE. .PP .PP -Definition at line 32 of file moNoAspirCrit.h. +Definition at line 57 of file moNoAspirCrit.h. .SS "template void \fBmoNoAspirCrit\fP< M >::init ()\fC [inline, private, virtual]\fP" .PP Procedure which initialises all that needs a \fBmoNoAspirCrit\fP. @@ -64,8 +64,8 @@ Nothing... .PP Implements \fBmoAspirCrit< M >\fP. .PP -Definition at line 43 of file moNoAspirCrit.h. +Definition at line 68 of file moNoAspirCrit.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 index 1008df771..602340fab 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moNoFitImprSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moNoFitImprSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoFitImprSolContinue" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -64,7 +64,7 @@ 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. +Definition at line 46 of file moNoFitImprSolContinue.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoNoFitImprSolContinue\fP< EOT >::\fBmoNoFitImprSolContinue\fP (unsigned int __maxNumberOfIterationWithoutImprovement)\fC [inline]\fP" @@ -78,7 +78,7 @@ Basic constructor. .PP .PP -Definition at line 33 of file moNoFitImprSolContinue.h. +Definition at line 58 of file moNoFitImprSolContinue.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoNoFitImprSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" @@ -101,7 +101,7 @@ true or false. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 43 of file moNoFitImprSolContinue.h. +Definition at line 68 of file moNoFitImprSolContinue.h. .PP References moNoFitImprSolContinue< EOT >::counter, moNoFitImprSolContinue< EOT >::firstFitnessSaved, moNoFitImprSolContinue< EOT >::fitness, and moNoFitImprSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement. .SS "template void \fBmoNoFitImprSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" @@ -112,10 +112,10 @@ It can be also used to reinitialize all the needed things. .PP Implements \fBmoSolContinue< EOT >\fP. .PP -Definition at line 77 of file moNoFitImprSolContinue.h. +Definition at line 102 of file moNoFitImprSolContinue.h. .PP References moNoFitImprSolContinue< EOT >::counter, and moNoFitImprSolContinue< EOT >::firstFitnessSaved. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects 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 09cd94de0..6660d7b39 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -60,7 +60,7 @@ One of the possible \fBmoMove\fP selector (\fBmoMoveSelect\fP). All the neighbors are considered. One of them that enables an improvment of the objective function is choosen. .PP -Definition at line 25 of file moRandImprSelect.h. +Definition at line 50 of file moRandImprSelect.h. .SH "Member Function Documentation" .PP .SS "template void \fBmoRandImprSelect\fP< M >::init (const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" @@ -78,7 +78,7 @@ Give a value to the initialise fitness. Clean the move and fitness vectors. .PP Implements \fBmoMoveSelect< M >\fP. .PP -Definition at line 40 of file moRandImprSelect.h. +Definition at line 65 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SS "template bool \fBmoRandImprSelect\fP< M >::update (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" @@ -103,7 +103,7 @@ TRUE. .PP Implements \fBmoMoveSelect< M >\fP. .PP -Definition at line 56 of file moRandImprSelect.h. +Definition at line 81 of file moRandImprSelect.h. .PP References moRandImprSelect< M >::init_fit, moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SS "template void \fBmoRandImprSelect\fP< M >::operator() (M & __move, \fBFitness\fP & __fit) throw (\fBEmptySelection\fP)\fC [inline, virtual]\fP" @@ -128,10 +128,10 @@ One the saved move is randomly chosen. .PP Implements \fBeoBF< M &, M::EOType::Fitness &, void >\fP. .PP -Definition at line 77 of file moRandImprSelect.h. +Definition at line 102 of file moRandImprSelect.h. .PP References eoRng::random(), moRandImprSelect< M >::vect_better_fit, and moRandImprSelect< M >::vect_better_moves. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 b/trunk/paradiseo-mo/doc/man/man3/moRandMove.3 index 1bceef195..b01ccb83e 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -20,8 +20,8 @@ Random move generator. Only a description... An object that herits from this class needs to be designed in order to use a \fBmoSA\fP. .PP -Definition at line 21 of file moRandMove.h. +Definition at line 46 of file moRandMove.h. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSA.3 b/trunk/paradiseo-mo/doc/man/man3/moSA.3 index 39dd04ae2..b1569d221 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -72,7 +72,7 @@ Simulated Annealing (SA). Class that describes a Simulated Annealing algorithm. .PP -Definition at line 30 of file moSA.h. +Definition at line 55 of file moSA.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoSA\fP< M >::\fBmoSA\fP (\fBmoRandMove\fP< M > & __move_rand, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, double __init_temp, \fBmoCoolingSchedule\fP & __cool_sched, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" @@ -98,7 +98,7 @@ All the boxes used by a SA need to be given. .PP .PP -Definition at line 58 of file moSA.h. +Definition at line 83 of file moSA.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoSA\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" @@ -121,10 +121,10 @@ TRUE. .PP Implements \fBeoUF< M::EOType &, bool >\fP. .PP -Definition at line 80 of file moSA.h. +Definition at line 105 of file moSA.h. .PP References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform(). .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleMoveTabuList.3 index a1d95aa50..f1393452f 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -74,10 +74,10 @@ Inherits \fBmoTabuList< M >< M >\fP. .SS "template class moSimpleMoveTabuList< M >" Class describing a move tabu list with a limited memory. .PP -Definition at line 22 of file moSimpleMoveTabuList.h. +Definition at line 47 of file moSimpleMoveTabuList.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP \fBFunction\fP that indicates if, in a given state, the _move is tabu or not. .PP @@ -95,9 +95,7 @@ true or false. .PP .PP -Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. -.PP -Definition at line 46 of file moSimpleMoveTabuList.h. +Definition at line 71 of file moSimpleMoveTabuList.h. .PP References moSimpleMoveTabuList< M >::tabuList. .SS "template void \fBmoSimpleMoveTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" @@ -117,7 +115,7 @@ The two parameters have not to be modified so they are constant parameters. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 60 of file moSimpleMoveTabuList.h. +Definition at line 85 of file moSimpleMoveTabuList.h. .PP References moSimpleMoveTabuList< M >::currentSize, moSimpleMoveTabuList< M >::maxSize, moSimpleMoveTabuList< M >::removeMove(), and moSimpleMoveTabuList< M >::tabuList. .SS "template void \fBmoSimpleMoveTabuList\fP< M >::update ()\fC [inline, virtual]\fP" @@ -128,7 +126,7 @@ Generally, a counter associated to each saved move is decreased by one. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 82 of file moSimpleMoveTabuList.h. +Definition at line 107 of file moSimpleMoveTabuList.h. .SS "template void \fBmoSimpleMoveTabuList\fP< M >::init ()\fC [inline, virtual]\fP" .PP Procedure which initialises the tabu list. @@ -137,7 +135,7 @@ Can be useful if the data structure needs to be allocated before being used. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 88 of file moSimpleMoveTabuList.h. +Definition at line 113 of file moSimpleMoveTabuList.h. .SS "template void \fBmoSimpleMoveTabuList\fP< M >::removeMove (const M & __move)\fC [inline, private]\fP" .PP Procedure that removes a given move from the tabu list (if it is into, else do nothing). @@ -149,7 +147,7 @@ Procedure that removes a given move from the tabu list (if it is into, else do n .PP .PP -Definition at line 100 of file moSimpleMoveTabuList.h. +Definition at line 125 of file moSimpleMoveTabuList.h. .PP References moSimpleMoveTabuList< M >::tabuList. .PP @@ -157,4 +155,4 @@ Referenced by moSimpleMoveTabuList< M >::add(). .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moSimpleSolutionTabuList.3 index 82ae46b37..a7ab0f1a3 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -74,7 +74,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .SS "template class moSimpleSolutionTabuList< M >" Class describing a solution tabu list with limited length. .PP -Definition at line 22 of file moSimpleSolutionTabuList.h. +Definition at line 47 of file moSimpleSolutionTabuList.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoSimpleSolutionTabuList\fP< M >::\fBmoSimpleSolutionTabuList\fP (unsigned int __size)\fC [inline]\fP" @@ -88,12 +88,12 @@ Constructor. .PP .PP -Definition at line 34 of file moSimpleSolutionTabuList.h. +Definition at line 59 of file moSimpleSolutionTabuList.h. .PP References moSimpleSolutionTabuList< M >::currentSize. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" +.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" .PP \fBFunction\fP that indicates if, in a given state, the _move is tabu or not. .PP @@ -111,9 +111,7 @@ true or false. .PP .PP -Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. -.PP -Definition at line 45 of file moSimpleSolutionTabuList.h. +Definition at line 70 of file moSimpleSolutionTabuList.h. .PP References moSimpleSolutionTabuList< M >::tabuList. .SS "template void \fBmoSimpleSolutionTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" @@ -133,7 +131,7 @@ The two parameters have not to be modified so they are constant parameters. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 64 of file moSimpleSolutionTabuList.h. +Definition at line 89 of file moSimpleSolutionTabuList.h. .PP References moSimpleSolutionTabuList< M >::currentSize, moSimpleSolutionTabuList< M >::maxSize, moSimpleSolutionTabuList< M >::removeSolution(), and moSimpleSolutionTabuList< M >::tabuList. .SS "template void \fBmoSimpleSolutionTabuList\fP< M >::update ()\fC [inline, virtual]\fP" @@ -144,7 +142,7 @@ Generally, a counter associated to each saved move is decreased by one. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 91 of file moSimpleSolutionTabuList.h. +Definition at line 116 of file moSimpleSolutionTabuList.h. .SS "template void \fBmoSimpleSolutionTabuList\fP< M >::init ()\fC [inline, virtual]\fP" .PP Procedure which initialises the tabu list. @@ -153,7 +151,7 @@ Can be useful if the data structure needs to be allocated before being used. .PP Implements \fBmoTabuList< M >\fP. .PP -Definition at line 97 of file moSimpleSolutionTabuList.h. +Definition at line 122 of file moSimpleSolutionTabuList.h. .SS "template void \fBmoSimpleSolutionTabuList\fP< M >::removeSolution (const \fBEOT\fP & __sol)\fC [inline, private]\fP" .PP Procedure that removes a given solution from the tabu list (if it is into, else does nothing). @@ -165,7 +163,7 @@ Procedure that removes a given solution from the tabu list (if it is into, else .PP .PP -Definition at line 109 of file moSimpleSolutionTabuList.h. +Definition at line 134 of file moSimpleSolutionTabuList.h. .PP References moSimpleSolutionTabuList< M >::tabuList. .PP @@ -173,4 +171,4 @@ Referenced by moSimpleSolutionTabuList< M >::add(). .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 index bda7e8afe..f9821e165 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ Class that describes a stop criterion for a solution-based heuristic. It allows to add an initialisation procedure to an object that is a unary function (\fBeoUF\fP). .PP -Definition at line 22 of file moSolContinue.h. +Definition at line 47 of file moSolContinue.h. .SH "Member Function Documentation" .PP .SS "template virtual void \fBmoSolContinue\fP< EOT >::init ()\fC [pure virtual]\fP" @@ -43,4 +43,4 @@ Implemented in \fBmoFitSolContinue< EOT >\fP, \fBmoGenSolContinue< EOT >\fP, \fB .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 index 6e6cf540f..cc92722e1 100644 --- a/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 +++ b/trunk/paradiseo-mo/doc/man/man3/moSteadyFitSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSteadyFitSolContinue" 3 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSteadyFitSolContinue" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -72,7 +72,7 @@ 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. +Definition at line 46 of file moSteadyFitSolContinue.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoSteadyFitSolContinue\fP< EOT >::\fBmoSteadyFitSolContinue\fP (unsigned int __maxNumberOfIterations, unsigned int __maxNumberOfIterationWithoutImprovement)\fC [inline]\fP" @@ -88,7 +88,7 @@ Basic constructor. .PP .PP -Definition at line 34 of file moSteadyFitSolContinue.h. +Definition at line 59 of file moSteadyFitSolContinue.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoSteadyFitSolContinue\fP< EOT >::operator() (const EOT & __sol)\fC [inline, virtual]\fP" @@ -111,7 +111,7 @@ true or false. .PP Implements \fBeoUF< const EOT &, bool >\fP. .PP -Definition at line 46 of file moSteadyFitSolContinue.h. +Definition at line 71 of file moSteadyFitSolContinue.h. .PP References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, moSteadyFitSolContinue< EOT >::fitness, moSteadyFitSolContinue< EOT >::maxNumberOfIterations, moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsWithoutImprovement. .SS "template void \fBmoSteadyFitSolContinue\fP< EOT >::init ()\fC [inline, virtual]\fP" @@ -122,10 +122,10 @@ It can be also used to reinitialize the counter all the needed things. .PP Implements \fBmoSolContinue< EOT >\fP. .PP -Definition at line 90 of file moSteadyFitSolContinue.h. +Definition at line 115 of file moSteadyFitSolContinue.h. .PP References moSteadyFitSolContinue< EOT >::counter, moSteadyFitSolContinue< EOT >::firstFitnessSaved, and moSteadyFitSolContinue< EOT >::maxNumberOfIterationsReached. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects 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 e1449aa89..fa9a5f8f7 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -64,7 +64,7 @@ Tabu Search (TS). Generic algorithm that describes a tabu search. .PP -Definition at line 29 of file moTS.h. +Definition at line 54 of file moTS.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" @@ -92,7 +92,7 @@ In this constructor, a \fBmoTSMoveLoopExpl\fP is instanciated. .PP .PP -Definition at line 58 of file moTS.h. +Definition at line 83 of file moTS.h. .SS "template \fBmoTS\fP< M >::\fBmoTS\fP (\fBmoMoveExpl\fP< M > & __move_expl, \fBmoSolContinue\fP< \fBEOT\fP > & __cont, \fBeoEvalFunc\fP< \fBEOT\fP > & __full_eval)\fC [inline]\fP" .PP Constructor with less parameters. @@ -110,7 +110,7 @@ The explorer is given in the parameters. .PP .PP -Definition at line 71 of file moTS.h. +Definition at line 96 of file moTS.h. .SH "Member Function Documentation" .PP .SS "template bool \fBmoTS\fP< M >::operator() (\fBEOT\fP & __sol)\fC [inline, virtual]\fP" @@ -133,10 +133,10 @@ TRUE. .PP Implements \fBeoUF< M::EOType &, bool >\fP. .PP -Definition at line 85 of file moTS.h. +Definition at line 110 of file moTS.h. .PP References moTS< M >::cont, moTS< M >::full_eval, and moTS< M >::move_expl. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/doc/man/man3/moTSMoveLoopExpl.3 index 19aae91bc..2bebec57c 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -72,7 +72,7 @@ Explorer for a Tabu Search algorithm. It is used by a \fBmoTS\fP. .PP -Definition at line 30 of file moTSMoveLoopExpl.h. +Definition at line 55 of file moTSMoveLoopExpl.h. .SH "Constructor & Destructor Documentation" .PP .SS "template \fBmoTSMoveLoopExpl\fP< M >::\fBmoTSMoveLoopExpl\fP (\fBmoMoveInit\fP< M > & __move_init, \fBmoNextMove\fP< M > & __next_move, \fBmoMoveIncrEval\fP< M > & __incr_eval, \fBmoTabuList\fP< M > & __tabu_list, \fBmoAspirCrit\fP< M > & __aspir_crit)\fC [inline]\fP" @@ -94,7 +94,7 @@ Constructor. .PP .PP -Definition at line 49 of file moTSMoveLoopExpl.h. +Definition at line 74 of file moTSMoveLoopExpl.h. .PP References moTSMoveLoopExpl< M >::aspir_crit, and moTSMoveLoopExpl< M >::tabu_list. .SH "Member Function Documentation" @@ -116,10 +116,10 @@ The exploration continues while the chosen move is not in the tabu list or the a .PP Implements \fBeoBF< const M::EOType &, M::EOType &, void >\fP. .PP -Definition at line 69 of file moTSMoveLoopExpl.h. +Definition at line 94 of file moTSMoveLoopExpl.h. .PP References moTSMoveLoopExpl< M >::aspir_crit, moTSMoveLoopExpl< M >::incr_eval, moTSMoveLoopExpl< M >::move_init, moTSMoveLoopExpl< M >::move_select, moTSMoveLoopExpl< M >::next_move, and moTSMoveLoopExpl< M >::tabu_list. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 b/trunk/paradiseo-mo/doc/man/man3/moTabuList.3 index 33e8c6fdf..4e1ce560d 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 "25 Sep 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "8 Oct 2007" "Version 1.0" "ParadisEO-MOMovingObjects" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP -Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP. +Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP. .PP Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .PP @@ -46,7 +46,7 @@ Class describing a tabu list that a \fBmoTS\fP uses. It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \fBmoTS\fP. .PP -Definition at line 22 of file moTabuList.h. +Definition at line 47 of file moTabuList.h. .SH "Member Function Documentation" .PP .SS "template virtual void \fBmoTabuList\fP< M >::add (const M & __move, const \fBEOT\fP & __sol)\fC [pure virtual]\fP" @@ -71,15 +71,15 @@ Procedure that updates the tabu list content. .PP Generally, a counter associated to each saved move is decreased by one. .PP -Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. +Implemented in \fBmoSimpleMoveTabuList< M >\fP, \fBmoSimpleSolutionTabuList< M >\fP, and \fBTwoOptTabuList\fP. .SS "template virtual void \fBmoTabuList\fP< M >::init ()\fC [pure virtual]\fP" .PP Procedure which initialises the tabu list. .PP Can be useful if the data structure needs to be allocated before being used. .PP -Implemented in \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. +Implemented in \fBmoSimpleMoveTabuList< M >\fP, \fBmoSimpleSolutionTabuList< M >\fP, and \fBTwoOptTabuList\fP. .SH "Author" .PP -Generated automatically by Doxygen for PARADISEO-MO from the source code. +Generated automatically by Doxygen for ParadisEO-MOMovingObjects from the source code. diff --git a/trunk/paradiseo-mo/doc/mo.doxyfile.cmake b/trunk/paradiseo-mo/doc/mo.doxyfile.cmake index 97be7210f..d88b52166 100644 --- a/trunk/paradiseo-mo/doc/mo.doxyfile.cmake +++ b/trunk/paradiseo-mo/doc/mo.doxyfile.cmake @@ -501,7 +501,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/trunk/paradiseo-mo/src/index.h b/trunk/paradiseo-mo/src/index.h index 50486cb68..46c86bb55 100644 --- a/trunk/paradiseo-mo/src/index.h +++ b/trunk/paradiseo-mo/src/index.h @@ -19,6 +19,34 @@ It contains classes for almost any kind of one solution based heuristics. @section LICENCE + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can use, + modify and/ or redistribute the software under the terms of the CeCILL + license as circulated by CEA, CNRS and INRIA at the following URL + "http://www.cecill.info". + + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. + + In this respect, the user's attention is drawn to the risks associated + with loading, using, modifying and/or developing or reproducing the + software by the user in light of its specific status of free software, + that may mean that it is complicated to manipulate, and that also + therefore means that it is reserved for developers and experienced + professionals having in-depth computer knowledge. Users are therefore + encouraged to load and test the software's suitability as regards their + requirements in conditions enabling the security of their systems and/or + data to be ensured and, more generally, to use and operate it in the + same conditions as regards security. + The fact that you are presently reading this means that you have had + knowledge of the CeCILL license and that you accept its terms. + + ParadisEO WebSite : http://paradiseo.gforge.inria.fr + Contact: paradiseo-help@lists.gforge.inria.fr + + @section Paradiseo Home Page http://paradiseo.gforge.inria.fr diff --git a/trunk/paradiseo-mo/src/mo b/trunk/paradiseo-mo/src/mo index 81c9fea9f..b77209648 100755 --- a/trunk/paradiseo-mo/src/mo +++ b/trunk/paradiseo-mo/src/mo @@ -1,3 +1,38 @@ +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* +*/ #ifndef __mo #define __mo diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index e94fc25f3..da19d6168 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "mo.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __mo_h @@ -15,16 +40,13 @@ #include "moAlgo.h" #include "moAspirCrit.h" #include "moBestImprSelect.h" -#include "moComparator.h" #include "moCoolingSchedule.h" #include "moExponentialCoolingSchedule.h" #include "moFirstImprSelect.h" -#include "moFitComparator.h" #include "moGenSolContinue.h" #include "moHC.h" #include "moHCMoveLoopExpl.h" #include "moImprBestFitAspirCrit.h" -#include "moILS.h" #include "moItRandNextMove.h" #include "moLinearCoolingSchedule.h" #include "moLSCheckPoint.h" diff --git a/trunk/paradiseo-mo/src/moAlgo.h b/trunk/paradiseo-mo/src/moAlgo.h index 42bd849a9..c9886dee6 100755 --- a/trunk/paradiseo-mo/src/moAlgo.h +++ b/trunk/paradiseo-mo/src/moAlgo.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moAlgo.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moAlgo_h diff --git a/trunk/paradiseo-mo/src/moAspirCrit.h b/trunk/paradiseo-mo/src/moAspirCrit.h index 99c92727b..e8390aed8 100755 --- a/trunk/paradiseo-mo/src/moAspirCrit.h +++ b/trunk/paradiseo-mo/src/moAspirCrit.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moAspirCrit.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moAspirCrit_h diff --git a/trunk/paradiseo-mo/src/moBestImprSelect.h b/trunk/paradiseo-mo/src/moBestImprSelect.h index 30c846236..715ab6149 100755 --- a/trunk/paradiseo-mo/src/moBestImprSelect.h +++ b/trunk/paradiseo-mo/src/moBestImprSelect.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moBestImprSelect.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moBestImprSelect_h diff --git a/trunk/paradiseo-mo/src/moComparator.h b/trunk/paradiseo-mo/src/moComparator.h index a76642385..231dd4e23 100644 --- a/trunk/paradiseo-mo/src/moComparator.h +++ b/trunk/paradiseo-mo/src/moComparator.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moComparator.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moComparator_h diff --git a/trunk/paradiseo-mo/src/moCoolingSchedule.h b/trunk/paradiseo-mo/src/moCoolingSchedule.h index c73b25c01..a757fde04 100644 --- a/trunk/paradiseo-mo/src/moCoolingSchedule.h +++ b/trunk/paradiseo-mo/src/moCoolingSchedule.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moCoolingSchedule.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moCoolingSchedule_h diff --git a/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h b/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h index e67614951..5a717b735 100644 --- a/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h +++ b/trunk/paradiseo-mo/src/moExponentialCoolingSchedule.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moExponentialCoolingSchedule.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moExponentialCoolingSchedule_h diff --git a/trunk/paradiseo-mo/src/moFirstImprSelect.h b/trunk/paradiseo-mo/src/moFirstImprSelect.h index 6656d5a95..6f4b91a02 100755 --- a/trunk/paradiseo-mo/src/moFirstImprSelect.h +++ b/trunk/paradiseo-mo/src/moFirstImprSelect.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moFirstImprSelect.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moFirstImprSelect_h diff --git a/trunk/paradiseo-mo/src/moFitComparator.h b/trunk/paradiseo-mo/src/moFitComparator.h index 37bb059d0..ca06196f0 100644 --- a/trunk/paradiseo-mo/src/moFitComparator.h +++ b/trunk/paradiseo-mo/src/moFitComparator.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moFitComparator.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moFitComparator_h diff --git a/trunk/paradiseo-mo/src/moFitSolContinue.h b/trunk/paradiseo-mo/src/moFitSolContinue.h index be13d15cd..e3f6be592 100644 --- a/trunk/paradiseo-mo/src/moFitSolContinue.h +++ b/trunk/paradiseo-mo/src/moFitSolContinue.h @@ -1,12 +1,37 @@ -// -*- 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 +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moFitSolContinue_h diff --git a/trunk/paradiseo-mo/src/moGenSolContinue.h b/trunk/paradiseo-mo/src/moGenSolContinue.h index 2bd8ba4e5..0e18e18a5 100755 --- a/trunk/paradiseo-mo/src/moGenSolContinue.h +++ b/trunk/paradiseo-mo/src/moGenSolContinue.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "eoGenSolContinue.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moGenSolContinue_h diff --git a/trunk/paradiseo-mo/src/moHC.h b/trunk/paradiseo-mo/src/moHC.h index e69ebbb83..e2f1e9b64 100755 --- a/trunk/paradiseo-mo/src/moHC.h +++ b/trunk/paradiseo-mo/src/moHC.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moHC.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moHC_h diff --git a/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h b/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h index f9ff78bea..42db68647 100755 --- a/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h +++ b/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moHCMoveLoopExpl.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moHCMoveLoopExpl_h diff --git a/trunk/paradiseo-mo/src/moILS.h b/trunk/paradiseo-mo/src/moILS.h index 001812007..b76857848 100644 --- a/trunk/paradiseo-mo/src/moILS.h +++ b/trunk/paradiseo-mo/src/moILS.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moILS.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moILS_h diff --git a/trunk/paradiseo-mo/src/moImprBestFitAspirCrit.h b/trunk/paradiseo-mo/src/moImprBestFitAspirCrit.h index d0cf06486..0a808d822 100755 --- a/trunk/paradiseo-mo/src/moImprBestFitAspirCrit.h +++ b/trunk/paradiseo-mo/src/moImprBestFitAspirCrit.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moImprAspirCrit.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moImprBestFitAspirCrit_h diff --git a/trunk/paradiseo-mo/src/moItRandNextMove.h b/trunk/paradiseo-mo/src/moItRandNextMove.h index ceacc061a..00e0f2aea 100755 --- a/trunk/paradiseo-mo/src/moItRandNextMove.h +++ b/trunk/paradiseo-mo/src/moItRandNextMove.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moNextMove.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moItRandNextMove_h diff --git a/trunk/paradiseo-mo/src/moLSCheckPoint.h b/trunk/paradiseo-mo/src/moLSCheckPoint.h index 097208a83..9a41e28a2 100755 --- a/trunk/paradiseo-mo/src/moLSCheckPoint.h +++ b/trunk/paradiseo-mo/src/moLSCheckPoint.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moLSCheckPoint.h" - -// (c) OPAC Team, LIFL, 2003 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moSolUpdater_h diff --git a/trunk/paradiseo-mo/src/moLinearCoolingSchedule.h b/trunk/paradiseo-mo/src/moLinearCoolingSchedule.h index 62d48c427..6c4e213d1 100644 --- a/trunk/paradiseo-mo/src/moLinearCoolingSchedule.h +++ b/trunk/paradiseo-mo/src/moLinearCoolingSchedule.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moLinearCoolingSchedule.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moLinearCoolingSchedule_h diff --git a/trunk/paradiseo-mo/src/moMove.h b/trunk/paradiseo-mo/src/moMove.h index 5c7f41818..991114005 100755 --- a/trunk/paradiseo-mo/src/moMove.h +++ b/trunk/paradiseo-mo/src/moMove.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moMove.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moMove_h diff --git a/trunk/paradiseo-mo/src/moMoveExpl.h b/trunk/paradiseo-mo/src/moMoveExpl.h index 0905e3186..462cae8bb 100755 --- a/trunk/paradiseo-mo/src/moMoveExpl.h +++ b/trunk/paradiseo-mo/src/moMoveExpl.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "eoMoveExpl.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moMoveExpl_h diff --git a/trunk/paradiseo-mo/src/moMoveIncrEval.h b/trunk/paradiseo-mo/src/moMoveIncrEval.h index 7dd633141..f3b6385c5 100755 --- a/trunk/paradiseo-mo/src/moMoveIncrEval.h +++ b/trunk/paradiseo-mo/src/moMoveIncrEval.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "eoMoveIncrEval.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moMoveIncrEval_h diff --git a/trunk/paradiseo-mo/src/moMoveInit.h b/trunk/paradiseo-mo/src/moMoveInit.h index dfba59661..26d922a45 100755 --- a/trunk/paradiseo-mo/src/moMoveInit.h +++ b/trunk/paradiseo-mo/src/moMoveInit.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moMoveInit.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moMoveInit_h diff --git a/trunk/paradiseo-mo/src/moMoveLoopExpl.h b/trunk/paradiseo-mo/src/moMoveLoopExpl.h index 5d35e8aac..80947b896 100755 --- a/trunk/paradiseo-mo/src/moMoveLoopExpl.h +++ b/trunk/paradiseo-mo/src/moMoveLoopExpl.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moMoveLoopExpl.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moMoveLoopExpl_h diff --git a/trunk/paradiseo-mo/src/moMoveSelect.h b/trunk/paradiseo-mo/src/moMoveSelect.h index 7595ba61d..309ddc021 100755 --- a/trunk/paradiseo-mo/src/moMoveSelect.h +++ b/trunk/paradiseo-mo/src/moMoveSelect.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moMoveSelect.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moMoveSelect_h diff --git a/trunk/paradiseo-mo/src/moNextMove.h b/trunk/paradiseo-mo/src/moNextMove.h index 93748fe74..6a6a5659a 100755 --- a/trunk/paradiseo-mo/src/moNextMove.h +++ b/trunk/paradiseo-mo/src/moNextMove.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moNextMove.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moNextMove_h diff --git a/trunk/paradiseo-mo/src/moNoAspirCrit.h b/trunk/paradiseo-mo/src/moNoAspirCrit.h index a5e499ccb..4f4d1d4a3 100755 --- a/trunk/paradiseo-mo/src/moNoAspirCrit.h +++ b/trunk/paradiseo-mo/src/moNoAspirCrit.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "eoNoAspirCrit.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moNoAspirCrit_h diff --git a/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h b/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h index 22208918d..110458865 100644 --- a/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h +++ b/trunk/paradiseo-mo/src/moNoFitImprSolContinue.h @@ -1,12 +1,37 @@ -// -*- 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 +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moNoFitImprSolContinue_h diff --git a/trunk/paradiseo-mo/src/moRandImprSelect.h b/trunk/paradiseo-mo/src/moRandImprSelect.h index 4d60e794a..db8b4b474 100755 --- a/trunk/paradiseo-mo/src/moRandImprSelect.h +++ b/trunk/paradiseo-mo/src/moRandImprSelect.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moRandImprSelect.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moRandImprSelect_h diff --git a/trunk/paradiseo-mo/src/moRandMove.h b/trunk/paradiseo-mo/src/moRandMove.h index b17de3868..2c11e9aea 100755 --- a/trunk/paradiseo-mo/src/moRandMove.h +++ b/trunk/paradiseo-mo/src/moRandMove.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moRandMove.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moRandMove_h diff --git a/trunk/paradiseo-mo/src/moSA.h b/trunk/paradiseo-mo/src/moSA.h index 97eaabf8e..2b980c044 100755 --- a/trunk/paradiseo-mo/src/moSA.h +++ b/trunk/paradiseo-mo/src/moSA.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moSA.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moSA_h diff --git a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h index efa97fe5d..1f29c88fc 100755 --- a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h +++ b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moSimpleMoveTabuList.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moSimpleMoveTabuList_h diff --git a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h index 82d00b2fa..8dac7d880 100755 --- a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h +++ b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moSimpleSolutionTabuList.h" - -// (c) OPAC Team, LIFL, 2003-2007 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moSimpleSolutionTabuList_h diff --git a/trunk/paradiseo-mo/src/moSolContinue.h b/trunk/paradiseo-mo/src/moSolContinue.h index 44efdd969..c63006d61 100755 --- a/trunk/paradiseo-mo/src/moSolContinue.h +++ b/trunk/paradiseo-mo/src/moSolContinue.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moSolContinue.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moSolContinue_h diff --git a/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h b/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h index 4e64e1064..6808ee54a 100644 --- a/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h +++ b/trunk/paradiseo-mo/src/moSteadyFitSolContinue.h @@ -1,12 +1,37 @@ -// -*- 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 +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moSteadyFitSolContinue_h diff --git a/trunk/paradiseo-mo/src/moTS.h b/trunk/paradiseo-mo/src/moTS.h index 8aa134d5d..e83795d1b 100755 --- a/trunk/paradiseo-mo/src/moTS.h +++ b/trunk/paradiseo-mo/src/moTS.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moTS.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moTS_h diff --git a/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h b/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h index 53ed30a74..c9ae4b986 100755 --- a/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h +++ b/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moTSMoveLoopExpl.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moTSMoveLoopExpl_h diff --git a/trunk/paradiseo-mo/src/moTabuList.h b/trunk/paradiseo-mo/src/moTabuList.h index de550cce9..9b7cb3c16 100755 --- a/trunk/paradiseo-mo/src/moTabuList.h +++ b/trunk/paradiseo-mo/src/moTabuList.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "moTabuList.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef __moTabuList_h diff --git a/trunk/paradiseo-mo/test/t-mo.cpp b/trunk/paradiseo-mo/test/t-mo.cpp index c2bddfcee..e2cd38ded 100644 --- a/trunk/paradiseo-mo/test/t-mo.cpp +++ b/trunk/paradiseo-mo/test/t-mo.cpp @@ -1,3 +1,38 @@ +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr) +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* +*/ //----------------------------------------------------------------------------- // t-mo.cpp //----------------------------------------------------------------------------- diff --git a/trunk/paradiseo-mo/tutorial/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/CMakeLists.txt index e8d84ac73..0bc6daac1 100644 --- a/trunk/paradiseo-mo/tutorial/CMakeLists.txt +++ b/trunk/paradiseo-mo/tutorial/CMakeLists.txt @@ -12,6 +12,6 @@ SET(TSP_BINARY_DIR ${ParadisEO-MO_BINARY_DIR}/tutorial/examples/tsp CACHE PATH " ### 2) Where must cmake go now ? ###################################################################################### -SUBDIRS(examples Lesson1 Lesson2 Lesson3 Lesson4) +SUBDIRS(examples Lesson1 Lesson2 Lesson3) ###################################################################################### diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp index f9151b246..6e862e376 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "hill_climbing.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp index 13913bdb7..1098feb04 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "tabu_search.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp index b768b075b..c4563e21b 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "simulated_annealing.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp index 567f53fb6..52aff02fb 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "city_swap.cpp" - -// (c) OPAC Team, LIFL, 2002-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.h b/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.h index 784324e1f..854367e3b 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/city_swap.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "city_swap.h" - -// (c) OPAC Team, LIFL, 2002-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef city_swap_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp index c8984e204..2ecf46ec2 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "edge_xover.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.h index 3c22e2f8f..775c2fd53 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/edge_xover.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "edge_xover.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef edge_xover_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/graph.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/graph.cpp index 0a0e07fcd..ac6b11217 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/graph.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/graph.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "graph.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/graph.h b/trunk/paradiseo-mo/tutorial/examples/tsp/graph.h index 19baf8ac4..b2dbc6b5f 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/graph.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/graph.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "graph.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef graph_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/mix.h b/trunk/paradiseo-mo/tutorial/examples/tsp/mix.h index 390168d54..ad2481263 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/mix.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/mix.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "mix.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef mix_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp index 54de70705..b8bc40970 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "order_xover.cpp" - -// (c) OPAC Team, LIFL, 2002-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.h index 587c35652..9c60ad583 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/order_xover.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "order_xover.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef order_xover_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp index 53e41a5d4..c14f1e1ca 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "part_route_eval.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "part_route_eval.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h index 2fbd3b35c..1ed1b9320 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/part_route_eval.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "part_route_eval.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef part_route_eval_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp index 9f674916c..51fb1d3d8 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "part_two_opt_init.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h index 406a4c64f..4b035351e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_init.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "part_two_opt_init.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef part_two_opt_init_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp index 3fab484ec..794706a89 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "part_two_opt_next.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "part_two_opt_next.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h index e9ef5bb4e..2b5739c0d 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/part_two_opt_next.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "part_two_opt_next.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef part_two_opt_next_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp index 2c57e70a3..44e9e8343 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "partial_mapped_xover.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h index a128fb9de..3a6941cf9 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/partial_mapped_xover.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "partial_mapped_xover.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef partial_mapped_xover_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route.h index 2489b63bc..0482b2428 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef route_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp index 0d0d6e413..0cd7508b7 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route_eval.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* TEXT LICENCE - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "route_eval.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.h index 69b9c7737..d0b1922bc 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_eval.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route_eval.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef route_eval_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.cpp index f22ca1bf2..184b9bf40 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route_init.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.h index 654c1a926..4618cd526 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_init.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route_init.h" - -// (c) OPAC Team, LIFL, 2002-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef route_init_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp index be4c7fc0c..43346a0f4 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route_valid.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "route_valid.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.h b/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.h index 90763d7fc..cae56113e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/route_valid.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "route_valid.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef route_valid_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp index 9aa779d50..e270939e4 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "two_opt.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.h index 279a813c9..78433be90 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef two_opt_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp index 1b371104b..9bb11248e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "TwoOptIncrEval.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "two_opt_incr_eval.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h index 233cb264d..786535fcf 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_incr_eval.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "TwoOptIncrEval.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef two_optincr_eval_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp index bc464f6ad..a9f0121fe 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_init.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "two_opt_init.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h index b8460f69e..25721613f 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_init.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_init.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef two_opt_init_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp index d0b297f51..e85068761 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_next.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "two_opt_next.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h index ac60bc3e6..ac0a3824e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_next.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_next.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef two_opt_next_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp index 7db7f6cb7..e35cec4ed 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_rand.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "two_opt_rand.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h index 600cf8b77..658b2cd10 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_rand.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_rand.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef two_opt_rand_h diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp index f5492cde3..d10843026 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.cpp @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_tabu_list.cpp" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #include "two_opt_tabu_list.h" diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h index 29c6c8439..e757354de 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/two_opt_tabu_list.h @@ -1,12 +1,37 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -// "two_opt_tabu_list.h" - -// (c) OPAC Team, LIFL, 2003-2006 - -/* LICENCE TEXT - - Contact: paradiseo-help@lists.gforge.inria.fr +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 +* (C) OPAC Team, LIFL, 2002-2007 +* +* Sébastien Cahon, Jean-Charles Boisson +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* ParadisEO WebSite : http://paradiseo.gforge.inria.fr +* Contact: paradiseo-help@lists.gforge.inria.fr +* */ #ifndef two_opt_tabu_list_h