nojhan/paradiseo
Watch
1
0
Fork
You've already forked paradiseo
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ajout d'un HC tenant compte du cas d'égalité dans les best, et pouvant explorer les plateaux

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1672 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-01-25 10:40:07 +00:00
commit f0acb7c0ef
6 changed files with 342 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
branches/newMo/src/neighborhood/moOrderNeighborhood.h
View file

@ -92,11 +92,13 @@ public:
/**
* test if all neighbors are explore or not,if false, there is no neighbor left to explore
* currentIndex is the index which have been used before, it is not the next neighbor which can be possibly evaluated
*
* @param _solution the solution to explore
* @return true if there is again a neighbor to explore
*/
virtual bool cont(EOT & _solution) {
return (currentIndex < neighborhoodSize) ;
return (currentIndex < neighborhoodSize - 1) ;
}
/**

3
branches/newMo/src/neighborhood/moRndWithoutReplNeighborhood.h
View file

@ -106,11 +106,12 @@ public:
/**
* test if all neighbors are explore or not,if false, there is no neighbor left to explore
* maxIndex is number of neighbors
* @param _solution the solution to explore
* @return true if there is again a neighbor to explore
*/
virtual bool cont(EOT & _solution) {
return (maxIndex > 0) ;
return (maxIndex > 1) ;
}
/**