Ajout de la marche aléatoire neutre avec le prg de test.

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

branches/newMo/tutorial/oneMax/application/CMakeLists.txt

@@ -11,6 +11,7 @@ ADD_EXECUTABLE(testSimpleHCneutral testSimpleHCneutral.cpp)
 ADD_EXECUTABLE(testHCneutral testHCneutral.cpp) 
 ADD_EXECUTABLE(testMetropolisHasting testMetropolisHasting.cpp) 
 #ADD_EXECUTABLE(testWithMove testWithMove.cpp) 
+ADD_EXECUTABLE(testRandomNeutralWalk testRandomNeutralWalk.cpp) 
 
 TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo) 
@@ -19,3 +20,4 @@ TARGET_LINK_LIBRARIES(testSimpleHCneutral eoutils ga eo)
 TARGET_LINK_LIBRARIES(testHCneutral eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testMetropolisHasting eoutils ga eo) 
 #TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo) 
+TARGET_LINK_LIBRARIES(testRandomNeutralWalk eoutils ga eo) 

branches/newMo/tutorial/oneMax/application/testFirstImpr.cpp

@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-/** testSimpleHC.cpp
+/** testFirstImpr.cpp
  *
  * SV - 12/01/10 
  *

branches/newMo/tutorial/oneMax/application/testRandomNeutralWalk.cpp

@@ -0,0 +1,278 @@
+//-----------------------------------------------------------------------------
+/** testRandomNeutralWalk.cpp
+ *
+ * SV - 22/02/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 <funcRoyalRoad.h>
+#include <eoInt.h>
+#include <neighborhood/moRndWithoutReplNeighborhood.h>
+#include <neighborhood/moBitNeighbor.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/moRandomNeutralWalkExplorer.h>
+
+#include <continuator/moCheckpoint.h>
+#include <continuator/moFitnessStat.h>
+#include <utils/eoDistance.h>
+#include <continuator/moDistanceStat.h>
+#include <neighborhood/moOrderNeighborhood.h>
+#include <continuator/moNeighborhoodStat.h>
+#include <continuator/moMinNeighborStat.h>
+#include <continuator/moMaxNeighborStat.h>
+#include <continuator/moSecondMomentNeighborStat.h>
+#include <continuator/moNbInfNeighborStat.h>
+#include <continuator/moNbSupNeighborStat.h>
+#include <continuator/moNeutralDegreeNeighborStat.h>
+#include <continuator/moSizeNeighborStat.h>
+
+// REPRESENTATION
+//-----------------------------------------------------------------------------
+typedef eoBit<unsigned> Indi;	
+typedef moBitNeighbor<unsigned int> Neighbor ; // incremental evaluation
+typedef moRndWithoutReplNeighborhood<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();
+
+	eoValueParam<unsigned int> blockSizeParam(2, "blockSize", "Size of block in the royal road", 'k');
+	parser.processParam( blockSizeParam, "Representation" );
+	unsigned blockSize = blockSizeParam.value();
+
+	eoValueParam<unsigned int> stepParam(10, "nbStep", "Number of steps of the random walk", 'n');
+	parser.processParam( stepParam, "Representation" );
+	unsigned nbStep = stepParam.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
+	 *
+	 * ========================================================= */
+
+	FuncRoyalRoad<Indi> eval(vecSize / blockSize, blockSize);
+
+
+	/* =========================================================
+	 *
+	 * Initilisazor of the solution
+	 *
+	 * ========================================================= */
+
+	// a Indi random initializer
+	eoUniformGenerator<bool> uGen;
+	eoInitFixedLength<Indi> random(vecSize, uGen);
+
+
+	/* =========================================================
+	 *
+	 * Evaluation of a neighbor solution
+	 *
+	 * ========================================================= */
+
+	moFullEvalByModif<Neighbor> nhEval(eval);
+
+	//An eval by copy can be used instead of the eval by modif
+	//moFullEvalByCopy<Neighbor> nhEval(eval);
+
+
+	/* =========================================================
+	 *
+	 * Comparator of neighbors
+	 *
+	 * ========================================================= */
+
+	moNeighborComparator<Neighbor> comparator;
+	moSolNeighborComparator<Neighbor> solComparator;
+
+
+	/* =========================================================
+	 *
+	 * the neighborhood of a solution
+	 *
+	 * ========================================================= */
+
+	Neighborhood neighborhood(vecSize);
+
+
+	/* =========================================================
+	 *
+	 * a neighborhood explorer solution
+	 *
+	 * ========================================================= */
+  
+	moRandomNeutralWalkExplorer<Neighborhood> explorer(neighborhood, nhEval, solComparator, nbStep);
+
+
+	/* =========================================================
+	 *
+	 * initial random solution
+	 *
+	 * ========================================================= */
+
+	Indi solution;
+
+	random(solution);
+
+	//Can be eval here, else it will be done at the beginning of the localSearch
+	eval(solution);
+
+	/* =========================================================
+	 *
+	 * the continuator and the checkpoint
+	 *
+	 * ========================================================= */
+
+	moTrueContinuator<Neighborhood> continuator;//always continue
+
+	moCheckpoint<Neighborhood> checkpoint(continuator);
+
+	moFitnessStat<Indi, unsigned> fStat;
+
+	eoHammingDistance<Indi> distance;
+	moDistanceStat<Indi, unsigned> distStat(distance, solution);  // distance from the intial solution
+	
+	moOrderNeighborhood<Neighbor> nh(vecSize);
+	moNeigborhoodStat< moOrderNeighborhood<Neighbor> > neighborhoodStat(nh, nhEval, comparator, solComparator);
+	moMinNeighborStat< moOrderNeighborhood<Neighbor> > minStat(neighborhoodStat);
+	moSecondMomentNeighborStat< moOrderNeighborhood<Neighbor> > secondMomentStat(neighborhoodStat);
+	moMaxNeighborStat< moOrderNeighborhood<Neighbor> > maxStat(neighborhoodStat);
+
+	moNbSupNeighborStat< moOrderNeighborhood<Neighbor> > nbSupStat(neighborhoodStat);
+	moNbInfNeighborStat< moOrderNeighborhood<Neighbor> > nbInfStat(neighborhoodStat);
+	moNeutralDegreeNeighborStat< moOrderNeighborhood<Neighbor> > ndStat(neighborhoodStat);
+	moSizeNeighborStat< moOrderNeighborhood<Neighbor> > sizeStat(neighborhoodStat);
+
+	eoValueParam<unsigned int> genCounter(-1,"Gen");
+	eoIncrementor<unsigned int> increm(genCounter.value());
+
+	checkpoint.add(fStat);
+	checkpoint.add(distStat);
+	checkpoint.add(neighborhoodStat);
+	checkpoint.add(minStat);
+	checkpoint.add(secondMomentStat);
+	checkpoint.add(maxStat);
+	checkpoint.add(nbInfStat);
+	checkpoint.add(ndStat);
+	checkpoint.add(nbSupStat);
+	checkpoint.add(sizeStat);
+	checkpoint.add(increm);
+
+	eoFileMonitor outputfile("out.dat", " ");
+	checkpoint.add(outputfile);
+
+	outputfile.add(genCounter);
+	outputfile.add(fStat);
+	outputfile.add(distStat);
+	outputfile.add(minStat);
+	outputfile.add(secondMomentStat);
+	outputfile.add(maxStat);
+	outputfile.add(nbInfStat);
+	outputfile.add(ndStat);
+	outputfile.add(nbSupStat);
+	outputfile.add(sizeStat);
+
+	/* =========================================================
+	 *
+	 * the local search algorithm
+	 *
+	 * ========================================================= */
+
+	moLocalSearch< moRandomNeutralWalkExplorer<Neighborhood> > localSearch(explorer, checkpoint, eval);
+
+	/* =========================================================
+	 *
+	 * execute the local search from random sollution
+	 *
+	 * ========================================================= */
+
+	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;
+}

branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp

@@ -38,17 +38,6 @@ using namespace std;
 #include <continuator/moSolutionStat.h>
 #include <utils/eoDistance.h>
 #include <continuator/moDistanceStat.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moOrderNeighborhood.h>
-#include <continuator/moNeighborhoodStat.h>
-#include <continuator/moMinNeighborStat.h>
-#include <continuator/moMaxNeighborStat.h>
-#include <continuator/moSecondMomentNeighborStat.h>
-#include <continuator/moNbInfNeighborStat.h>
-#include <continuator/moNbSupNeighborStat.h>
-#include <continuator/moNeutralDegreeNeighborStat.h>
-#include <continuator/moSizeNeighborStat.h>
 
 #include <utils/eoFileMonitor.h>
 #include <utils/eoUpdater.h>
@@ -179,29 +168,9 @@ void main_function(int argc, char **argv)
 	moDistanceStat<Indi, unsigned> distStat(distance, bestSolution);
 	//	moSolutionStat<Indi> solStat;
 	
-	moNeighborComparator<Neighbor> comparator;
-	moSolNeighborComparator<Neighbor> solComparator;
-	moOrderNeighborhood<Neighbor> nh(vecSize);
-	moNeigborhoodStat< moOrderNeighborhood<Neighbor> > neighborhoodStat(nh, nhEval, comparator, solComparator);
-	moMinNeighborStat< moOrderNeighborhood<Neighbor> > minStat(neighborhoodStat);
-	moMaxNeighborStat< moOrderNeighborhood<Neighbor> > maxStat(neighborhoodStat);
-	moSecondMomentNeighborStat< moOrderNeighborhood<Neighbor> > secondMomentStat(neighborhoodStat);
-	moNbSupNeighborStat< moOrderNeighborhood<Neighbor> > nbSupStat(neighborhoodStat);
-	moNbInfNeighborStat< moOrderNeighborhood<Neighbor> > nbInfStat(neighborhoodStat);
-	moNeutralDegreeNeighborStat< moOrderNeighborhood<Neighbor> > ndStat(neighborhoodStat);
-	moSizeNeighborStat< moOrderNeighborhood<Neighbor> > sizeStat(neighborhoodStat);
-
 	checkpoint.add(fStat);
 	checkpoint.add(distStat);
 	//	checkpoint.add(solStat);
-	checkpoint.add(neighborhoodStat);
-	checkpoint.add(minStat);
-	checkpoint.add(maxStat);
-	checkpoint.add(secondMomentStat);
-	checkpoint.add(nbInfStat);
-	checkpoint.add(nbSupStat);
-	checkpoint.add(ndStat);
-	checkpoint.add(sizeStat);
 
 	eoValueParam<unsigned int> genCounter(-1,"Gen");
 	eoIncrementor<unsigned int> increm(genCounter.value());
@@ -214,21 +183,15 @@ void main_function(int argc, char **argv)
 	outputfile.add(fStat);
 	outputfile.add(distStat);
 	//	outputfile.add(solStat);
-	outputfile.add(minStat);
-	outputfile.add(maxStat);
-	outputfile.add(secondMomentStat);
-	outputfile.add(nbInfStat);
-	outputfile.add(nbSupStat);
-	outputfile.add(ndStat);
-	outputfile.add(sizeStat);
 
+	Indi solution; // current solution of the search process
+
+	/*
 	// to save the solution at each iteration
 	eoState outState;
 
 	// Register the algorithm into the state (so it has something to save!!
 
-	Indi solution; // current solution of the search process
-
 	outState.registerObject(solution);
 
 	// and feed the state to state savers
@@ -237,6 +200,7 @@ void main_function(int argc, char **argv)
 	
 	  // Don't forget to add the two savers to the checkpoint
 	checkpoint.add(stateSaver);
+	*/
 
 	/* =========================================================
 	 *

branches/newMo/tutorial/oneMax/src/funcRoyalRoad.h

@@ -0,0 +1,40 @@
+// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+
+#ifndef __funcRoyalRoad
+#define __funcRoyalRoad
+
+#include <eoEvalFunc.h>
+
+template< class EOT >
+class FuncRoyalRoad : public eoEvalFunc<EOT>
+{
+  // number of blocks
+  unsigned n;
+
+  // size of a block
+  unsigned k;    
+    
+public:
+  FuncRoyalRoad(unsigned _n, unsigned _k) : n(_n), k(_k) {};
+
+  ~FuncRoyalRoad(void) {} ;
+    
+  virtual void operator() (EOT & _solution)
+  {
+    unsigned sum = 0;
+    unsigned i, j;
+
+    for (i = 0; i < n; i++) {
+      j = 0;
+      while (_solution[i * n + j] && j < k) j++;
+
+      if (j == k)
+	sum++;
+    }
+
+    _solution.fitness(sum);
+  };
+    
+};
+
+#endif