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

* fixed bad using of method moNeighbor< EOT >::init( EOT& )

Browse source
This commit is contained in:
Caner CANDAN 2010-09-07 15:36:16 +02:00
commit 56680e865d
1 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/doEDASA.h
View file

@ -75,8 +75,7 @@ public:
_sa_continue(sa_continue), _sa_continue(sa_continue),
_cooling_schedule(cooling_schedule), _cooling_schedule(cooling_schedule),
_initial_temperature(initial_temperature), _initial_temperature(initial_temperature),
_replacor(replacor), _replacor(replacor)
_dummy_neighbor()
{} {}
@ -126,9 +125,6 @@ public:
//------------------------------------------------------------- //-------------------------------------------------------------
_sa_continue.init( _dummy_neighbor );
//------------------------------------------------------------- //-------------------------------------------------------------
// (4) Estimation of the distribution parameters // (4) Estimation of the distribution parameters
//------------------------------------------------------------- //-------------------------------------------------------------
@ -167,6 +163,8 @@ public:
// Building of the sampler in current_pop // Building of the sampler in current_pop
//------------------------------------------------------------- //-------------------------------------------------------------
_sa_continue.init( current_solution );
current_pop.clear(); current_pop.clear();
do do
@ -239,26 +237,6 @@ private:
//! A EOT replacor //! A EOT replacor
eoReplacement < 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<EOT> _dummy_neighbor;
}; };
#endif // !_doEDASA_h #endif // !_doEDASA_h