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

Modification (debug) of UBQP evaluation

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1963 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-10-13 16:39:36 +00:00
commit 0ae47e9300
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
trunk/problems/eval/ubqpEval.h
View file

@ -79,13 +79,21 @@ public:
int v;
for(unsigned k = 0; k < _numInstance; k++) {
if (format == 0)
if (format == 0) {
file >> nbVar >> nbNonZero ;
else
for(unsigned kk = 0; kk < nbNonZero; kk++)
file >> i >> j >> v;
} else {
file >> nbVar ;
for(unsigned kk = 0; kk < nbNonZero; kk++)
file >> i >> j >> v;
for(unsigned int i = 0; i < nbVar; i++) {
for(unsigned int j = 0; j < nbVar; j++) {
file >> v;
}
}
}
}
// the chosen instance
@ -126,6 +134,7 @@ public:
Q[i][j] = Q[i][j] + Q[j][i];
Q[j][i] = 0;
}
}
/**
@ -152,10 +161,10 @@ public:
for(unsigned i = 0; i < nbVar; i++)
if (_solution[i] == 1)
for(j = 0; j < i; j++)
for(j = 0; j <= i; j++)
if (_solution[j] == 1)
fit += Q[i][j];
_solution.fitness(fit);
}