Test & Update for new version
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2681 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras
parent
c2a245b2c3
commit
89af347c09
4 changed files with 108 additions and 103 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
/*
|
||||
<QapEval.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
<QapEval.h>
|
||||
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
|
||||
abiding by the rules of distribution of free software. You can use,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
This software is governed by the CeCILL license under French law and
|
||||
abiding by the rules of distribution of free software. You can use,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
|
||||
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
|
||||
with a limited warranty and the software's author, the holder of the
|
||||
economic rights, and the successive licensors have only limited liability.
|
||||
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
|
||||
with a limited warranty and the software's author, the holder of the
|
||||
economic rights, and the successive licensors have only limited liability.
|
||||
|
||||
In this respect, the user's attention is drawn to the risks associated
|
||||
with loading, using, modifying and/or developing or reproducing the
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
/*
|
||||
<QapIncrEval.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
<QapIncrEval.h>
|
||||
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
|
||||
abiding by the rules of distribution of free software. You can use,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
This software is governed by the CeCILL license under French law and
|
||||
abiding by the rules of distribution of free software. You can use,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
|
||||
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
|
||||
with a limited warranty and the software's author, the holder of the
|
||||
economic rights, and the successive licensors have only limited liability.
|
||||
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
|
||||
with a limited warranty and the software's author, the holder of the
|
||||
economic rights, and the successive licensors have only limited liability.
|
||||
|
||||
In this respect, the user's attention is drawn to the risks associated
|
||||
with loading, using, modifying and/or developing or reproducing the
|
||||
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
|
||||
therefore means that it is reserved for developers and experienced
|
||||
professionals having in-depth computer knowledge. Users are therefore
|
||||
encouraged to load and test the software's suitability as regards their
|
||||
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
|
||||
same conditions as regards security.
|
||||
The fact that you are presently reading this means that you have had
|
||||
knowledge of the CeCILL license and that you accept its terms.
|
||||
In this respect, the user's attention is drawn to the risks associated
|
||||
with loading, using, modifying and/or developing or reproducing the
|
||||
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
|
||||
therefore means that it is reserved for developers and experienced
|
||||
professionals having in-depth computer knowledge. Users are therefore
|
||||
encouraged to load and test the software's suitability as regards their
|
||||
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
|
||||
same conditions as regards security.
|
||||
The fact that you are presently reading this means that you have had
|
||||
knowledge of the CeCILL license and that you accept its terms.
|
||||
|
||||
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef __QapIncrEval
|
||||
#define __QapIncrEval
|
||||
|
|
@ -41,60 +41,64 @@
|
|||
* 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;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
typedef typename moEval<Neighbor>::EOT EOT;
|
||||
typedef typename moEval<Neighbor>::Fitness Fitness;
|
||||
|
||||
QapIncrEval(){}
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
QapIncrEval() {
|
||||
}
|
||||
|
||||
~QapIncrEval(){}
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
|
||||
/**
|
||||
* Functor for incremental evaluation of the solution
|
||||
* @param _sol the solution
|
||||
* @param _neighbor the neighbor of solution to evaluate
|
||||
*/
|
||||
~QapIncrEval() {
|
||||
}
|
||||
|
||||
void operator() (EOT & _sol, Neighbor & _neighbor){
|
||||
/**
|
||||
* Functor for incremental evaluation of the solution
|
||||
* @param _sol the solution
|
||||
* @param _neighbor the neighbor of solution to evaluate
|
||||
*/
|
||||
|
||||
unsigned int cost=0;
|
||||
unsigned i,j;
|
||||
_neighbor.getIndices(n,i,j);
|
||||
cost = _sol.fitness() +compute_delta(_sol,i,j);
|
||||
_neighbor.fitness(cost);
|
||||
}
|
||||
void operator()(EOT & _sol, Neighbor & _neighbor) {
|
||||
|
||||
/**
|
||||
* Specific to the QAP incremental evaluation (part of algorithmic)
|
||||
* @param _sol the solution to evaluate
|
||||
* @param i the first position of swap
|
||||
* @param j the second position of swap
|
||||
*/
|
||||
|
||||
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]]);
|
||||
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);
|
||||
}
|
||||
};
|
||||
unsigned int cost = 0;
|
||||
unsigned i, j;
|
||||
_neighbor.getIndices(n, i, j);
|
||||
cost = _sol.fitness() + compute_delta(_sol, i, j);
|
||||
_neighbor.fitness(cost);
|
||||
}
|
||||
|
||||
/**
|
||||
* Specific to the QAP incremental evaluation (part of algorithmic)
|
||||
* @param _sol the solution to evaluate
|
||||
* @param i the first position of swap
|
||||
* @param j the second position of swap
|
||||
*/
|
||||
|
||||
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]]);
|
||||
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);
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue