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> <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 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> <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 Karima Boufaras, Thé Van LUONG
@ -44,7 +44,8 @@ void load(char * _fileName) {
fstream file(_fileName, ios::in); fstream file(_fileName, ios::in);
if (!file) { if (!file) {
string str = "QAPData: Could not open file [" + (string)_fileName + "]."; string str = "QAPData: Could not open file [" + (string) _fileName
+ "].";
throw runtime_error(str); throw runtime_error(str);
} }
unsigned i, j; unsigned i, j;

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

@ -1,19 +1,19 @@
/* /*
<QapEval.h> <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 Karima Boufaras, Thé Van LUONG
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info". "http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy, As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the

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

@ -1,36 +1,36 @@
/* /*
<QapIncrEval.h> <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 Karima Boufaras, Thé Van LUONG
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info". "http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy, As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software, software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the data to be ensured and, more generally, to use and operate it in the
same conditions as regards security. same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __QapIncrEval #ifndef __QapIncrEval
#define __QapIncrEval #define __QapIncrEval
@ -41,60 +41,64 @@
* Incremental Evaluation of QAP * Incremental Evaluation of QAP
*/ */
template <class Neighbor> template<class Neighbor>
class QapIncrEval : public moEval<Neighbor>{ class QapIncrEval: public moEval<Neighbor> {
public: public:
typedef typename moEval<Neighbor>::EOT EOT; typedef typename moEval<Neighbor>::EOT EOT;
typedef typename moEval<Neighbor>::Fitness Fitness; typedef typename moEval<Neighbor>::Fitness Fitness;
/** /**
* Constructor * Constructor
*/ */
QapIncrEval(){} QapIncrEval() {
}
/** /**
* Destructor * Destructor
*/ */
~QapIncrEval(){} ~QapIncrEval() {
}
/** /**
* Functor for incremental evaluation of the solution * Functor for incremental evaluation of the solution
* @param _sol the solution * @param _sol the solution
* @param _neighbor the neighbor of solution to evaluate * @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 int cost = 0;
unsigned i,j; unsigned i, j;
_neighbor.getIndices(n,i,j); _neighbor.getIndices(n, i, j);
cost = _sol.fitness() +compute_delta(_sol,i,j); cost = _sol.fitness() + compute_delta(_sol, i, j);
_neighbor.fitness(cost); _neighbor.fitness(cost);
} }
/** /**
* Specific to the QAP incremental evaluation (part of algorithmic) * Specific to the QAP incremental evaluation (part of algorithmic)
* @param _sol the solution to evaluate * @param _sol the solution to evaluate
* @param i the first position of swap * @param i the first position of swap
* @param j the second position of swap * @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 d; int k;
int k;
d = (a[i*n+i]-a[j*n+j])*(b[_sol[j]*n+_sol[j]]-b[_sol[i]*n+_sol[i]]) + d = (a[i * n + i] - a[j * n + j]) * (b[_sol[j] * n + _sol[j]]
(a[i*n+j]-a[j*n+i])*(b[_sol[j]*n+_sol[i]]-b[_sol[i]*n+_sol[j]]); - b[_sol[i] * n + _sol[i]]) + (a[i * n + j] - a[j * n + i])
for (k = 0; k < n; k = k + 1) * (b[_sol[j] * n + _sol[i]] - b[_sol[i] * n + _sol[j]]);
if (k!=i && k!=j) for (k = 0; k < n; k = k + 1)
d = d + (a[k*n+i]-a[k*n+j])*(b[_sol[k]*n+_sol[j]]-b[_sol[k]*n+_sol[i]]) + if (k != i && k != j)
(a[i*n+k]-a[j*n+k])*(b[_sol[j]*n+_sol[k]]-b[_sol[i]*n+_sol[k]]); d = d + (a[k * n + i] - a[k * n + j]) * (b[_sol[k] * n
return(d); + _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 #endif