RC for ParadisEO 2.0

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2709 331e1502-861f-0410-8da2-ba01fb791d7f

branches/rc2.0/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt

@@ -0,0 +1,41 @@
+######################################################################################
+### 1) Include the sources
+######################################################################################
+
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src
+					${MO_SRC_DIR}/src
+					${PROBLEMS_SRC_DIR}
+					${CMAKE_CURRENT_SOURCE_DIR}/../src)
+	
+######################################################################################
+### 2) Specify where CMake can find the libraries
+######################################################################################	
+					
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib)	
+
+
+######################################################################################
+### 3) Define your target(s): just an executable here
+######################################################################################
+
+IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
+	SOURCE_GROUP(src FILES testSimulatedAnnealing.cpp)
+	ADD_EXECUTABLE(testSimulatedAnnealing 
+		testSimulatedAnnealing.cpp
+		${MO_BIN_DIR}/tutorial/Lesson3/testSimulatedAnnealing.param
+	)
+ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")	
+	ADD_COMMANDS_NEWMO()
+	ADD_TARGET_NEWMO(lesson3)
+	IF(ENABLE_CMAKE_EXAMPLE)
+		ADD_EXECUTABLE(testSimulatedAnnealing testSimulatedAnnealing.cpp)
+	ELSE(ENABLE_CMAKE_EXAMPLE)
+		ADD_EXECUTABLE(testSimulatedAnnealing EXCLUDE_FROM_ALL testSimulatedAnnealing.param)
+	ENDIF(ENABLE_CMAKE_EXAMPLE)
+ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10")
+
+######################################################################################
+### 4) Link the librairies for your target(s)
+######################################################################################
+
+TARGET_LINK_LIBRARIES(testSimulatedAnnealing eoutils ga eo) 

branches/rc2.0/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.cpp

@@ -0,0 +1,232 @@
+//-----------------------------------------------------------------------------
+/** testSimulatedAnnealing.cpp
+ *
+ * SV - 29/03/10
+ * JH - 20/04/10
+ */
+//-----------------------------------------------------------------------------
+
+// standard includes
+#define HAVE_SSTREAM
+
+#include <stdexcept>  // runtime_error 
+#include <iostream>   // cout
+#include <sstream>  // ostrstream, istrstream
+#include <fstream>
+#include <string.h>
+
+// the general include for eo
+#include <eo>
+#include <ga.h>
+
+using namespace std;
+
+//-----------------------------------------------------------------------------
+//Representation and initializer
+#include <eoInt.h>
+#include <eoInit.h>
+#include <eoScalarFitness.h>
+
+// fitness function
+#include <eval/queenEval.h>
+#include <eval/moFullEvalByModif.h>
+#include <eval/moFullEvalByCopy.h>
+
+//Neighbors and Neighborhoods
+#include <problems/permutation/moShiftNeighbor.h>
+#include <neighborhood/moRndWithReplNeighborhood.h>
+
+//Algorithm and its components
+#include <coolingSchedule/moCoolingSchedule.h>
+#include <algo/moSA.h>
+
+//comparator
+#include <comparator/moSolNeighborComparator.h>
+
+//continuators
+#include <continuator/moTrueContinuator.h>
+#include <continuator/moCheckpoint.h>
+#include <continuator/moFitnessStat.h>
+#include <utils/eoFileMonitor.h>
+#include <continuator/moCounterMonitorSaver.h>
+
+
+//-----------------------------------------------------------------------------
+// Define types of the representation solution, different neighbors and neighborhoods
+//-----------------------------------------------------------------------------
+typedef eoInt<eoMinimizingFitness> Queen; //Permutation (Queen's problem representation)
+
+typedef moShiftNeighbor<Queen> shiftNeighbor; //shift Neighbor
+typedef moRndWithReplNeighborhood<shiftNeighbor> rndShiftNeighborhood; //rnd shift Neighborhood (Indexed)
+
+void main_function(int argc, char **argv)
+{
+    /* =========================================================
+    *
+    * Parameters
+    *
+    * ========================================================= */
+
+    // First define a parser from the command-line arguments
+    eoParser parser(argc, argv);
+
+    // For each parameter, define Parameter, read it through the parser,
+    // and assign the value to the variable
+
+    eoValueParam<uint32_t> seedParam(time(0), "seed", "Random number seed", 'S');
+    parser.processParam( seedParam );
+    unsigned seed = seedParam.value();
+
+    // description of genotype
+    eoValueParam<unsigned int> vecSizeParam(8, "vecSize", "Genotype size", 'V');
+    parser.processParam( vecSizeParam, "Representation" );
+    unsigned vecSize = vecSizeParam.value();
+
+    // the name of the "status" file where all actual parameter values will be saved
+    string str_status = parser.ProgramName() + ".status"; // default value
+    eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file");
+    parser.processParam( statusParam, "Persistence" );
+
+    // do the following AFTER ALL PARAMETERS HAVE BEEN PROCESSED
+    // i.e. in case you need parameters somewhere else, postpone these
+    if (parser.userNeedsHelp()) {
+        parser.printHelp(cout);
+        exit(1);
+    }
+    if (statusParam.value() != "") {
+        ofstream os(statusParam.value().c_str());
+        os << parser;// and you can use that file as parameter file
+    }
+
+    /* =========================================================
+     *
+     * Random seed
+     *
+     * ========================================================= */
+
+    //reproducible random seed: if you don't change SEED above,
+    // you'll always get the same result, NOT a random run
+    rng.reseed(seed);
+
+
+    /* =========================================================
+     *
+     * Eval fitness function
+     *
+     * ========================================================= */
+
+    queenEval<Queen> fullEval;
+
+
+    /* =========================================================
+     *
+     * Initilisation of the solution
+     *
+     * ========================================================= */
+
+    eoInitPermutation<Queen> init(vecSize);
+
+    /* =========================================================
+     *
+     * evaluation of a neighbor solution
+     *
+     * ========================================================= */
+
+    moFullEvalByCopy<shiftNeighbor> shiftEval(fullEval);
+
+    /* =========================================================
+     *
+     * the neighborhood of a solution
+     *
+     * ========================================================= */
+
+    rndShiftNeighborhood rndShiftNH((vecSize-1) * (vecSize-1));
+
+    /* =========================================================
+     *
+     * the local search algorithm
+     *
+     * ========================================================= */
+
+    moSA<shiftNeighbor> localSearch1(rndShiftNH, fullEval, shiftEval);
+
+    /* =========================================================
+     *
+     * execute the local search from random solution
+     *
+     * ========================================================= */
+
+    Queen solution1, solution2;
+
+    init(solution1);
+
+    fullEval(solution1);
+
+    std::cout << "#########################################" << std::endl;
+    std::cout << "initial solution1: " << solution1 << std::endl ;
+
+    localSearch1(solution1);
+
+    std::cout << "final solution1: " << solution1 << std::endl ;
+    std::cout << "#########################################" << std::endl;
+
+
+    /* =========================================================
+     *
+     * the cooling schedule of the process
+     *
+     * ========================================================= */
+
+    // initial temp, factor of decrease, number of steps without decrease, final temp.
+    moSimpleCoolingSchedule<Queen> coolingSchedule(1, 0.9, 100, 0.01);
+
+    /* =========================================================
+     *
+     * Comparator of neighbors
+     *
+     * ========================================================= */
+
+    moSolNeighborComparator<shiftNeighbor> solComparator;
+
+    /* =========================================================
+     *
+     * Example of Checkpointing
+     *
+     * ========================================================= */
+
+    moTrueContinuator<shiftNeighbor> continuator;//always continue
+    moCheckpoint<shiftNeighbor> checkpoint(continuator);
+    moFitnessStat<Queen> fitStat;
+    checkpoint.add(fitStat);
+    eoFileMonitor monitor("fitness.out", "");
+    moCounterMonitorSaver countMon(100, monitor);
+    checkpoint.add(countMon);
+    monitor.add(fitStat);
+
+    moSA<shiftNeighbor> localSearch2(rndShiftNH, fullEval, shiftEval, coolingSchedule, solComparator, checkpoint);
+
+    init(solution2);
+
+    fullEval(solution2);
+
+    std::cout << "#########################################" << std::endl;
+    std::cout << "initial solution2: " << solution2 << std::endl ;
+
+    localSearch2(solution2);
+
+    std::cout << "final solution2: " << solution2 << std::endl ;
+    std::cout << "#########################################" << std::endl;
+}
+
+// A main that catches the exceptions
+
+int main(int argc, char **argv)
+{
+    try {
+        main_function(argc, argv);
+    }
+    catch (exception& e) {
+        cout << "Exception: " << e.what() << '\n';
+    }
+    return 1;
+}

branches/rc2.0/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.param

@@ -0,0 +1,11 @@
+
+######                 General    ######
+# --help=0                                 # -h : Prints this message
+# --stopOnUnknownParam=1                   # Stop if unkown param entered
+# --seed=1276172057                        # -S : Random number seed
+
+######    Persistence             ######
+# --status=./testSimulatedAnnealing.status # Status file
+
+######    Representation          ######
+# --vecSize=8                              # -V : Genotype size