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

update moIndexedVectorTabuList

Browse source
This commit is contained in:
verel 2014-06-27 21:25:08 +02:00
commit fa03cd7efe
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
mo/src/memory/moIndexedVectorTabuList.h
View file

@ -35,8 +35,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <iostream> #include <iostream>
/** /**
*
* Tabu List of indexed neighbors save in a vector * Tabu List of indexed neighbors save in a vector
* each neighbor can not used during howlong iterations * each neighbor can not used during howlong iterations
*
* The tabu tenure could be random between two bounds
* such as in robust tabu search
*
*/ */
template<class Neighbor > template<class Neighbor >
class moIndexedVectorTabuList : public moTabuList<Neighbor> class moIndexedVectorTabuList : public moTabuList<Neighbor>
@ -49,7 +54,17 @@ public:
* @param _maxSize maximum size of the tabu list * @param _maxSize maximum size of the tabu list
* @param _howlong how many iteration a move is tabu * @param _howlong how many iteration a move is tabu
*/ */
moIndexedVectorTabuList(unsigned int _maxSize, unsigned int _howlong) : maxSize(_maxSize), howlong(_howlong) { moIndexedVectorTabuList(unsigned int _maxSize, unsigned int _howlong) : maxSize(_maxSize), howlong(_howlong), robust(false) {
tabuList.resize(_maxSize);
}
/**
* Constructor
* @param _maxSize maximum size of the tabu list
* @param _howlongMin minimal number of iterations during a move is tabu
* @param _howlongMax maximal number of iterations during a move is tabu
*/
moIndexedVectorTabuList(unsigned int _maxSize, unsigned int _howlongMin, unsigned int _howlongMax) : maxSize(_maxSize), howlongMin(_howlongMin), howlongMax(_howlongMax), robust(true) {
tabuList.resize(_maxSize); tabuList.resize(_maxSize);
} }
@ -68,8 +83,13 @@ public:
* @param _neighbor the current neighbor * @param _neighbor the current neighbor
*/ */
virtual void add(EOT & _sol, Neighbor & _neighbor) { virtual void add(EOT & _sol, Neighbor & _neighbor) {
if (_neighbor.index() < maxSize) if (_neighbor.index() < maxSize) {
if (robust)
// random value between min and max
howlong = howlongMin + rng.random(howlongMax - howlongMin);
tabuList[_neighbor.index()] = howlong; tabuList[_neighbor.index()] = howlong;
}
} }
/** /**
@ -115,7 +135,12 @@ protected:
unsigned int maxSize; unsigned int maxSize;
//how many iteration a move is tabu //how many iteration a move is tabu
unsigned int howlong; unsigned int howlong;
// Minimum number of iterations during a move is tabu
unsigned int howlongMin;
// Maximum number of iterations during a move is tabu
unsigned int howlongMax;
// true: robust tabu search way
bool robust;
}; };
#endif #endif

2
mo/src/perturb/moMonOpPerturb.h
View file

@ -70,7 +70,7 @@ public:
bool res = false; bool res = false;
if (rndPerturb) if (rndPerturb)
nbPerturbation = nbPerturbationMin + rng.random(nbPerturbationMax); nbPerturbation = nbPerturbationMin + rng.random(nbPerturbationMax - nbPerturbationMin);
for(unsigned int i = 0; i < nbPerturbation; i++) for(unsigned int i = 0; i < nbPerturbation; i++)
res = monOp(_solution) || res; res = monOp(_solution) || res;