Add 3 statistics moUnsignedStat moBooleanStat moBestFitnessStat

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

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

@@ -0,0 +1,95 @@
+/*
+  <moBestFitnessStat.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 moBestFitnessStat_h
+#define moBestFitnessStat_h
+
+#include <continuator/moStat.h>
+
+/**
+ * The statistic which save the best solution found during the search
+ */
+template <class EOT>
+class moBestFitnessStat : public moStat<EOT, typename EOT::Fitness>
+{
+public :
+    typedef typename EOT::Fitness Fitness;
+    using moStat< EOT , typename EOT::Fitness >::value;
+
+    /**
+     * Default Constructor
+     * @param _reInitSol when true the best so far is reinitialized
+     */
+    moBestFitnessStat(bool _reInitSol = true): moStat<EOT, typename EOT::Fitness>(Fitness(), "best"), reInitSol(_reInitSol), firstTime(true) {
+    }
+
+    /**
+     * Initialization of the best solution on the first one
+     * @param _sol the first solution
+     */
+    virtual void init(EOT & _sol) {
+    	if (reInitSol)
+    		value() = _sol.fitness();
+    	else if (firstTime)
+			{
+    			value() = _sol.fitness();
+    			firstTime = false;
+    		}
+    }
+
+    /**
+     * Update the best solution
+     * @param _sol the current solution
+     */
+    virtual void operator()(EOT & _sol) {
+        if (value() < _sol.fitness())
+        {
+            value() = _sol.fitness();
+        }
+    }
+
+    /**
+     * @return name of the class
+     */
+    virtual std::string className(void) const {
+        return "moBestFitnessStat";
+    }
+
+protected:
+    bool reInitSol;
+    bool firstTime;
+
+};
+
+#endif

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

@@ -0,0 +1,82 @@
+/*
+  <moBooleanStat.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 moBooleanStat_h
+#define moBooleanStat_h
+
+#include <continuator/moStat.h>
+
+/**
+ * The statistic gives from a boolean variable
+ */
+template <class EOT>
+class moBooleanStat : public moStat<EOT, bool>
+{
+public :
+    using moStat< EOT, bool>::value;
+
+    /**
+     * Default Constructor
+     */
+    moBooleanStat(bool & _b): moStat<EOT, bool>(_b, "boolean"), b(_b) {
+    }
+
+    /**
+     * Init the number of iteration
+     * @param _sol a solution
+     */
+    virtual void init(EOT & _sol) {
+        value() = b;
+    }
+
+    /**
+     * Set the number of iteration
+     * @param _sol a solution
+     */
+    virtual void operator()(EOT & _sol) {
+        value() = b;
+    }
+
+    /**
+     * @return name of the class
+     */
+    virtual std::string className(void) const {
+        return "moBooleanStat";
+    }
+
+private:
+	bool & b;
+};
+
+#endif

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

@@ -75,7 +75,7 @@ public:
       if (restartCounter)
         nbEval_start = eval.value();
       else
-	nbEval_start = 0;
+    	  nbEval_start = 0;
     }
 
     /**

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

@@ -0,0 +1,82 @@
+/*
+  <moUnsignedStat.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 moUnsignedStat_h
+#define moUnsignedStat_h
+
+#include <continuator/moStat.h>
+
+/**
+ * The statistic gives from a boolean variable
+ */
+template <class EOT>
+class moUnsignedStat : public moStat<EOT, unsigned int>
+{
+public :
+    using moStat< EOT, unsigned int>::value;
+
+    /**
+     * Default Constructor
+     */
+    moUnsignedStat(unsigned int & _b): moStat<EOT, unsigned int>(_b, "unsigned"), b(_b) {
+    }
+
+    /**
+     * Init the number of iteration
+     * @param _sol a solution
+     */
+    virtual void init(EOT & _sol) {
+        value() = b;
+    }
+
+    /**
+     * Set the number of iteration
+     * @param _sol a solution
+     */
+    virtual void operator()(EOT & _sol) {
+        value() = b;
+    }
+
+    /**
+     * @return name of the class
+     */
+    virtual std::string className(void) const {
+        return "moUnsignedStat";
+    }
+
+private:
+	unsigned int & b;
+};
+
+#endif