From a84417d3498a578893b4ddbd624aca6bff6afd92 Mon Sep 17 00:00:00 2001 From: Caner Candan Date: Wed, 18 Aug 2010 18:39:58 +0200 Subject: [PATCH] * cma-sa name has been replace by eda-sa in the project --- application/CMakeLists.txt | 2 +- application/{cma_sa => eda_sa}/CMakeLists.txt | 4 ++-- application/{cma_sa => eda_sa}/Rosenbrock.h | 0 application/{cma_sa => eda_sa}/Sphere.h | 0 .../cma_sa.param => eda_sa/eda_sa.param} | 0 application/{cma_sa => eda_sa}/main.cpp | 6 +++--- application/{cma_sa => eda_sa}/plot.py | 2 +- src/do | 2 +- src/{doCMASA.h => doEDASA.h} | 18 +++++++++--------- 9 files changed, 17 insertions(+), 17 deletions(-) rename application/{cma_sa => eda_sa}/CMakeLists.txt (95%) rename application/{cma_sa => eda_sa}/Rosenbrock.h (100%) rename application/{cma_sa => eda_sa}/Sphere.h (100%) rename application/{cma_sa/cma_sa.param => eda_sa/eda_sa.param} (100%) rename application/{cma_sa => eda_sa}/main.cpp (98%) rename application/{cma_sa => eda_sa}/plot.py (99%) rename src/{doCMASA.h => doEDASA.h} (97%) diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 07bcc2d0..591fb303 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -2,6 +2,6 @@ ### 1) Where do we go now ?!? ###################################################################################### -ADD_SUBDIRECTORY(cma_sa) +ADD_SUBDIRECTORY(eda_sa) ###################################################################################### diff --git a/application/cma_sa/CMakeLists.txt b/application/eda_sa/CMakeLists.txt similarity index 95% rename from application/cma_sa/CMakeLists.txt rename to application/eda_sa/CMakeLists.txt index c67ab0dd..8cdc8c13 100644 --- a/application/cma_sa/CMakeLists.txt +++ b/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 ) diff --git a/application/cma_sa/Rosenbrock.h b/application/eda_sa/Rosenbrock.h similarity index 100% rename from application/cma_sa/Rosenbrock.h rename to application/eda_sa/Rosenbrock.h diff --git a/application/cma_sa/Sphere.h b/application/eda_sa/Sphere.h similarity index 100% rename from application/cma_sa/Sphere.h rename to application/eda_sa/Sphere.h diff --git a/application/cma_sa/cma_sa.param b/application/eda_sa/eda_sa.param similarity index 100% rename from application/cma_sa/cma_sa.param rename to application/eda_sa/eda_sa.param diff --git a/application/cma_sa/main.cpp b/application/eda_sa/main.cpp similarity index 98% rename from application/cma_sa/main.cpp rename to application/eda_sa/main.cpp index 4fc41bbb..2653ddab 100644 --- a/application/cma_sa/main.cpp +++ b/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, diff --git a/application/cma_sa/plot.py b/application/eda_sa/plot.py similarity index 99% rename from application/cma_sa/plot.py rename to application/eda_sa/plot.py index 4fc5924c..f5fa7c42 100644 --- a/application/cma_sa/plot.py +++ b/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 diff --git a/src/do b/src/do index cd18c140..74df1ca1 100644 --- a/src/do +++ b/src/do @@ -9,7 +9,7 @@ #define _do_ #include "doAlgo.h" -#include "doCMASA.h" +#include "doEDASA.h" #include "doDistrib.h" #include "doUniform.h" diff --git a/src/doCMASA.h b/src/doEDASA.h similarity index 97% rename from src/doCMASA.h rename to src/doEDASA.h index c0c0cb86..35cec339 100644 --- a/src/doCMASA.h +++ b/src/doEDASA.h @@ -5,8 +5,8 @@ Caner Candan */ -#ifndef _doCMASA_h -#define _doCMASA_h +#ifndef _doEDASA_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