From 0ae47e9300fa4e566a4f78bd6be2f2c5fb1a7075 Mon Sep 17 00:00:00 2001 From: verel Date: Wed, 13 Oct 2010 16:39:36 +0000 Subject: [PATCH] Modification (debug) of UBQP evaluation git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1963 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/problems/eval/ubqpEval.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/trunk/problems/eval/ubqpEval.h b/trunk/problems/eval/ubqpEval.h index 4a9485b29..b2bb4be09 100644 --- a/trunk/problems/eval/ubqpEval.h +++ b/trunk/problems/eval/ubqpEval.h @@ -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); }