Merge branch 'master' of ssh://eodev.git.sourceforge.net/gitroot/eodev/eodev

eo/CMakeLists.txt

@@ -16,7 +16,7 @@ INCLUDE(eo-conf.cmake OPTIONAL)
 PROJECT(EO)
 
 # CMake > 2.8 is needed, because of the FindOpenMP feature
-cmake_minimum_required(VERSION 2.8)
+#cmake_minimum_required(VERSION 2.8)
 
 #SET(PROJECT_VERSION_MAJOR 1)
 #SET(PROJECT_VERSION_MINOR 1)

eo/src/eoSIGContinue.h

@@ -48,7 +48,7 @@ void	set_bool(int)
 }
 
 /**
-    Ctrl C handling: this eoContinue tells whether the user pressed Ctrl C
+  A continuator that stops if a given signal is received during the execution
 */
 template< class EOT>
 class eoSIGContinue: public eoContinue<EOT>

eo/src/utils/checkpointing

@@ -17,6 +17,7 @@
 #include <utils/eoMOFitnessStat.h>
 #include <utils/eoPopStat.h>
 #include <utils/eoTimeCounter.h>
+#include <utils/eoGenCounter.h>
 
 // and make_help - any better suggestion to include it?
 void make_help(eoParser & _parser);

eo/src/utils/eoGenCounter.h

@@ -0,0 +1,46 @@
+/*
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    (c) Thales group 2011
+
+    Author: johann.dreo@thalesgroup.com
+ */
+
+#ifndef _eoGenCounter_h
+#define _eoGenCounter_h
+
+#include <string>
+#include <utils/eoStat.h>
+
+/**
+    An eoStat that simply gives the current generation index
+
+    @ingroup Stats
+*/
+class eoGenCounter : public eoUpdater, public eoValueParam<unsigned int>
+{
+public:
+  eoGenCounter( unsigned int start = 0, std::string label = "Gen" ) : eoValueParam<unsigned int>(start, label), _nb(start) {}
+
+  virtual void operator()()
+  {
+    value() = _nb++;
+  }
+
+private:
+  unsigned int _nb;
+};
+
+#endif

eo/src/utils/eoStat.h

@@ -448,7 +448,7 @@ public:
             std::nth_element( pop.begin(), pop.begin()+quartile*3, pop.end() );
             typename EOT::Fitness Q3 = pop[quartile*3].fitness();
 
-            value() = Q1 - Q3;
+            value() = Q3 - Q1;
         }
     }