* cma-sa name has been replace by eda-sa in the project
This commit is contained in:
parent
a70a083735
commit
a84417d349
9 changed files with 17 additions and 17 deletions
|
|
@ -2,6 +2,6 @@
|
|||
### 1) Where do we go now ?!?
|
||||
######################################################################################
|
||||
|
||||
ADD_SUBDIRECTORY(cma_sa)
|
||||
ADD_SUBDIRECTORY(eda_sa)
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
||||
|
|
@ -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,
|
||||
|
|
@ -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
|
||||
Reference in a new issue