Triki SA

archive_current.sh

@@ -1,3 +1,5 @@
 today=`date --iso-8601`
-git archive --format zip master > paradisEO-${today}.zip
+name=paradiseo_$today
+git archive --prefix=$name/ --format zip master > $name.zip
+echo $name.zip
 

cmake/Config.cmake

@@ -31,17 +31,12 @@ endif()
 ### 0) Define general CXX flags for DEBUG and RELEASE
 ######################################################################################
 
-#if(DEBUG)
-#  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "" FORCE)
-#else(DEBUG)
-#  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
-#endif(DEBUG)
-
 add_definitions(-DDEPRECATED_MESSAGES)
 set(CMAKE_CXX_FLAGS_DEBUG  "-Wunknown-pragmas -O0 -g -Wall -Wextra -ansi -pedantic" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_RELEASE  "-Wunknown-pragmas -O2" CACHE STRING "" FORCE)
 
 if(SMP)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -pthread" CACHE STRING "" FORCE)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -pthread" CACHE STRING "" FORCE)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 -pthread" CACHE STRING "" FORCE)
     add_definitions(-D_GLIBCXX_USE_NANOSLEEP)

edo/src/edoTransform.h

@@ -0,0 +1,111 @@
+/*
+The Evolving Distribution Objects framework (EDO) is a template-based,
+ANSI-C++ evolutionary computation library which helps you to write your
+own estimation of distribution algorithms.
+
+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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Copyright (C) 2013 Thales group
+*/
+/*
+Authors:
+    Johann Dréo <[email protected]>
+*/
+
+#ifndef _edoTransform_h
+#define _edoTransform_h
+
+#include <eo> // eoTransform
+
+/** @defgroup Wrappers
+ *
+ * Wrappers to interact with other parts of the framework
+ */
+
+/** Abstract base class for wrapping an estimator and a sampler as an eoTransform
+ *
+ * @ingroup Wrappers
+ */
+template<class D>
+class edoTransform : public eoTransform< eoPop<typename D::EOType>& >
+{
+public:
+    typedef typename D::EOType EOType;
+
+    edoTransform( edoEstimator<D> & estimator, edoSampler<D> & sampler ) :
+        _estimator(estimator), _sampler(sampler)
+    {}
+
+    virtual void operator()( eoPop<EOType> & pop ) = 0;
+
+protected:
+    edoEstimator<D> & _estimator;
+    edoSampler<D> & _sampler;
+};
+
+
+/** Wrapping an estimator and a sampler as an eoTransform.
+ *
+ * @ingroup Wrappers
+ */
+template<typename D>
+class edoTransformAdaptive : public edoTransform<D>
+{
+public:
+    typedef typename D::EOType EOType;
+
+    edoTransformAdaptive( D & distrib, edoEstimator<D> & estimator, edoSampler<D> & sampler )
+        : _distrib(distrib), _estimator(estimator), _sampler(sampler)
+    {}
+
+    virtual void operator()( eoPop<EOType> & pop )
+    {
+        _distrib = _estimator( pop );
+        pop.clear();
+        for( unsigned int i = 0; i < pop.size(); ++i ) {
+            pop.push_back( _sampler(_distrib) );
+        }
+    }
+
+protected:
+    D & _distrib;
+    edoEstimator<D> & _estimator;
+    edoSampler<D> & _sampler;
+};
+
+
+/** Wrapping an estimator and a sampler as an eoTransform,
+ * the distribution is created at instanciation and replaced at each call.
+ *
+ * @ingroup Wrappers
+ */
+template<typename D>
+class edoTransformStateless : public edoTransformAdaptive<D>
+{
+public:
+    typedef typename D::EOType EOType;
+
+    edoTransformStateless( edoEstimator<D> & estimator, edoSampler<D> & sampler )
+        : edoTransformAdaptive<D>( *(new D), estimator, sampler )
+    {}
+
+    ~edoTransformStateless()
+    {
+        // delete the temporary distrib allocated in constructor
+        delete &(this->_distrib);
+    }
+};
+
+#endif // !_edoTransform_h

eo/NEWS

@@ -1,4 +1,8 @@
 * current release:
+    - added an EOT& parameter to the moCoolingSchedule::update interface method because some cooling schedules need it
+    - eoMonitor's are no more executed in moCheckpoint::init to prevent access to uninitialized data
+    - renamed classes moSAexplorer->moSAExplorer, MetropolisHasting->MetropolisHastings and MetropolisHastingExplorer -> MetropolisHastingsExplorer
+    - reordered param order in moSA's 2nd constructor ('cool' is now before 'eval' because 'eval' now has a default value)
 
 * release 1.3.1 (2012-07-27)
     - the eo::mpi modules is no longer dependent from boost::mpi

eo/src/eo

@@ -35,6 +35,7 @@
 // general purpose
 #include <utils/eoData.h>
 #include <eoObject.h>
+#include <eoOptional.h>
 #include <eoPrintable.h>
 #include <eoPersistent.h>
 #include <eoScalarFitness.h>