nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

+ eda algo: same algo than eda-sa without sa, + plotting scripts and problem functions moved to application/common

Browse source
This commit is contained in:
Caner Candan 2010-09-22 14:38:15 +02:00
commit 65191e2212
16 changed files with 595 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/doEDASA.h
View file

@ -159,6 +159,15 @@ public:
//-------------------------------------------------------------
//-------------------------------------------------------------
// Evaluating a first time the current solution
//-------------------------------------------------------------
_evaluation( current_solution );
//-------------------------------------------------------------
//-------------------------------------------------------------
// Building of the sampler in current_pop
//-------------------------------------------------------------
@ -170,21 +179,20 @@ public:
do
{
EOT candidate_solution = _sampler(distrib);
EOT& e1 = candidate_solution;
_evaluation( e1 );
EOT& e2 = current_solution;
_evaluation( e2 );
_evaluation( candidate_solution );
// TODO: verifier le critere d'acceptation
if ( e1.fitness() < e2.fitness() ||
rng.uniform() < exp( ::fabs(e1.fitness() - e2.fitness()) / temperature ) )
if ( candidate_solution.fitness() < current_solution.fitness() ||
rng.uniform() < exp( ::fabs(candidate_solution.fitness() - current_solution.fitness()) / temperature ) )
{
current_pop.push_back(candidate_solution);
current_solution = candidate_solution;
}
}
while ( _sa_continue( current_solution) );
while ( _sa_continue( current_solution ) );
//-------------------------------------------------------------
_replacor(pop, current_pop); // copy current_pop in pop