switch to new MO 1.3 classes and interface

This commit is contained in:
Johann Dreo 2010-09-03 18:32:27 +02:00
commit 97143d65a3

View file

@ -59,8 +59,8 @@ public:
eoContinue< EOT > & pop_continue, eoContinue< EOT > & pop_continue,
doContinue< D > & distribution_continue, doContinue< D > & distribution_continue,
eoEvalFunc < EOT > & evaluation, eoEvalFunc < EOT > & evaluation,
moSolContinue < EOT > & sa_continue, moContinuator< moDummyNeighbor<EOT> > & sa_continue,
moCoolingSchedule & cooling_schedule, moCoolingSchedule<EOT> & cooling_schedule,
double initial_temperature, double initial_temperature,
eoReplacement< EOT > & replacor eoReplacement< EOT > & replacor
) )
@ -227,10 +227,10 @@ private:
eoEvalFunc < EOT > & _evaluation; eoEvalFunc < EOT > & _evaluation;
//! Stopping criterion before temperature update //! Stopping criterion before temperature update
moSolContinue < EOT > & _sa_continue; moContinuator< moDummyNeighbor<EOT> > & _sa_continue;
//! The cooling schedule //! The cooling schedule
moCoolingSchedule & _cooling_schedule; moCoolingSchedule<EOT> & _cooling_schedule;
//! Initial temperature //! Initial temperature
double _initial_temperature; double _initial_temperature;