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

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1958 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
boufaras 2010-10-13 15:36:14 +00:00
commit 9a4cb58c6c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/paradiseo-mo/src/problems/permutation/moSwapNeighborhood.h
View file

@ -57,7 +57,7 @@ public:
virtual void init(EOT& _solution, Neighbor& _current) { virtual void init(EOT& _solution, Neighbor& _current) {
indices.first=0; indices.first=0;
indices.second=1; indices.second=1;
size=_solution.size(); // size=_solution.size();
_current.setIndices(0,1); _current.setIndices(0,1);
} }
@ -67,7 +67,7 @@ public:
* @param _current the next neighbor * @param _current the next neighbor
*/ */
virtual void next(EOT& _solution, Neighbor& _current) { virtual void next(EOT& _solution, Neighbor& _current) {
if (indices.second==size-1) { if (indices.second==_solution.size()-1) {
indices.first++; indices.first++;
indices.second=indices.first+1; indices.second=indices.first+1;
} }
@ -82,7 +82,7 @@ public:
* @return true if there is again a neighbor not explored * @return true if there is again a neighbor not explored
*/ */
virtual bool cont(EOT& _solution) { virtual bool cont(EOT& _solution) {
return !((indices.first == (size-2)) && (indices.second == (size-1))); return !((indices.first == (_solution.size()-2)) && (indices.second == (_solution.size()-1)));
} }
/** /**
@ -95,7 +95,7 @@ public:
private: private:
std::pair<unsigned int, unsigned int> indices; std::pair<unsigned int, unsigned int> indices;
unsigned int size; //unsigned int size;
}; };
#endif #endif