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

Merge branch 'mo-1.3' of git:do into mo-1.3

Browse source
This commit is contained in:
Johann Dreo 2010-09-08 12:15:08 +02:00
commit 86b08289c0
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),
_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<EOT> _dummy_neighbor;
};
#endif // !_doEDASA_h