From 56680e865dac21a81086d3e854dcd4607dff88cc Mon Sep 17 00:00:00 2001 From: Caner CANDAN Date: Tue, 7 Sep 2010 15:36:16 +0200 Subject: [PATCH] * fixed bad using of method moNeighbor< EOT >::init( EOT& ) --- src/doEDASA.h | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/src/doEDASA.h b/src/doEDASA.h index 93586249d..c8e9ad9a9 100644 --- a/src/doEDASA.h +++ b/src/doEDASA.h @@ -75,8 +75,7 @@ public: _sa_continue(sa_continue), _cooling_schedule(cooling_schedule), _initial_temperature(initial_temperature), - _replacor(replacor), - _dummy_neighbor() + _replacor(replacor) {} @@ -126,9 +125,6 @@ public: //------------------------------------------------------------- - _sa_continue.init( _dummy_neighbor ); - - //------------------------------------------------------------- // (4) Estimation of the distribution parameters //------------------------------------------------------------- @@ -167,6 +163,8 @@ public: // Building of the sampler in current_pop //------------------------------------------------------------- + _sa_continue.init( current_solution ); + current_pop.clear(); do @@ -239,26 +237,6 @@ private: //! A EOT replacor eoReplacement < EOT > & _replacor; - - //------------------------------------------------------------- - // Temporary solution to store populations state at each - // iteration for plotting. - //------------------------------------------------------------- - - // std::ofstream _ofs_params; - // std::ofstream _ofs_params_var; - - //------------------------------------------------------------- - - //------------------------------------------------------------- - // Temporary solution to store bounds values for each distribution. - //------------------------------------------------------------- - - // std::string _bounds_results_destination; - - //------------------------------------------------------------- - - moDummyNeighbor _dummy_neighbor; }; #endif // !_doEDASA_h