From a99e91d897329fb4628723ae49a711dee95af356 Mon Sep 17 00:00:00 2001 From: verel Date: Wed, 5 May 2010 13:07:21 +0000 Subject: [PATCH] Correction de moHillClimberSampling.h git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1788 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/continuator/moMinusOneCounterStat.h | 90 +++++++++++++++++++ .../src/continuator/moStatFromStat.h | 2 - .../src/continuator/moVectorMonitor.h | 2 - trunk/paradiseo-mo/src/mo.h | 2 + .../src/sampling/moHillClimberSampling.h | 4 +- 5 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 trunk/paradiseo-mo/src/continuator/moMinusOneCounterStat.h diff --git a/trunk/paradiseo-mo/src/continuator/moMinusOneCounterStat.h b/trunk/paradiseo-mo/src/continuator/moMinusOneCounterStat.h new file mode 100644 index 000000000..02f7a5451 --- /dev/null +++ b/trunk/paradiseo-mo/src/continuator/moMinusOneCounterStat.h @@ -0,0 +1,90 @@ +/* + + 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 moMinusOneCounterStat_h +#define moMinusOneCounterStat_h + +#include + +/** + * The statistic gives the number of iteration minus 1 + * then the last iteration is not counted (for example for length of adaptive walk) + */ +template +class moMinusOneCounterStat : public moStat +{ +public : + using moStat< EOT, unsigned int>::value; + + /** + * Default Constructor + */ + moMinusOneCounterStat(): moStat(0, "counter") { + counter = 0; + } + + /** + * Give the number of iteration + * @param _sol a solution + */ + virtual void init(EOT & _sol) { + counter = 0; + value() = 0; + } + + /** + * Give the number of iteration + * @param _sol a solution + */ + virtual void operator()(EOT & _sol) { + counter++; + if (counter > 0) + value() = counter - 1; + else + value() = 0; + } + + /** + * @return name of the class + */ + virtual std::string className(void) const { + return "moMinusOneCounterStat"; + } + +private: + unsigned int counter; + +}; + +#endif diff --git a/trunk/paradiseo-mo/src/continuator/moStatFromStat.h b/trunk/paradiseo-mo/src/continuator/moStatFromStat.h index f1932dde6..162129cbb 100644 --- a/trunk/paradiseo-mo/src/continuator/moStatFromStat.h +++ b/trunk/paradiseo-mo/src/continuator/moStatFromStat.h @@ -57,7 +57,6 @@ public : * @param _sol a solution */ virtual void init(EOT & _sol) { - std::cout << "copy init" << stat.value() << std::endl; value() = stat.value(); } @@ -66,7 +65,6 @@ public : * @param _sol a solution */ virtual void operator()(EOT & _sol) { - std::cout << "copy " << stat.value() << std::endl; value() = stat.value(); } diff --git a/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h b/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h index 13f37c8ff..049b8a500 100644 --- a/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h +++ b/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h @@ -84,8 +84,6 @@ public: * @return this monitor (sorry I don't why, but it is like this in EO) */ eoMonitor& operator()(void) { - std::cout << "je passe vector MOnitor" << std::endl; - if (doubleParam != NULL) valueVec.push_back(doubleParam->value()); else diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index 97057f56f..2755178a2 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -64,6 +64,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/trunk/paradiseo-mo/src/sampling/moHillClimberSampling.h b/trunk/paradiseo-mo/src/sampling/moHillClimberSampling.h index c86d8a6a6..b00d515c1 100644 --- a/trunk/paradiseo-mo/src/sampling/moHillClimberSampling.h +++ b/trunk/paradiseo-mo/src/sampling/moHillClimberSampling.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -95,7 +95,7 @@ public: protected: moSolutionStat solStat; - moCounterStat lengthStat; + moMinusOneCounterStat lengthStat; moTrueContinuator trueCont; moStatFromStat copyStat; moCheckpoint checkpoint;