Merge branch 'master' into cmaes

This commit is contained in:
nojhan 2012-07-09 11:32:13 +02:00
commit 42be24628e
3 changed files with 4 additions and 5 deletions

View file

@ -162,9 +162,8 @@ int main(int ac, char** av)
// EDA algorithm configuration
edoAlgo< Distrib >* algo = new edoEDA< Distrib >
(*selector, *estimator, *sampler,
pop_continue, *distribution_continue,
popEval, *replacor);
(popEval, *selector, *estimator, *sampler, *replacor,
pop_continue, *distribution_continue );
// Beginning of the algorithm call
try {