From 36fa6a1c5772d575a5591b51467fa3f01fe51e56 Mon Sep 17 00:00:00 2001 From: marieeleonore Date: Wed, 10 Nov 2010 16:37:25 +0000 Subject: [PATCH] Add 3 statistics moUnsignedStat moBooleanStat moBestFitnessStat git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1998 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/continuator/moBestFitnessStat.h | 95 +++++++++++++++++++ .../src/continuator/moBooleanStat.h | 82 ++++++++++++++++ .../src/continuator/moFullEvalContinuator.h | 2 +- .../src/continuator/moUnsignedStat.h | 82 ++++++++++++++++ 4 files changed, 260 insertions(+), 1 deletion(-) create mode 100644 trunk/paradiseo-mo/src/continuator/moBestFitnessStat.h create mode 100644 trunk/paradiseo-mo/src/continuator/moBooleanStat.h create mode 100644 trunk/paradiseo-mo/src/continuator/moUnsignedStat.h diff --git a/trunk/paradiseo-mo/src/continuator/moBestFitnessStat.h b/trunk/paradiseo-mo/src/continuator/moBestFitnessStat.h new file mode 100644 index 000000000..192919c88 --- /dev/null +++ b/trunk/paradiseo-mo/src/continuator/moBestFitnessStat.h @@ -0,0 +1,95 @@ +/* + + 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 + +/** + * The statistic which save the best solution found during the search + */ +template +class moBestFitnessStat : public moStat +{ +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(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 diff --git a/trunk/paradiseo-mo/src/continuator/moBooleanStat.h b/trunk/paradiseo-mo/src/continuator/moBooleanStat.h new file mode 100644 index 000000000..c99b03988 --- /dev/null +++ b/trunk/paradiseo-mo/src/continuator/moBooleanStat.h @@ -0,0 +1,82 @@ +/* + + 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 + +/** + * The statistic gives from a boolean variable + */ +template +class moBooleanStat : public moStat +{ +public : + using moStat< EOT, bool>::value; + + /** + * Default Constructor + */ + moBooleanStat(bool & _b): moStat(_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 diff --git a/trunk/paradiseo-mo/src/continuator/moFullEvalContinuator.h b/trunk/paradiseo-mo/src/continuator/moFullEvalContinuator.h index bdcf82360..5239c1dea 100644 --- a/trunk/paradiseo-mo/src/continuator/moFullEvalContinuator.h +++ b/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; } /** diff --git a/trunk/paradiseo-mo/src/continuator/moUnsignedStat.h b/trunk/paradiseo-mo/src/continuator/moUnsignedStat.h new file mode 100644 index 000000000..ce80fc1be --- /dev/null +++ b/trunk/paradiseo-mo/src/continuator/moUnsignedStat.h @@ -0,0 +1,82 @@ +/* + + 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 + +/** + * The statistic gives from a boolean variable + */ +template +class moUnsignedStat : public moStat +{ +public : + using moStat< EOT, unsigned int>::value; + + /** + * Default Constructor + */ + moUnsignedStat(unsigned int & _b): moStat(_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