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

some MO types replacement

Browse source
This commit is contained in:
Johann Dreo 2010-09-04 23:07:37 +02:00
commit 5dc8a1a8fe
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
application/eda_sa/main.cpp
View file

@ -124,7 +124,7 @@ int main(int ac, char** av)
unsigned int popSize = parser.getORcreateParam((unsigned int)20, "popSize", "Population Size", 'P', "Evolution Engine").value();
moGenSolContinue< EOT >* sa_continue = new moGenSolContinue< EOT >( popSize );
moContinuator< moDummyNeighbor<EOT> >* sa_continue = new moIterContinuator< moDummyNeighbor<EOT> >( popSize );
state.storeFunctor(sa_continue);
//-----------------------------------------------------------------------------
@ -134,10 +134,10 @@ int main(int ac, char** av)
// SA parameters
//-----------------------------------------------------------------------------
double threshold = parser.createParam((double)0.1, "threshold", "Threshold: temperature threshold stopping criteria", 't', section).value(); // t
double alpha = parser.createParam((double)0.1, "alpha", "Alpha: temperature dicrease rate", 'a', section).value(); // a
double threshold_temperature = parser.createParam((double)0.1, "threshold", "Minimal temperature at which stop", 't', section).value(); // t
double alpha = parser.createParam((double)0.1, "alpha", "Temperature decrease rate", 'a', section).value(); // a
moCoolingSchedule* cooling_schedule = new moGeometricCoolingSchedule(threshold, alpha);
moCoolingSchedule<EOT>* cooling_schedule = new moSimpleCoolingSchedule<EOT>(initial_temperature, alpha, 0, threshold_temperature);
state.storeFunctor(cooling_schedule);
//-----------------------------------------------------------------------------