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

test added

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1749 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-28 13:18:47 +00:00
commit 674d9964f0
7 changed files with 179 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/paradiseo-mo/src/explorer/moSAexplorer.h
View file

@ -151,20 +151,27 @@ public:
*/
virtual bool accept(EOT & _solution) {
double alpha=0.0;
double fit1, fit2;
if (neighborhood.hasNeighbor(_solution)) {
if (solNeighborComparator(_solution, current)) // accept if the current neighbor is better than the solution
if (solNeighborComparator(_solution, current)) // accept if the current neighbor is better than the solution
isAccept = true;
else {
if ( (double)current.fitness() < (double)_solution.fitness()) // this is a maximization
alpha = exp( ((double) current.fitness() - (double) _solution.fitness()) / temperature );
else // this is a minimization
alpha = exp( ((double) _solution.fitness() - (double) current.fitness()) / temperature );
isAccept = (rng.uniform() < alpha) ;
fit1=(double)current.fitness();
fit2=(double)_solution.fitness();
if (fit1 < fit2) // this is a maximization
alpha = exp((fit1 - fit2) / temperature );
else // this is a minimization
alpha = exp((fit2 - fit1) / temperature );
isAccept = (rng.uniform() < alpha) ;
}
}
return isAccept;
};
double getTemperature(){
return temperature;
}
private:
// comparator betwenn solution and neighbor
moSolNeighborComparator<Neighbor>& solNeighborComparator;