From 0302fd119c77625175f77dac8d47e2c102169543 Mon Sep 17 00:00:00 2001 From: verel Date: Wed, 5 May 2010 09:51:52 +0000 Subject: [PATCH] Ajout the moCounterStat.h git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1782 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/continuator/moCounterStat.h | 84 +++++++++++++++++++ .../paradiseo-mo/src/continuator/moStatBase.h | 3 - .../src/perturb/moLocalSearchInit.h | 2 +- 3 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 trunk/paradiseo-mo/src/continuator/moCounterStat.h diff --git a/trunk/paradiseo-mo/src/continuator/moCounterStat.h b/trunk/paradiseo-mo/src/continuator/moCounterStat.h new file mode 100644 index 000000000..420095b52 --- /dev/null +++ b/trunk/paradiseo-mo/src/continuator/moCounterStat.h @@ -0,0 +1,84 @@ +/* + + 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 moCounterStat_h +#define moCounterStat_h + +#include + +/** + * The statistic gives the number of iteration + */ +template +class moCounterStat : public moStat +{ +public : + using moStat< EOT, unsigned int>::value; + + /** + * Default Constructor + */ + moCounterStat(): moStat(0, "counter") { + counter = 0; + } + + /** + * Give the number of iteration + * @param _sol a solution + */ + virtual void init(EOT & _sol) { + counter = 0; + } + + /** + * Give the number of iteration + * @param _sol a solution + */ + virtual void operator()(EOT & _sol) { + value() = counter; + counter++; + } + + /** + * @return name of the class + */ + virtual std::string className(void) const { + return "moCounterStat"; + } + +private: + unsigned int counter; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/continuator/moStatBase.h b/trunk/paradiseo-mo/src/continuator/moStatBase.h index 8984c5add..8852f15b0 100644 --- a/trunk/paradiseo-mo/src/continuator/moStatBase.h +++ b/trunk/paradiseo-mo/src/continuator/moStatBase.h @@ -41,9 +41,6 @@ /** * Base class for all statistics that need to be calculated * over the solution - * (I guess it is not really necessary? MS. - * Depstd::ends, there might be reasons to have a stat that is not an eoValueParam, - * but maybe I'm just kidding myself, MK) */ template class moStatBase : public eoUF diff --git a/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h b/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h index 7280e70a1..0ed4da23d 100644 --- a/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h +++ b/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h @@ -2,7 +2,7 @@ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 -Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau +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 ue,