Add problems directory and rename SimpleHCneutralExplorer in RamdomBestHCExplorer

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

trunk/paradiseo-mo/src/explorer/moHCneutralExplorer.h

@@ -35,7 +35,7 @@
 #ifndef _moHCneutralExplorer_h
 #define _moHCneutralExplorer_h
 
-#include <explorer/moSimpleHCneutralExplorer.h>
+#include <explorer/moRandomBestHCExplorer.h>
 #include <comparator/moNeighborComparator.h>
 #include <comparator/moSolNeighborComparator.h>
 #include <neighborhood/moNeighborhood.h>
@@ -44,18 +44,18 @@
  * Explorer for a neutral Hill-climbing
  */
 template< class Neighbor >
-class moHCneutralExplorer : public moSimpleHCneutralExplorer<Neighbor>
+class moHCneutralExplorer : public moRandomBestHCExplorer<Neighbor>
 {
 public:
     typedef typename Neighbor::EOT EOT ;
     typedef moNeighborhood<Neighbor> Neighborhood ;
 
     using moNeighborhoodExplorer<Neighbor>::neighborhood;
-    using moSimpleHCneutralExplorer<Neighbor>::solNeighborComparator;
-    using moSimpleHCneutralExplorer<Neighbor>::isAccept;
-    using moSimpleHCneutralExplorer<Neighbor>::bestVector;
-    using moSimpleHCneutralExplorer<Neighbor>::initParam;
-    using moSimpleHCneutralExplorer<Neighbor>::updateParam;
+    using moRandomBestHCExplorer<Neighbor>::solNeighborComparator;
+    using moRandomBestHCExplorer<Neighbor>::isAccept;
+    using moRandomBestHCExplorer<Neighbor>::bestVector;
+    using moRandomBestHCExplorer<Neighbor>::initParam;
+    using moRandomBestHCExplorer<Neighbor>::updateParam;
 
     /**
      * Constructor
@@ -70,7 +70,7 @@ public:
                         moNeighborComparator<Neighbor>& _neighborComparator,
                         moSolNeighborComparator<Neighbor>& _solNeighborComparator,
                         unsigned _nbStep) :
-            moSimpleHCneutralExplorer<Neighbor>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator),
+                        	moRandomBestHCExplorer<Neighbor>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator),
             nbStep(_nbStep) {
         //Some cycle is possible with equals fitness solutions if the neighborhood is not random
         if (!neighborhood.isRandom()) {
@@ -88,7 +88,7 @@ public:
      *  initial number of step
      */
     virtual void initParam(EOT & solution) {
-        moSimpleHCneutralExplorer<Neighbor>::initParam(solution);
+    	moRandomBestHCExplorer<Neighbor>::initParam(solution);
 
         step = 0;
     };
@@ -97,7 +97,7 @@ public:
      * one more step
      */
     virtual void updateParam(EOT & solution) {
-        moSimpleHCneutralExplorer<Neighbor>::updateParam(solution);
+    	moRandomBestHCExplorer<Neighbor>::updateParam(solution);
 
         step++;
     };

trunk/paradiseo-mo/src/explorer/moILSexplorer.h

@@ -48,12 +48,12 @@
  * Explorer for an Iterated Local Search
  */
 template< class Neighbor >
-class moILSexplorer : public moNeighborhoodExplorer< moDummyNeighbor<typename Neighbor::EOT, typename Neighbor::EOT::Fitness> >
+class moILSexplorer : public moNeighborhoodExplorer< moDummyNeighbor<typename Neighbor::EOT> >
 {
 public:
     typedef moNeighborhood<Neighbor> Neighborhood ;
     typedef typename Neighbor::EOT EOT;
-	typedef moDummyNeighbor<EOT,typename EOT::Fitness> dummyNeighbor;
+	typedef moDummyNeighbor<EOT> dummyNeighbor;
 	typedef moDummyNeighborhood<dummyNeighbor> dummyNeighborhood;
 
 	/**

trunk/paradiseo-mo/src/explorer/moRandomBestHCExplorer.h

@@ -0,0 +1,194 @@
+/*
+  <moRandomBestHCExplorer.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+  Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
+
+  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 _moRandomBestHCExplorer_h
+#define _moRandomBestHCExplorer_h
+
+#include <explorer/moNeighborhoodExplorer.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
+#include <neighborhood/moNeighborhood.h>
+#include <vector>
+#include <utils/eoRNG.h>
+
+/**
+ * Explorer for a simple neutral Hill-climbing
+ */
+template< class Neighbor >
+class moRandomBestHCExplorer : public moNeighborhoodExplorer<Neighbor>
+{
+public:
+    typedef typename Neighbor::EOT EOT ;
+    typedef moNeighborhood<Neighbor> Neighborhood ;
+
+    using moNeighborhoodExplorer<Neighbor>::neighborhood;
+    using moNeighborhoodExplorer<Neighbor>::eval;
+
+    /**
+     * Constructor
+     * @param _neighborhood the neighborhood
+     * @param _eval the evaluation function
+     * @param _neighborComparator a neighbor comparator
+     * @param _solNeighborComparator solution vs neighbor comparator
+     */
+    moRandomBestHCExplorer(Neighborhood& _neighborhood,
+                              moEval<Neighbor>& _eval,
+                              moNeighborComparator<Neighbor>& _neighborComparator,
+                              moSolNeighborComparator<Neighbor>& _solNeighborComparator) :
+            moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval),
+            neighborComparator(_neighborComparator),
+            solNeighborComparator(_solNeighborComparator) {
+        isAccept = false;
+        current=new Neighbor();
+    }
+
+    /**
+     * Destructor
+     */
+    ~moRandomBestHCExplorer() {
+        delete current;
+    }
+
+    /**
+     * empty the vector of best solutions
+     */
+    virtual void initParam(EOT & solution) {
+        // delete all the best solutions
+        bestVector.clear();
+    };
+
+    /**
+     * empty the vector of best solutions
+     */
+    virtual void updateParam(EOT & solution) {
+        // delete all the best solutions
+        bestVector.clear();
+    };
+
+    /**
+     * terminate: NOTHING TO DO
+     */
+    virtual void terminate(EOT & solution) {};
+
+    /**
+     * Explore the neighborhood of a solution
+     * @param _solution
+     */
+    virtual void operator()(EOT & _solution) {
+
+        //Test if _solution has a Neighbor
+        if (neighborhood.hasNeighbor(_solution)) {
+            //init the first neighbor
+            neighborhood.init(_solution, (*current));
+
+            //eval the _solution moved with the neighbor and stock the result in the neighbor
+            eval(_solution, (*current));
+
+            //initialize the best neighbor
+            bestVector.push_back(*current);
+
+            //test all others neighbors
+            while (neighborhood.cont(_solution)) {
+                //next neighbor
+                neighborhood.next(_solution, (*current));
+
+                //eval
+                eval(_solution, (*current));
+
+                //if we found a better neighbor, update the best
+                if (neighborComparator(bestVector[0], (*current))) {
+                    bestVector.clear();
+                    bestVector.push_back(*current);
+                }
+                else if (neighborComparator.equals((*current), bestVector[0])) //if the current is equals to previous best solutions then update vector of the best solution
+                    bestVector.push_back(*current);
+            }
+        }
+        else {
+            //if _solution hasn't neighbor,
+            isAccept=false;
+        }
+    };
+
+    /**
+     * continue if a move is accepted
+     * @param _solution the solution
+     * @return true if an ameliorated neighbor was be found
+     */
+    virtual bool isContinue(EOT & _solution) {
+        return isAccept ;
+    };
+
+    /**
+     * move the solution with the best neighbor
+     * @param _solution the solution to move
+     */
+    virtual void move(EOT & _solution) {
+        // choose randomly one of the best solutions
+        unsigned int i = rng.random(bestVector.size());
+
+        //move the solution
+        bestVector[i].move(_solution);
+
+        //update its fitness
+        _solution.fitness(bestVector[i].fitness());
+    };
+
+    /**
+     * accept test if an amelirated neighbor was be found
+     * @param _solution the solution
+     * @return true if the best neighbor ameliorate the fitness
+     */
+    virtual bool accept(EOT & _solution) {
+        if (neighborhood.hasNeighbor(_solution))
+            isAccept = solNeighborComparator(_solution, bestVector[0]) ;
+        return isAccept;
+    };
+
+protected:
+    // comparator betwenn solution and neighbor or between neighbors
+    moNeighborComparator<Neighbor>& neighborComparator;
+    moSolNeighborComparator<Neighbor>& solNeighborComparator;
+
+    // the best solutions in the neighborhood
+    std::vector<Neighbor> bestVector;
+    //Pointer on the current neighbor
+    Neighbor* current;
+
+    // true if the move is accepted
+    bool isAccept ;
+};
+
+
+#endif

trunk/paradiseo-mo/src/mo.h

@@ -72,7 +72,7 @@
 #include <explorer/moRandomNeutralWalkExplorer.h>
 #include <explorer/moRandomWalkExplorer.h>
 #include <explorer/moSimpleHCexplorer.h>
-#include <explorer/moSimpleHCneutralExplorer.h>
+#include <explorer/moRandomBestHCExplorer.h>
 #include <explorer/moTSExplorer.h>
 #include <explorer/moILSexplorer.h>
 #include <explorer/moSAexplorer.h>
@@ -90,7 +90,6 @@
 #include <memory/moCountMoveMemory.h>
 
 #include <neighborhood/moBackableNeighbor.h>
-#include <neighborhood/moBitNeighbor.h>
 #include <neighborhood/moIndexNeighbor.h>
 #include <neighborhood/moIndexNeighborhood.h>
 #include <neighborhood/moNeighbor.h>
@@ -112,6 +111,8 @@
 #include <coolingSchedule/moCoolingSchedule.h>
 #include <coolingSchedule/moSimpleCoolingSchedule.h>
 
+#include <problems/bitString/moBitNeighbor.h>
+
 //#include <old/moMove.h>
 //#include <old/moMoveIncrEval.h>
 //#include <old/moMoveInit.h>

trunk/paradiseo-mo/src/problems/bitString/moBitNeighbor.h

@@ -0,0 +1,111 @@
+/*
+  <moBitNeighbor.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+  Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
+
+  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 _bitNeighbor_h
+#define _bitNeighbor_h
+
+#include <ga/eoBit.h>
+#include <neighborhood/moBackableNeighbor.h>
+#include <neighborhood/moIndexNeighbor.h>
+
+/**
+ * Neighbor related to a vector of Bit
+ */
+template< class Fitness >
+class moBitNeighbor : public moBackableNeighbor<eoBit<Fitness> >, public moIndexNeighbor<eoBit<Fitness> >
+{
+public:
+    typedef eoBit<Fitness> EOT ;
+
+    using moBackableNeighbor<EOT>::fitness;
+    using moIndexNeighbor<EOT>::key;
+
+    /**
+     * move the solution
+     * @param _solution the solution to move
+     */
+    virtual void move(EOT & _solution) {
+        _solution[key] = !_solution[key];
+    }
+
+    /**
+     * move back the solution (useful for the evaluation by modif)
+     * @param _solution the solution to move back
+     */
+    virtual void moveBack(EOT & _solution) {
+        _solution[key] = !_solution[key];
+    }
+
+    /**
+     * Return the class id.
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+        return "moBitNeighbor";
+    }
+
+    /**
+     * Read object.\							\
+     * Calls base class, just in case that one had something to do.
+     * The read and print methods should be compatible and have the same format.
+     * In principle, format is "plain": they just print a number
+     * @param _is a std::istream.
+     * @throw runtime_std::exception If a valid object can't be read.
+     */
+    virtual void readFrom(std::istream& _is) {
+        std::string fitness_str;
+        int pos = _is.tellg();
+        _is >> fitness_str;
+        if (fitness_str == "INVALID") {
+            throw std::runtime_error("invalid fitness");
+        }
+        else {
+            Fitness repFit ;
+            _is.seekg(pos); // rewind
+            _is >> repFit;
+            _is >> key;
+            fitness(repFit);
+        }
+    }
+
+    /**
+     * Write object. Called printOn since it prints the object _on_ a stream.
+     * @param _os A std::ostream.
+     */
+    virtual void printOn(std::ostream& _os) const {
+        _os << fitness() << ' ' << key << std::endl;
+    }
+};
+
+#endif

trunk/paradiseo-mo/test/moTestClass.h

@@ -46,7 +46,7 @@
 #include <ga/eoBit.h>
 #include <eoScalarFitness.h>
 #include <neighborhood/moOrderNeighborhood.h>
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 #include <neighborhood/moIndexNeighbor.h>
 
 #include <utils/eoMonitor.h>

trunk/paradiseo-mo/test/t-moBitNeighbor.cpp

@@ -32,7 +32,7 @@
   Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 
 #include <cstdlib>
 #include <cassert>

trunk/paradiseo-mo/test/t-moDistanceStat.cpp

@@ -27,7 +27,7 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
 Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 #include <continuator/moDistanceStat.h>
 #include <utils/eoDistance.h>
 

trunk/paradiseo-mo/test/t-moFitnessStat.cpp

@@ -28,7 +28,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
 #include <continuator/moFitnessStat.h>
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 
 #include <iostream>
 #include <cstdlib>

trunk/paradiseo-mo/test/t-moNeighborComparator.cpp

@@ -32,7 +32,7 @@
   Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 #include <comparator/moNeighborComparator.h>
 #include <ga/eoBit.h>
 #include <eoScalarFitness.h>

trunk/paradiseo-mo/test/t-moOrderNeighborhood.cpp

@@ -33,7 +33,7 @@
 */
 
 #include <neighborhood/moOrderNeighborhood.h>
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 #include <ga/eoBit.h>
 
 #include <cstdlib>

trunk/paradiseo-mo/test/t-moRndWithReplNeighborhood.cpp

@@ -28,7 +28,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
 #include <neighborhood/moRndWithReplNeighborhood.h>
-#include <neighborhood/moBitNeighbor.h>
 
 #include "moTestClass.h"
 #include <iostream>

trunk/paradiseo-mo/test/t-moRndWithoutReplNeighborhood.cpp

@@ -28,7 +28,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
 #include <neighborhood/moRndWithoutReplNeighborhood.h>
-#include <neighborhood/moBitNeighbor.h>
 
 #include "moTestClass.h"
 #include <iostream>

trunk/paradiseo-mo/test/t-moSimpleHCneutralExplorer.cpp

@@ -1,5 +1,5 @@
 /*
-<t-moSimpleHCneutralExplorer.cpp>
+<t-moRandomBestHCExplorer.cpp>
 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
 
 Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
@@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <comparator/moNeighborComparator.h>
 #include <comparator/moSolNeighborComparator.h>
-#include <explorer/moSimpleHCneutralExplorer.h>
+#include <explorer/moRandomBestHCExplorer.h>
 #include "moTestClass.h"
 
 #include <iostream>
@@ -38,7 +38,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 int main() {
 
-    std::cout << "[t-moSimpleHCneutralExplorer] => START" << std::endl;
+    std::cout << "[t-moRandomBestHCExplorer] => START" << std::endl;
 
     //instanciation
     eoBit<eoMinimizingFitness> sol(4, true);
@@ -48,7 +48,7 @@ int main() {
     moNeighborComparator<bitNeighbor> ncomp;
     moSolNeighborComparator<bitNeighbor> sncomp;
 
-    moSimpleHCneutralExplorer<bitNeighbor> test(nh, eval, ncomp, sncomp);
+    moRandomBestHCExplorer<bitNeighbor> test(nh, eval, ncomp, sncomp);
 
     //test qu'on ameliore bien a chaque itération
     test.initParam(sol);
@@ -94,7 +94,7 @@ int main() {
     test.updateParam(sol);
 
 
-    std::cout << "[t-moSimpleHCneutralExplorer] => OK" << std::endl;
+    std::cout << "[t-moRandomBestHCExplorer] => OK" << std::endl;
 
     return EXIT_SUCCESS;
 }

trunk/paradiseo-mo/test/t-moSolNeighborComparator.cpp

@@ -32,7 +32,7 @@
   Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 #include <eoScalarFitness.h>
 #include <comparator/moSolNeighborComparator.h>
 #include <ga/eoBit.h>

trunk/paradiseo-mo/tutorial/CMakeLists.txt

@@ -1 +1 @@
-#ADD_SUBDIRECTORY(oneMax)
+ADD_SUBDIRECTORY(oneMax)

trunk/paradiseo-mo/tutorial/oneMax/application/CMakeLists.txt

@@ -7,7 +7,7 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
 ADD_EXECUTABLE(testSimpleHC testSimpleHC.cpp) 
 ADD_EXECUTABLE(testFirstImpr testFirstImpr.cpp) 
 ADD_EXECUTABLE(testRandomWalk testRandomWalk.cpp) 
-ADD_EXECUTABLE(testSimpleHCneutral testSimpleHCneutral.cpp) 
+ADD_EXECUTABLE(testRandomBestHC testRandomBestHC.cpp) 
 ADD_EXECUTABLE(testHCneutral testHCneutral.cpp) 
 ADD_EXECUTABLE(testMetropolisHasting testMetropolisHasting.cpp) 
 #ADD_EXECUTABLE(testWithMove testWithMove.cpp) 
@@ -19,7 +19,7 @@ ADD_EXECUTABLE(testSimulatedAnnealing testSimulatedAnnealing.cpp)
 TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testRandomWalk eoutils ga eo) 
-TARGET_LINK_LIBRARIES(testSimpleHCneutral eoutils ga eo) 
+TARGET_LINK_LIBRARIES(testRandomBestHC eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testHCneutral eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testMetropolisHasting eoutils ga eo) 
 #TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo) 

trunk/paradiseo-mo/tutorial/oneMax/application/testILS.cpp

@@ -194,9 +194,9 @@ void main_function(int argc, char **argv)
 
     moILSexplorer< Neighbor > explorerILS(hc, perturb, accept);
 
-    moIterContinuator<moDummyNeighbor<Indi, Indi::Fitness> > continuatorILS(100);
+    moIterContinuator<moDummyNeighbor<Indi> > continuatorILS(100);
 
-    moLocalSearch<moDummyNeighbor<Indi, Indi::Fitness> >localSearch(explorerILS, continuatorILS, eval);
+    moLocalSearch<moDummyNeighbor<Indi> >localSearch(explorerILS, continuatorILS, eval);
 
 
     /* =========================================================

trunk/paradiseo-mo/tutorial/oneMax/application/testRandomBestHC.cpp

@@ -0,0 +1,197 @@
+//-----------------------------------------------------------------------------
+/** testRandomBestHC.cpp
+ *
+ * SV - 24/01/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;
+
+//-----------------------------------------------------------------------------
+// fitness function
+#include <funcOneMax.h>
+#include <eoInt.h>
+#include <neighborhood/moOrderNeighborhood.h>
+#include <oneMaxBitNeighbor.h>
+
+#include <eval/moFullEvalByModif.h>
+#include <eval/moFullEvalByCopy.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
+#include <continuator/moTrueContinuator.h>
+#include <algo/moLocalSearch.h>
+#include <explorer/moRandomBestHCExplorer.h>
+
+// REPRESENTATION
+//-----------------------------------------------------------------------------
+typedef eoBit<unsigned> Indi;
+typedef moBitNeighbor<unsigned int> Neighbor ; // incremental evaluation
+typedef moOrderNeighborhood<Neighbor> Neighborhood ;
+
+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 aways get the same result, NOT a random run
+    rng.reseed(seed);
+
+
+    /* =========================================================
+     *
+     * Eval fitness function
+     *
+     * ========================================================= */
+
+    FuncOneMax<Indi> eval(vecSize);
+
+
+    /* =========================================================
+     *
+     * Initilisation of the solution
+     *
+     * ========================================================= */
+
+    // a Indi random initializer
+    eoUniformGenerator<bool> uGen;
+    eoInitFixedLength<Indi> random(vecSize, uGen);
+
+
+    /* =========================================================
+     *
+     * evaluation of a neighbor solution
+     *
+     * ========================================================= */
+
+    moFullEvalByModif<Neighbor> fulleval(eval);
+
+    //An eval by copy can be used instead of the eval by modif
+    //moFullEvalByCopy<Neighbor> fulleval(eval);
+
+
+    /* =========================================================
+     *
+     * Comparator of neighbors
+     *
+     * ========================================================= */
+
+    moNeighborComparator<Neighbor> comparator;
+    moSolNeighborComparator<Neighbor> solComparator;
+
+
+    /* =========================================================
+     *
+     * the neighborhood of a solution
+     *
+     * ========================================================= */
+
+    Neighborhood neighborhood(vecSize);
+
+
+    /* =========================================================
+     *
+     * a neighborhood explorer solution
+     *
+     * ========================================================= */
+
+    moRandomBestHCExplorer<Neighbor> explorer(neighborhood, fulleval, comparator, solComparator);
+
+
+    /* =========================================================
+     *
+     * the local search algorithm
+     *
+     * ========================================================= */
+
+    moTrueContinuator<Neighbor> continuator;//always continue
+
+    moLocalSearch<Neighbor> localSearch(explorer, continuator, eval);
+
+    /* =========================================================
+     *
+     * execute the local search from random sollution
+     *
+     * ========================================================= */
+
+    Indi solution;
+
+    random(solution);
+
+    //Can be eval here, else it will be done at the beginning of the localSearch
+    //eval(solution);
+
+    std::cout << "initial: " << solution << std::endl ;
+
+    localSearch(solution);
+
+    std::cout << "final:   " << solution << 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;
+}

trunk/paradiseo-mo/tutorial/oneMax/application/testRandomNeutralWalk.cpp

@@ -26,7 +26,7 @@ using namespace std;
 #include <funcRoyalRoad.h>
 #include <eoInt.h>
 #include <neighborhood/moRndWithoutReplNeighborhood.h>
-#include <neighborhood/moBitNeighbor.h>
+#include <problems/bitString/moBitNeighbor.h>
 
 #include <eval/moFullEvalByModif.h>
 #include <eval/moFullEvalByCopy.h>