git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2464 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2011-09-29 15:31:22 +00:00
commit 2531b1d2db

View file

@ -101,20 +101,10 @@ int main(int argc, char **argv)
unsigned seed = seedParam.value(); unsigned seed = seedParam.value();
// Iteration number // Iteration number
eoValueParam<unsigned int> nbIterationParam(1, "nbIteration", "TS Iteration number", 'I'); eoValueParam<unsigned int> nbIterationParam(100, "nbIteration", "TS Iteration number", 'I');
parser.processParam( nbIterationParam, "TS Iteration number" ); parser.processParam( nbIterationParam, "TS Iteration number" );
unsigned nbIteration = nbIterationParam.value(); unsigned nbIteration = nbIterationParam.value();
// size tabu list
eoValueParam<unsigned int> sizeTabuListParam(7, "sizeTabuList", "size of the tabu list", 'T');
parser.processParam( sizeTabuListParam, "Search Parameters" );
unsigned sizeTabuList = sizeTabuListParam.value();
// duration tabu list
eoValueParam<unsigned int> durationParam(7, "duration", "duration of the tabu list", 'D');
parser.processParam( durationParam, "Search Parameters" );
unsigned duration = durationParam.value();
// the name of the "status" file where all actual parameter values will be saved // the name of the "status" file where all actual parameter values will be saved
string str_status = parser.ProgramName() + ".status"; // default value string str_status = parser.ProgramName() + ".status"; // default value
eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file"); eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file");
@ -204,8 +194,8 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
sizeTabuList=sizeMap; unsigned sizeTabuList=sizeMap;
duration=sizeTabuList/8; unsigned duration=sizeTabuList/8;
// tabu list // tabu list
moIndexedVectorTabuList<Neighbor> tl(sizeTabuList,duration); moIndexedVectorTabuList<Neighbor> tl(sizeTabuList,duration);