* cma-sa name has been replace by eda-sa in the project

application/CMakeLists.txt

@@ -2,6 +2,6 @@
 ### 1) Where do we go now ?!?
 ######################################################################################
 
-ADD_SUBDIRECTORY(cma_sa)
+ADD_SUBDIRECTORY(eda_sa)
 
 ######################################################################################

application/eda_sa/CMakeLists.txt

@@ -1,4 +1,4 @@
-PROJECT(cma_sa)
+PROJECT(eda_sa)
 
 FIND_PACKAGE(Boost 1.33.0)
 
@@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
 SET(RESOURCES
-  cma_sa.param
+  eda_sa.param
   plot.py
   )
 

application/eda_sa/main.cpp

@@ -35,7 +35,7 @@ int main(int ac, char** av)
     eoState state;
 
     //-----------------------------------------------------------------------------
-    // Instantiate all need parameters for CMASA algorithm
+    // Instantiate all need parameters for EDASA algorithm
     //-----------------------------------------------------------------------------
 
     eoSelect< EOT >* selector = new eoDetSelect< EOT >(0.5);
@@ -193,10 +193,10 @@ int main(int ac, char** av)
 
 
     //-----------------------------------------------------------------------------
-    // CMASA algorithm configuration
+    // EDASA algorithm configuration
     //-----------------------------------------------------------------------------
 
-    doAlgo< Distrib >* algo = new doCMASA< Distrib >
+    doAlgo< Distrib >* algo = new doEDASA< Distrib >
     	(*selector, *estimator, *selectone, *modifier, *sampler,
     	 monitoring_continue, *distribution_continue,
 	 eval, *sa_continue, *cooling_schedule,

application/eda_sa/plot.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-"""plot.py -- Plot CMA-SA results file"""
+"""plot.py -- Plot EDA-SA results file"""
 
 import os, time, math, tempfile
 import numpy

src/do

@@ -9,7 +9,7 @@
 #define _do_
 
 #include "doAlgo.h"
-#include "doCMASA.h"
+#include "doEDASA.h"
 
 #include "doDistrib.h"
 #include "doUniform.h"

src/doEDASA.h

@@ -5,8 +5,8 @@
              Caner Candan <caner.candan@thalesgroup.com>
 */
 
-#ifndef _doCMASA_h
+#ifndef _doEDASA_h
-#define _doCMASA_h
+#define _doEDASA_h
 
 //-----------------------------------------------------------------------------
 // Temporary solution to store populations state at each iteration for plotting.
@@ -47,7 +47,7 @@
 using namespace boost::numeric::ublas;
 
 template < typename D >
-class doCMASA : public doAlgo< D >
+class doEDASA : public doAlgo< D >
 {
 public:
     //! Alias for the type EOT
@@ -61,9 +61,9 @@ public:
 
 public:
 
-    //! doCMASA constructor
+    //! doEDASA constructor
     /*!
-      All the boxes used by a CMASA need to be given.
+      All the boxes used by a EDASA need to be given.
 
       \param selector The EOT selector
       \param estomator The EOT selector
@@ -76,7 +76,7 @@ public:
       \param initial_temperature The initial temperature.
       \param replacor The EOT replacor
     */
-    doCMASA (eoSelect< EOT > & selector,
+    doEDASA (eoSelect< EOT > & selector,
 	     doEstimator< D > & estimator,
 	     eoSelectOne< EOT > & selectone,
 	     doModifierMass< D > & modifier,
@@ -143,9 +143,9 @@ public:
 
     }
 
-    //! function that launches the CMASA algorithm.
+    //! function that launches the EDASA algorithm.
     /*!
-      As a moTS or a moHC, the CMASA can be used for HYBRIDATION in an evolutionary algorithm.
+      As a moTS or a moHC, the EDASA can be used for HYBRIDATION in an evolutionary algorithm.
 
       \param pop A population to improve.
       \return TRUE.
@@ -442,4 +442,4 @@ private:
 
 };
 
-#endif // !_doCMASA_h
+#endif // !_doEDASA_h