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

Please enter the commit message for your changes. Lines starting

Browse source
This commit is contained in:
verel 2012-10-31 13:47:11 +01:00
commit 9d867cb9fa
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mo/src/problems/permutation/moIndexedSwapNeighbor.h
View file

@ -43,6 +43,7 @@ public:
using moBackableNeighbor<EOT>::fitness; using moBackableNeighbor<EOT>::fitness;
using moIndexNeighbor<EOT>::key; using moIndexNeighbor<EOT>::key;
using moIndexNeighbor<EOT>::index;
/** /**
* Apply the swap * Apply the swap
@ -88,20 +89,21 @@ public:
unsigned int n = (unsigned int) ( (1 + sqrt(1 + 8 * _key)) / 2); unsigned int n = (unsigned int) ( (1 + sqrt(1 + 8 * _key)) / 2);
indices.first = _key - (n - 1) * n / 2; indices.first = _key - (n - 1) * n / 2;
indices.second = N - 1 - (n - 1 - _first); indices.second = _solution.size() - 1 - (n - 1 - indices.first);
} }
/** /**
* Setter to fix the two indexes to swap * Setter to fix the two indexes to swap
* @param _solution solution from which the neighborhood is visited
* @param _first first index * @param _first first index
* @param _second second index * @param _second second index
*/ */
void set(unsigned int _first, unsigned int _second) { void set(EOT & _solution, unsigned int _first, unsigned int _second) {
indices.first = _first; indices.first = _first;
indices.second = _second; indices.second = _second;
// set the index // set the index
unsigned n = _solution.nbClientsWithin() + _first - _second; unsigned n = _solution.size() + _first - _second;
index( _first + n * (n - 1) / 2 ); index( _first + n * (n - 1) / 2 );
} }