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

Test & Update for new version

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2681 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-24 01:37:35 +00:00
commit 89af347c09
4 changed files with 108 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_CPU/application/testSimpleTS_CPU.cu
View file

@ -1,6 +1,6 @@
/*
<testSimpleTS_CPU.cu>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG

5
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_CPU/src/Problem.h
View file

@ -1,6 +1,6 @@
/*
<Problem.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG
@ -44,7 +44,8 @@ void load(char * _fileName) {
fstream file(_fileName, ios::in);
if (!file) {
string str = "QAPData: Could not open file [" + (string)_fileName + "].";
string str = "QAPData: Could not open file [" + (string) _fileName
+ "].";
throw runtime_error(str);
}
unsigned i, j;

2
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_CPU/src/QapEval.h
View file

@ -1,6 +1,6 @@
/*
<QapEval.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG

44
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_CPU/src/QapIncrEval.h
View file

@ -1,6 +1,6 @@
/*
<QapIncrEval.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG
@ -30,7 +30,7 @@
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr
*/
*/
#ifndef __QapIncrEval
#define __QapIncrEval
@ -41,10 +41,10 @@
* Incremental Evaluation of QAP
*/
template <class Neighbor>
class QapIncrEval : public moEval<Neighbor>{
template<class Neighbor>
class QapIncrEval: public moEval<Neighbor> {
public:
public:
typedef typename moEval<Neighbor>::EOT EOT;
typedef typename moEval<Neighbor>::Fitness Fitness;
@ -53,13 +53,15 @@ class QapIncrEval : public moEval<Neighbor>{
* Constructor
*/
QapIncrEval(){}
QapIncrEval() {
}
/**
* Destructor
*/
~QapIncrEval(){}
~QapIncrEval() {
}
/**
* Functor for incremental evaluation of the solution
@ -67,12 +69,12 @@ class QapIncrEval : public moEval<Neighbor>{
* @param _neighbor the neighbor of solution to evaluate
*/
void operator() (EOT & _sol, Neighbor & _neighbor){
void operator()(EOT & _sol, Neighbor & _neighbor) {
unsigned int cost=0;
unsigned i,j;
_neighbor.getIndices(n,i,j);
cost = _sol.fitness() +compute_delta(_sol,i,j);
unsigned int cost = 0;
unsigned i, j;
_neighbor.getIndices(n, i, j);
cost = _sol.fitness() + compute_delta(_sol, i, j);
_neighbor.fitness(cost);
}
@ -83,18 +85,20 @@ class QapIncrEval : public moEval<Neighbor>{
* @param j the second position of swap
*/
unsigned int compute_delta(EOT & _sol,unsigned i,unsigned j)
{
unsigned int compute_delta(EOT & _sol, unsigned i, unsigned j) {
int d;
int k;
d = (a[i*n+i]-a[j*n+j])*(b[_sol[j]*n+_sol[j]]-b[_sol[i]*n+_sol[i]]) +
(a[i*n+j]-a[j*n+i])*(b[_sol[j]*n+_sol[i]]-b[_sol[i]*n+_sol[j]]);
d = (a[i * n + i] - a[j * n + j]) * (b[_sol[j] * n + _sol[j]]
- b[_sol[i] * n + _sol[i]]) + (a[i * n + j] - a[j * n + i])
* (b[_sol[j] * n + _sol[i]] - b[_sol[i] * n + _sol[j]]);
for (k = 0; k < n; k = k + 1)
if (k!=i && k!=j)
d = d + (a[k*n+i]-a[k*n+j])*(b[_sol[k]*n+_sol[j]]-b[_sol[k]*n+_sol[i]]) +
(a[i*n+k]-a[j*n+k])*(b[_sol[j]*n+_sol[k]]-b[_sol[i]*n+_sol[k]]);
return(d);
if (k != i && k != j)
d = d + (a[k * n + i] - a[k * n + j]) * (b[_sol[k] * n
+ _sol[j]] - b[_sol[k] * n + _sol[i]]) + (a[i * n + k]
- a[j * n + k]) * (b[_sol[j] * n + _sol[k]] - b[_sol[i]
* n + _sol[k]]);
return (d);
}
};
#endif