Add the autocorrelation sampling

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

trunk/paradiseo-mo/src/continuator/moFitnessStat.h

@@ -42,35 +42,35 @@
  * that need to be calculated over the solution
  * It is a moStatBase AND an eoValueParam so it can be used in Monitors.
 */
-template <class EOT, class T=typename EOT::Fitness>
-class moFitnessStat : public moStat<EOT, T>
+template <class EOT>
+class moFitnessStat : public moStat<EOT, typename EOT::Fitness>
 {
 public :
-    typedef T Fitness;
-    using moStat< EOT, Fitness >::value;
+  typedef typename EOT::Fitness Fitness;
+  using moStat< EOT, Fitness >::value;
 
-    /**
-     * Default Constructor
-     * @param _description a description of the stat
-     */
-    moFitnessStat(std::string _description = "fitness"):
-            moStat<EOT, Fitness>(Fitness(), _description) {}
-
-    /**
-     * store fitness value
-     * @param _sol the corresponding solution
-     */
-    virtual void operator()(EOT & _sol)
-    {
-        value() = _sol.fitness();
-    }
-
-    /**
-     * @return the name of the class
-     */
-    virtual std::string className(void) const {
-        return "moFitnessStat";
-    }
+  /**
+   * Default Constructor
+   * @param _description a description of the stat
+   */
+  moFitnessStat(std::string _description = "fitness"):
+    moStat<EOT, Fitness>(Fitness(), _description) {}
+  
+  /**
+   * store fitness value
+   * @param _sol the corresponding solution
+   */
+  virtual void operator()(EOT & _sol)
+  {
+    value() = _sol.fitness();
+  }
+  
+  /**
+   * @return the name of the class
+   */
+  virtual std::string className(void) const {
+    return "moFitnessStat";
+  }
 };
 
 #endif

trunk/paradiseo-mo/src/mo.h

@@ -132,6 +132,7 @@
 #include <coolingSchedule/moSimpleCoolingSchedule.h>
 
 #include <sampling/moSampling.h>
+#include <sampling/moAutocorrelationSampling.h>
 
 #include <problems/bitString/moBitNeighbor.h>
 #include <problems/eval/moOneMaxIncrEval.h>

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

@@ -0,0 +1,88 @@
+/*
+  <moAutocorrelationSampling.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 moAutocorrelationSampling_h
+#define moAutocorrelationSampling_h
+
+#include <eoInit.h>
+#include <eval/moEval.h>
+#include <eoEvalFunc.h>
+#include <algo/moRandomWalk.h>
+#include <continuator/moFitnessStat.h>
+#include <sampling/moSampling.h>
+
+/**
+ * To compute the autocorrelation function:
+ *   Perform a random walk based on the neighborhood,
+ *   The fitness values of solutions are collected during the random walk
+ *   The autocorrelation can be computed from the serie of fitness values  
+ * 
+ */
+template <class Neighbor>
+class moAutocorrelationSampling : public moSampling<Neighbor>
+{
+public:
+  typedef typename Neighbor::EOT EOT ;
+  
+  using moSampling<Neighbor>::localSearch;
+
+  /**
+   * Default Constructor
+   * @param _init initialisation method of the solution
+   * @param _neighborhood neighborhood giving neighbor in random order
+   * @param _nbStep Number of steps of the random walk 
+   */
+  moAutocorrelationSampling(eoInit<EOT> & _init, 
+			    moNeighborhood<Neighbor> & _neighborhood, 
+			    eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, 
+			    unsigned int _nbStep) : 
+    moSampling<Neighbor>(_init, * new moRandomWalk<Neighbor>(_neighborhood, _fullEval, _eval, _nbStep), fitnessStat)
+  {
+  }
+
+  /** 
+   * default destructor
+   */
+  ~moAutocorrelationSampling() {
+    // delete the pointer on the local search which has been constructed in the constructor
+    delete &localSearch;
+  }
+
+protected:
+  moFitnessStat<EOT> fitnessStat;
+
+};
+
+
+#endif

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

@@ -41,6 +41,7 @@
 #include <continuator/moStat.h>
 #include <continuator/moCheckpoint.h>
 #include <continuator/moVectorMonitor.h>
+#include <algo/moLocalSearch.h>
 #include <eoInit.h>
 
 /**
@@ -69,10 +70,15 @@ public:
     add(_stat);
   }
 
+  /**
+   * default destructor
+   */
   ~moSampling() {
+    // delete all monitors
     for(unsigned i = 0; i < monitorVec.size(); i++)
       delete monitorVec[i];
 
+    // delete the checkpoint
     delete checkpoint ;
   }