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

code optimization

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2359 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2011-09-14 12:01:22 +00:00
commit 7e24634cbf
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
branches/ParadisEO-GPU/src/problems/eval/PPPEval.h
View file

@ -66,22 +66,21 @@ public:
void operator()(EOT & _sol) { void operator()(EOT & _sol) {
int *H; int *H;
int *S; int tmp;
int tmp_1 = 0; int tmp_1 = 0;
int tmp_2 = 0; int tmp_2 = 0;
H = new int[Nd]; H = new int[Nd];
S = new int[Md];
for (int i = 0; i < Md; i++) { for (int i = 0; i < Md; i++) {
S[i] = 0; tmp = 0;
for (int j = 0; j < Nd; j++) { for (int j = 0; j < Nd; j++) {
S[i] += pppData.a_h[i * Nd + j] * _sol[j]; tmp += pppData.a_h[i * Nd + j] * _sol[j];
} }
tmp_1 += abs(S[i]) - S[i]; tmp_1 += abs(tmp) - tmp;
if (S[i] > 0) if (tmp > 0)
H[S[i]-1]++; H[tmp-1]++;
} }
for (int j = 0; j < Nd; j++) { for (int j = 0; j < Nd; j++) {
@ -91,7 +90,7 @@ public:
_sol.fitness(ca * tmp_1 + cb * tmp_2); _sol.fitness(ca * tmp_1 + cb * tmp_2);
delete[] H; delete[] H;
delete[] S;
} }
protected: protected: