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@2023 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
boufaras 2010-12-14 10:33:27 +00:00
commit 5a4c80e22e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
trunk/paradiseo-mo/src/neighborhood/moKswapNeighborhood.h
View file

@ -154,23 +154,23 @@ public:
void setMapping() {
if (!Kswap) {
for (int i = 0; i < size; i++)
for (unsigned int i = 0; i < size; i++)
mapping[i] = i;
} else {
unsigned int * _indices;
_indices = new unsigned int[Kswap + 1];
for (int i = 0; i < Kswap + 1; i++)
for (unsigned int i = 0; i < Kswap + 1; i++)
_indices[i] = i;
int id = 0;
unsigned int id = 0;
bool change = false;
while (id < neighborhoodSize) {
while (_indices[Kswap] < size) {
for (int k = 0; k < Kswap; k++) {
for (unsigned int k = 0; k < Kswap; k++) {
mapping[id + k * neighborhoodSize] = _indices[k];
}
@ -206,7 +206,7 @@ public:
if (_indices[_indice] + 1 < size - Kswap + _indice) {
_indices[_indice]++;
int i = 1;
unsigned int i = 1;
while (_indice + i <= Kswap) {
@ -225,7 +225,7 @@ public:
} else {
_indices[_indice + 1]++;
int i = 2;
unsigned int i = 2;
while (_indice + i <= Kswap) {
_indices[_indice + i] = _indices[_indice + i - 1] + 1;