From bdefa7d2b1264232db4d17e6d976979dcd559547 Mon Sep 17 00:00:00 2001 From: jboisson Date: Wed, 17 Dec 2008 17:33:00 +0000 Subject: [PATCH] According to the transformation of moExponentialCoolingSchedule, Lesson4 has been updated git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1304 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp index 5f5274806..3b006de99 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp @@ -83,9 +83,9 @@ main (int _argc, char* _argv []) moCoolingSchedule* coolingSchedule; - if(value.compare("Expo")==0) + if(value.compare("Geometric")==0) { - coolingSchedule=new moExponentialCoolingSchedule(threshold, exponentialRatio); + coolingSchedule=new moGeometricCoolingSchedule(threshold, exponentialRatio); } else if (value.compare("Linear")==0) { @@ -129,7 +129,7 @@ manage_configuration_file(eoParser & _parser) _parser.getORcreateParam((double)0.5, "lineaRatio", "Ratio used if linear cooling schedule is chosen.", 0, "Configuration", false); - _parser.getORcreateParam(std::string("Expo"), "coolSchedType", "Type the cooling schedule: 'Expo' or 'Linear'.", + _parser.getORcreateParam(std::string("Geometric"), "coolSchedType", "Type the cooling schedule: 'Geometric' or 'Linear'.", 0, "Configuration", false); if (_parser.userNeedsHelp())