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

According to the transformation of moExponentialCoolingSchedule, Lesson4 has been updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1304 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-12-17 17:33:00 +00:00
commit bdefa7d2b1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp
View file

@ -83,9 +83,9 @@ main (int _argc, char* _argv [])
moCoolingSchedule* coolingSchedule; 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) 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((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); 0, "Configuration", false);
if (_parser.userNeedsHelp()) if (_parser.userNeedsHelp())