git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2094 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
47fac5086e
commit
f09597cccc
7 changed files with 255 additions and 79 deletions
|
|
@ -8,18 +8,14 @@ void load(char* _fileName){
|
|||
fscanf(f,"%d",&n);
|
||||
else
|
||||
printf("Le Fichier est vide\n");
|
||||
a=new int*[n];
|
||||
for(int i=0;i<n;i++)
|
||||
a[i]=new int[n];
|
||||
b=new int*[n];
|
||||
for(int i=0;i<n;i++)
|
||||
b[i]=new int[n];
|
||||
a=new int[n*n];
|
||||
b=new int[n*n];
|
||||
for (i=0;i<n;i++)
|
||||
for(j=0;j<n;j++)
|
||||
fscanf(f,"%d",&a[i][j]);
|
||||
fscanf(f,"%d",&a[i*n+j]);
|
||||
for (i=0;i<n;i++)
|
||||
for(j=0;j<n;j++)
|
||||
fscanf(f,"%d",&b[i][j]);
|
||||
fscanf(f,"%d",&b[i*n+j]);
|
||||
}
|
||||
|
||||
template<class EOT>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,9 @@ class QapEval : public eoEvalFunc<EOT>
|
|||
|
||||
void operator() (EOT & _sol) {
|
||||
int cost=0;
|
||||
for (int i=0; i<n; i++)
|
||||
std::cout<<_sol[i]<<" ";
|
||||
std::cout<<std::endl;
|
||||
for (int i=0; i<n; i++)
|
||||
for (int j=0; j<n; j++)
|
||||
cost += a[i][j] * b[_sol[i]][_sol[j]];
|
||||
cost += a[i*n+j] * b[_sol[i]*n+_sol[j]];
|
||||
_sol.fitness(cost);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,23 +21,24 @@ class QapIncrEval : public moEval<Neighbor>{
|
|||
|
||||
int cost=0;
|
||||
unsigned i,j;
|
||||
int neighborhoodsize = (n * (n - 1)) / 2;
|
||||
_neighbor.getIndices(i,j);
|
||||
_neighbor.getIndices(n,i,j);
|
||||
cost = _sol.fitness() +compute_delta(n,a,b,_sol,i,j);
|
||||
_neighbor.fitness(cost);
|
||||
}
|
||||
|
||||
// specific to the QAP incremental evaluation (part of algorithmic)
|
||||
int compute_delta(int n, int** a, int** b,EOT & _sol,int i,int j)
|
||||
int compute_delta(int n, int* a, int* b,EOT & _sol,int i,int j)
|
||||
{
|
||||
int d; int k;
|
||||
d = (a[i][i]-a[j][j])*(b[_sol[j]][_sol[j]]-b[_sol[i]][_sol[i]]) +
|
||||
(a[i][j]-a[j][i])*(b[_sol[j]][_sol[i]]-b[_sol[i]][_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][i]-a[k][j])*(b[_sol[k]][_sol[j]]-b[_sol[k]][_sol[i]]) +
|
||||
(a[i][k]-a[j][k])*(b[_sol[j]][_sol[k]]-b[_sol[i]][_sol[k]]);
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#ifndef _SOLUTION_H_
|
||||
#define _SOLUTION_H_
|
||||
|
||||
#include <eo> // PARADISEO
|
||||
#include <eo>
|
||||
|
||||
class Solution:public EO <eoMinimizingFitness>{ // PARADISEO
|
||||
class Solution:public EO <eoMinimizingFitness>{
|
||||
|
||||
public:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue