From 97143d65a398de62fb1c0d4dfc1a28545010fb16 Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Fri, 3 Sep 2010 18:32:27 +0200 Subject: [PATCH] switch to new MO 1.3 classes and interface --- src/doEDASA.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/doEDASA.h b/src/doEDASA.h index 05c8cc1c..c0dce883 100644 --- a/src/doEDASA.h +++ b/src/doEDASA.h @@ -59,8 +59,8 @@ public: eoContinue< EOT > & pop_continue, doContinue< D > & distribution_continue, eoEvalFunc < EOT > & evaluation, - moSolContinue < EOT > & sa_continue, - moCoolingSchedule & cooling_schedule, + moContinuator< moDummyNeighbor > & sa_continue, + moCoolingSchedule & cooling_schedule, double initial_temperature, eoReplacement< EOT > & replacor ) @@ -227,10 +227,10 @@ private: eoEvalFunc < EOT > & _evaluation; //! Stopping criterion before temperature update - moSolContinue < EOT > & _sa_continue; + moContinuator< moDummyNeighbor > & _sa_continue; //! The cooling schedule - moCoolingSchedule & _cooling_schedule; + moCoolingSchedule & _cooling_schedule; //! Initial temperature double _initial_temperature;