From e25dcd2f8f5b46974519d3f159267a2e83ecba88 Mon Sep 17 00:00:00 2001
From: verel <verel@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 19 Feb 2010 17:11:20 +0000
Subject: [PATCH] Ajout de la statistique distance pour pouvoir calculer le FDC

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1686 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../newMo/src/continuator/moDistanceStat.h    | 71 +++++++++++++++++++
 .../oneMax/application/testRandomWalk.cpp     | 13 +++-
 2 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 branches/newMo/src/continuator/moDistanceStat.h

diff --git a/branches/newMo/src/continuator/moDistanceStat.h b/branches/newMo/src/continuator/moDistanceStat.h
new file mode 100644
index 000000000..3e639115d
--- /dev/null
+++ b/branches/newMo/src/continuator/moDistanceStat.h
@@ -0,0 +1,71 @@
+/*
+  <moDistanceStat.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 moDistanceStat_h
+#define moDistanceStat_h
+
+#include <utils/eoDistance.h>
+#include <continuator/moStat.h>
+
+/**
+ * The statistic gives the distance to a reference solution
+ * The reference solution could be the global optimum, or the best knowed solution
+ * It allows to compute the Fitness-Distance correlation (FDC)
+*/
+template <class EOT, class T = double>
+class moDistanceStat : public moStat<EOT, T>
+{
+public :
+    using moStat< EOT, T >::value;
+
+  moDistanceStat(eoDistance<EOT> & _dist, EOT & _ref)
+    : moStat<EOT, T>(0, "distance"), dist(_dist), refSolution(_ref)
+  {}
+
+  virtual void operator()(EOT & _sol)
+  {
+    value() = dist(_sol, refSolution);
+  }
+
+  virtual std::string className(void) const { return "moDistanceStat"; }
+
+private:
+  eoDistance<EOT> & dist;
+  // the reference solution does not change during the run
+  // it could be the best solution knowed of the problem
+  EOT refSolution;
+
+};
+
+#endif
diff --git a/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp b/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp
index cc2a54476..a94698d14 100644
--- a/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp
+++ b/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp
@@ -36,6 +36,8 @@ using namespace std;
 #include <continuator/moCheckpoint.h>
 #include <continuator/moFitnessStat.h>
 #include <continuator/moSolutionStat.h>
+#include <utils/eoDistance.h>
+#include <continuator/moDistanceStat.h>
 
 
 #include <utils/eoFileMonitor.h>
@@ -160,19 +162,24 @@ void main_function(int argc, char **argv)
 	moTrueContinuator<Neighborhood> continuator;//always continue
 
 	moFitnessStat<Indi, unsigned> fStat;
-	moSolutionStat<Indi> solStat;
+	eoHammingDistance<Indi> distance;
+	Indi bestSolution(vecSize, true);
+	moDistanceStat<Indi, unsigned> distStat(distance, bestSolution);
+	//	moSolutionStat<Indi> solStat;
 
 	moCheckpoint<Neighborhood> checkpoint(continuator);
 	eoFileMonitor outputfile("out.dat", " ");
 	checkpoint.add(outputfile);
 	checkpoint.add(fStat);
-	checkpoint.add(solStat);
+	checkpoint.add(distStat);
+	//	checkpoint.add(solStat);
 	eoValueParam<unsigned int> genCounter(-1,"Gen");
 	eoIncrementor<unsigned int> increm(genCounter.value());
 	checkpoint.add(increm);
 	outputfile.add(genCounter);
 	outputfile.add(fStat);
-	outputfile.add(solStat);
+	outputfile.add(distStat);
+	//	outputfile.add(solStat);
 
 	moLocalSearch< moRandomWalkExplorer<Neighborhood> > localSearch(explorer, checkpoint, eval);