indent a file for a test

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1054 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
legrand 2008-03-03 17:01:47 +00:00
commit 9100f88efa

View file

@ -43,108 +43,108 @@ void manage_configuration_file(eoParser & _parser);
int int
main (int _argc, char* _argv []) main (int _argc, char* _argv [])
{ {
std::string instancePath, value; std::string instancePath, value;
unsigned int seed, maxIterations, tabuListSize; unsigned int seed, maxIterations, tabuListSize;
eoParser parser(_argc, _argv); eoParser parser(_argc, _argv);
manage_configuration_file(parser); manage_configuration_file(parser);
seed=atoi( (parser.getParamWithLongName("seed")->getValue()).c_str() ); seed=atoi( (parser.getParamWithLongName("seed")->getValue()).c_str() );
maxIterations=atoi( (parser.getParamWithLongName("maxIter")->getValue()).c_str() ); maxIterations=atoi( (parser.getParamWithLongName("maxIter")->getValue()).c_str() );
tabuListSize=atoi( (parser.getParamWithLongName("tabuListSize")->getValue()).c_str() ); tabuListSize=atoi( (parser.getParamWithLongName("tabuListSize")->getValue()).c_str() );
instancePath=parser.getParamWithLongName("instancePath")->getValue(); instancePath=parser.getParamWithLongName("instancePath")->getValue();
value=parser.getParamWithLongName("tabuListType")->getValue(); value=parser.getParamWithLongName("tabuListType")->getValue();
srand (seed); srand (seed);
Graph::load(instancePath.c_str()); Graph::load(instancePath.c_str());
Route solution; Route solution;
RouteInit initializer; RouteInit initializer;
initializer(solution); initializer(solution);
RouteEval full_evaluation; RouteEval full_evaluation;
full_evaluation(solution); full_evaluation(solution);
std :: cout << "[From] " << solution << std :: endl; std :: cout << "[From] " << solution << std :: endl;
/* Tools for an efficient (? :-)) /* Tools for an efficient (? :-))
local search ! */ local search ! */
TwoOptInit two_opt_initializer; TwoOptInit two_opt_initializer;
TwoOptNext two_opt_next_move_generator; TwoOptNext two_opt_next_move_generator;
TwoOptIncrEval two_opt_incremental_evaluation; TwoOptIncrEval two_opt_incremental_evaluation;
moTabuList<TwoOpt> *tabuList; moTabuList<TwoOpt> *tabuList;
if(value.compare("TwoOpt")==0) if (value.compare("TwoOpt")==0)
{ {
tabuList=new TwoOptTabuList(); tabuList=new TwoOptTabuList();
} }
else if (value.compare("SimpleMove")==0) else if (value.compare("SimpleMove")==0)
{ {
tabuList=new moSimpleMoveTabuList<TwoOpt>(tabuListSize); tabuList=new moSimpleMoveTabuList<TwoOpt>(tabuListSize);
} }
else if (value.compare("SimpleSolution")==0) else if (value.compare("SimpleSolution")==0)
{ {
tabuList=new moSimpleSolutionTabuList<TwoOpt>(tabuListSize); tabuList=new moSimpleSolutionTabuList<TwoOpt>(tabuListSize);
} }
else else
{ {
throw std::runtime_error("[tabu_search.cpp]: the type of tabu list '"+value+"' is not correct."); throw std::runtime_error("[tabu_search.cpp]: the type of tabu list '"+value+"' is not correct.");
} }
moNoAspirCrit <TwoOpt> aspiration_criterion; moNoAspirCrit <TwoOpt> aspiration_criterion;
moGenSolContinue <Route> continu (maxIterations); moGenSolContinue <Route> continu (maxIterations);
moTS <TwoOpt> tabu_search (two_opt_initializer, two_opt_next_move_generator, moTS <TwoOpt> tabu_search (two_opt_initializer, two_opt_next_move_generator,
two_opt_incremental_evaluation, *tabuList, aspiration_criterion, continu, full_evaluation); two_opt_incremental_evaluation, *tabuList, aspiration_criterion, continu, full_evaluation);
tabu_search(solution); tabu_search(solution);
std :: cout << "[To] " << solution << std :: endl; std :: cout << "[To] " << solution << std :: endl;
delete(tabuList); delete(tabuList);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
void void
manage_configuration_file(eoParser & _parser) manage_configuration_file(eoParser & _parser)
{ {
std::ofstream os; std::ofstream os;
#ifdef _MSVC #ifdef _MSVC
_parser.createParam(std::string("..\examples\tsp\benchs\berlin52.tsp"), "instancePath", "Path to the instance.", _parser.createParam(std::string("..\examples\tsp\benchs\berlin52.tsp"), "instancePath", "Path to the instance.",
0, "Configuration", false); 0, "Configuration", false);
#else #else
_parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.", _parser.createParam(std::string("../examples/tsp/benchs/berlin52.tsp"), "instancePath", "Path to the instance.",
0, "Configuration", false); 0, "Configuration", false);
#endif #endif
_parser.createParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false); _parser.createParam((unsigned int)time(0), "seed", "Seed for rand.", 0, "Configuration", false);
_parser.createParam((unsigned int)10, "tabuListSize", "Size of the tabu list.", 0, "Configuration", false); _parser.createParam((unsigned int)10, "tabuListSize", "Size of the tabu list.", 0, "Configuration", false);
_parser.createParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false); _parser.createParam((unsigned int)1000, "maxIter", "Maximum number of iterations.", 0, "Configuration", false);
_parser.createParam(std::string("TwoOpt"), "tabuListType", "Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'.", _parser.createParam(std::string("TwoOpt"), "tabuListType", "Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'.",
0, "Configuration", false); 0, "Configuration", false);
if (_parser.userNeedsHelp()) if (_parser.userNeedsHelp())
{ {
_parser.printHelp(std::cout); _parser.printHelp(std::cout);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
os.open("current_param"); os.open("current_param");
if(!os.is_open()) if (!os.is_open())
{ {
throw std::runtime_error("[tabu_search.cpp]: the file current_param cannot be created."); throw std::runtime_error("[tabu_search.cpp]: the file current_param cannot be created.");
} }
os <<_parser; os <<_parser;
os.close(); os.close();
} }