* main.cpp: removed useless comments * src/do: added some lines to make detectable language file * doEDASA.h: added some comments
This commit is contained in:
parent
08754eeaee
commit
1086dc4d49
3 changed files with 43 additions and 57 deletions
4
src/do
4
src/do
|
|
@ -52,3 +52,7 @@
|
|||
#include "utils/doPopStat.h"
|
||||
|
||||
#endif // !_do_
|
||||
|
||||
// Local Variables:
|
||||
// mode: C++
|
||||
// End:
|
||||
|
|
|
|||
|
|
@ -38,23 +38,24 @@ public:
|
|||
/*!
|
||||
All the boxes used by a EDASA need to be given.
|
||||
|
||||
\param selector The EOT selector
|
||||
\param estomator The EOT selector
|
||||
\param selector Population Selector
|
||||
\param estimator Distribution Estimator
|
||||
\param selectone SelectOne
|
||||
\param modifier The D modifier
|
||||
\param sampler The D sampler
|
||||
\param evaluation The evaluation function.
|
||||
\param continue The stopping criterion.
|
||||
\param cooling_schedule The cooling schedule, describes how the temperature is modified.
|
||||
\param modifier Distribution Modifier
|
||||
\param sampler Distribution Sampler
|
||||
\param pop_continue Population Continuator
|
||||
\param distribution_continue Distribution Continuator
|
||||
\param evaluation Evaluation function.
|
||||
\param sa_continue Stopping criterion.
|
||||
\param cooling_schedule Cooling schedule, describes how the temperature is modified.
|
||||
\param initial_temperature The initial temperature.
|
||||
\param replacor The EOT replacor
|
||||
\param replacor Population replacor
|
||||
*/
|
||||
doEDASA (eoSelect< EOT > & selector,
|
||||
doEstimator< D > & estimator,
|
||||
eoSelectOne< EOT > & selectone,
|
||||
doModifierMass< D > & modifier,
|
||||
doSampler< D > & sampler,
|
||||
// eoContinue< EOT > & monitoring_continue,
|
||||
eoContinue< EOT > & pop_continue,
|
||||
doContinue< D > & distribution_continue,
|
||||
eoEvalFunc < EOT > & evaluation,
|
||||
|
|
@ -68,7 +69,6 @@ public:
|
|||
_selectone(selectone),
|
||||
_modifier(modifier),
|
||||
_sampler(sampler),
|
||||
// _monitoring_continue(monitoring_continue),
|
||||
_pop_continue(pop_continue),
|
||||
_distribution_continue(distribution_continue),
|
||||
_evaluation(evaluation),
|
||||
|
|
@ -186,7 +186,7 @@ public:
|
|||
}
|
||||
while ( _sa_continue( current_solution) );
|
||||
|
||||
//selected_pop.sort();
|
||||
pop.sort();
|
||||
|
||||
_replacor(pop, current_pop);
|
||||
|
||||
|
|
@ -217,9 +217,6 @@ private:
|
|||
//! A D sampler
|
||||
doSampler< D > & _sampler;
|
||||
|
||||
//! A EOT monitoring continuator
|
||||
// eoContinue < EOT > & _monitoring_continue;
|
||||
|
||||
//! A EOT population continuator
|
||||
eoContinue < EOT > & _pop_continue;
|
||||
|
||||
|
|
|
|||
Reference in a new issue