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

Update type of elements in QAP eval and QAP incrEval

Browse source
This commit is contained in:
verel 2015-06-09 11:08:41 +02:00
commit c9475c4ed0
6 changed files with 79 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mo/src/problems/eval/moQAPIncrEval.h
View file

@ -35,8 +35,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
/**
* Incremental evaluation Function for the QAP problem
*
* ElemType is the type of elements in the matrix. This type must be signed and not unsigned.
*/
template< class Neighbor >
template< class Neighbor, typename ElemType = long int >
class moQAPIncrEval : public moEval<Neighbor>
{
public:
@ -46,7 +48,7 @@ public:
* default constructor
* @param _qapEval full evaluation of the QAP problem
*/
moQAPIncrEval(QAPeval<EOT> & _qapEval) {
moQAPIncrEval(QAPeval<EOT, ElemType> & _qapEval) {
n = _qapEval.getNbVar();
A = _qapEval.getA();
B = _qapEval.getB();
@ -58,7 +60,7 @@ public:
* @param _neighbor the neighbor to consider (of type moSwapNeigbor)
*/
virtual void operator()(EOT & _solution, Neighbor & _neighbor) {
int d;
ElemType d;
int k;
unsigned i = _neighbor.first();
@ -81,10 +83,10 @@ private:
int n;
// matrix A
int ** A;
ElemType ** A;
// matrix B
int ** B;
ElemType ** B;
};