Ok ajout des RndRndFC et MHRndFC

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

trunk/paradiseo-mo/src/mo.h

@@ -147,7 +147,8 @@
 #include <sampling/moFDCsampling.h>
 #include <sampling/moNeutralDegreeSampling.h>
 #include <sampling/moFitnessCloudSampling.h>
-#include <sampling/moMHFitnessCloudSampling.h>
+#include <sampling/moRndRndFitnessCloudSampling.h>
+#include <sampling/moMHRndFitnessCloudSampling.h>
 
 #include <problems/bitString/moBitNeighbor.h>
 #include <problems/eval/moOneMaxIncrEval.h>

trunk/paradiseo-mo/src/sampling/moMHRndFitnessCloudSampling.h

@@ -0,0 +1,113 @@
+/*
+  <moMHRndFitnessCloudSampling.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+  Sebastien Verel, Arnaud Liefooghe, Jeremie 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 moMHRndFitnessCloudSampling_h
+#define moMHRndFitnessCloudSampling_h
+
+#include <eoInit.h>
+#include <neighborhood/moNeighborhood.h>
+#include <eval/moEval.h>
+#include <eoEvalFunc.h>
+#include <algo/moMetropolisHasting.h>
+#include <continuator/moNeighborFitnessStat.h>
+#include <sampling/moFitnessCloudSampling.h>
+
+/**
+ * To compute an estimation of the fitness cloud, 
+ *   i.e. the scatter plot of solution fitness versus neighbor fitness: 
+ *
+ *   Here solution are sampled with Metropolis-Hasting method
+ *
+ *   Sample the fitness of solutions from Metropolis-Hasting sampling
+ *   and the fitness of one random neighbor
+ *
+ *   The values are collected during the random search
+ * 
+ */
+template <class Neighbor>
+class moMHRndFitnessCloudSampling : public moFitnessCloudSampling<Neighbor>
+{
+public:
+  typedef typename Neighbor::EOT EOT ;
+  
+  using moSampling<Neighbor>::localSearch;
+  using moSampling<Neighbor>::checkpoint;
+  using moSampling<Neighbor>::monitorVec;
+  using moSampling<Neighbor>::continuator;
+  using moFitnessCloudSampling<Neighbor>::fitnessStat;
+
+  /**
+   * Default Constructor
+   * @param _init initialisation method of the solution
+   * @param _neighborhood neighborhood to get one random neighbor (supposed to be random neighborhood)
+   * @param _fullEval Fitness function, full evaluation function
+   * @param _eval neighbor evaluation, incremental evaluation function
+   * @param _nbStep Number of step of the MH sampling
+   */
+  moMHRndFitnessCloudSampling(eoInit<EOT> & _init, 
+			  moNeighborhood<Neighbor> & _neighborhood, 
+			  eoEvalFunc<EOT>& _fullEval, 
+			  moEval<Neighbor>& _eval, 
+			  unsigned int _nbStep) : 
+    moFitnessCloudSampling<Neighbor>(_init, _neighborhood, _fullEval, _eval, _nbStep),
+    neighborFitnessStat(_neighborhood, _eval)
+  {
+    // delete the dummy local search
+    delete localSearch;
+    
+    // random sampling
+    localSearch = new moMetropolisHasting<Neighbor>(_neighborhood, _fullEval, _eval, _nbStep);
+
+    // delete the checkpoint with the wrong continuator
+    delete checkpoint;
+
+    // set the continuator
+    continuator = localSearch->getContinuator();
+
+    // re-construction of the checkpoint
+    checkpoint = new moCheckpoint<Neighbor>(*continuator);
+    checkpoint->add(fitnessStat);
+    checkpoint->add(*monitorVec[0]);
+
+    // one random neighbor
+    add(neighborFitnessStat);
+  }
+
+protected:
+  moNeighborFitnessStat< Neighbor > neighborFitnessStat;
+
+};
+
+
+#endif

trunk/paradiseo-mo/src/sampling/moRndRndFitnessCloudSampling.h

@@ -60,6 +60,10 @@ public:
   typedef typename Neighbor::EOT EOT ;
   
   using moSampling<Neighbor>::localSearch;
+  using moSampling<Neighbor>::checkpoint;
+  using moSampling<Neighbor>::monitorVec;
+  using moSampling<Neighbor>::continuator;
+  using moFitnessCloudSampling<Neighbor>::fitnessStat;
 
   /**
    * Default Constructor
@@ -83,6 +87,17 @@ public:
     // random sampling
     localSearch = new moRandomSearch<Neighbor>(_init, _fullEval, _nbSol);
 
+    // delete the checkpoint with the wrong continuator
+    delete checkpoint;
+
+    // set the continuator
+    continuator = localSearch->getContinuator();
+
+    // re-construction of the checkpoint
+    checkpoint = new moCheckpoint<Neighbor>(*continuator);
+    checkpoint->add(fitnessStat);
+    checkpoint->add(*monitorVec[0]);
+
     // one random neighbor
     add(neighborFitnessStat);
   }

trunk/paradiseo-mo/src/sampling/moSampling.h

@@ -93,7 +93,7 @@ public:
     checkpoint->add(_stat);
 
     if (_monitoring) {
-      moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat); // attention fuite memoire a la descruction !
+      moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat); 
       monitorVec.push_back(monitor);
       checkpoint->add(*monitor);
     }
@@ -117,8 +117,6 @@ public:
     // initialisation of the solution
     init(solution);
 
-    std::cout << localSearch->className() << std::endl;
-
     // compute the sampling
     (*localSearch)(solution);
 

trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp

@@ -38,7 +38,7 @@ using namespace std;
 //-----------------------------------------------------------------------------
 // the sampling class
 #include <sampling/moRndRndFitnessCloudSampling.h>
-//#include <sampling/moMHFitnessCloudSampling.h>
+#include <sampling/moMHRndFitnessCloudSampling.h>
 
 // Declaration of types
 //-----------------------------------------------------------------------------
@@ -165,8 +165,8 @@ void main_function(int argc, char **argv)
   //    - neighbor evaluation
   //    - number of solutions to sample
 
-  moRndRndFitnessCloudSampling<Neighbor> sampling(random, neighborhood, fullEval, neighborEval, nbSol);
-  //moMHFitnessCloudSampling<Neighbor> sampling(random, neighborhood, fullEval, neighborEval, nbSol);
+  //  moRndRndFitnessCloudSampling<Neighbor> sampling(random, neighborhood, fullEval, neighborEval, nbSol);
+  moMHRndFitnessCloudSampling<Neighbor> sampling(random, neighborhood, fullEval, neighborEval, nbSol);
   
   /* =========================================================
    *