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

Tsp fitness has been changed and moSA.h has been updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@813 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-11-26 08:46:41 +00:00
commit e0b82a27d1
6 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/paradiseo-mo/src/moSA.h
View file

@ -56,16 +56,10 @@ template < class M > class moSA:public moAlgo < typename M::EOType >
{
//! Alias for the type
typedef
typename
M::EOType
EOT;
typedef typename M::EOType EOT;
//! Alias for the fitness
typedef
typename
EOT::Fitness
Fitness;
typedef typename EOT::Fitness Fitness;
public:
@ -123,18 +117,26 @@ template < class M > class moSA:public moAlgo < typename M::EOType >
move_rand (move);
Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
Fitness incremental_fitness = incr_eval (move, __sol);
if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
Fitness delta_fit = incremental_fitness - __sol.fitness ();
if((__sol.fitness() > incremental_fitness ) && (exp (delta_fit / temp) > 1.0))
{
delta_fit = -delta_fit;
}
if (incremental_fitness > __sol.fitness() || rng.uniform () < exp (delta_fit / temp))
{
__sol.fitness (incr_eval (move, __sol));
__sol.fitness (incremental_fitness);
move (__sol);
/* Updating the best solution found
until now ? */
if (__sol.fitness () > best_sol.fitness ())
best_sol = __sol;
{
best_sol = __sol;
}
}
}