From b017a0eb4602b1449090135ae05bc8a6371cbdc0 Mon Sep 17 00:00:00 2001 From: Caner Candan Date: Wed, 25 Aug 2010 19:15:32 +0200 Subject: [PATCH] * removed rho parameter and replaced it by popsize --- application/eda_sa/CMakeLists.txt | 1 + application/eda_sa/main.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/application/eda_sa/CMakeLists.txt b/application/eda_sa/CMakeLists.txt index e8ec6f13..25c07772 100644 --- a/application/eda_sa/CMakeLists.txt +++ b/application/eda_sa/CMakeLists.txt @@ -10,6 +10,7 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) SET(RESOURCES eda_sa.param plot.py + plot_on_ggobi.py ) FOREACH(file ${RESOURCES}) diff --git a/application/eda_sa/main.cpp b/application/eda_sa/main.cpp index b362529c..6c9d2738 100644 --- a/application/eda_sa/main.cpp +++ b/application/eda_sa/main.cpp @@ -135,9 +135,11 @@ int main(int ac, char** av) // FIXME: should I set the default value of rho to pop size ?!? - unsigned int rho = parser.createParam((unsigned int)0, "rho", "Rho: metropolis sample size", 'p', section).value(); // p + // unsigned int rho = parser.createParam((unsigned int)0, "rho", "Rho: metropolis sample size", 'p', section).value(); // p - moGenSolContinue< EOT >* sa_continue = new moGenSolContinue< EOT >(rho); + unsigned int popSize = parser.getORcreateParam((unsigned int)20, "popSize", "Population Size", 'P', "Evolution Engine").value(); + + moGenSolContinue< EOT >* sa_continue = new moGenSolContinue< EOT >( popSize ); state.storeFunctor(sa_continue); //-----------------------------------------------------------------------------