New style for MO
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@787 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
47298125ec
commit
7161febf9c
80 changed files with 2014 additions and 2038 deletions
|
|
@ -44,8 +44,6 @@
|
||||||
moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library.
|
moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library.
|
||||||
*/
|
*/
|
||||||
template < class EOT > class moAlgo:public eoMonOp < EOT >
|
template < class EOT > class moAlgo:public eoMonOp < EOT >
|
||||||
{
|
{};
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@
|
||||||
*/
|
*/
|
||||||
template<class EOT>
|
template<class EOT>
|
||||||
class moComparator: public eoBF<const EOT&, const EOT&, bool>
|
class moComparator: public eoBF<const EOT&, const EOT&, bool>
|
||||||
{
|
{};
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -45,8 +45,6 @@
|
||||||
See moExponentialCoolingSchedule or moLinearCoolingSchedule for example.
|
See moExponentialCoolingSchedule or moLinearCoolingSchedule for example.
|
||||||
*/
|
*/
|
||||||
class moCoolingSchedule:public eoUF < double &, bool >
|
class moCoolingSchedule:public eoUF < double &, bool >
|
||||||
{
|
{};
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,7 @@ public:
|
||||||
\param __maxNumGen the maximum number of generation.
|
\param __maxNumGen the maximum number of generation.
|
||||||
*/
|
*/
|
||||||
moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
|
moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
|
||||||
{
|
{}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Function that activates the stop criterion.
|
//! Function that activates the stop criterion.
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
|
|
@ -77,9 +77,7 @@ public:
|
||||||
moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
|
moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
|
||||||
(__move_init, __next_move, __incr_eval, __move_select)),
|
(__move_init, __next_move, __incr_eval, __move_select)),
|
||||||
full_eval (__full_eval)
|
full_eval (__full_eval)
|
||||||
{
|
{}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Light constructor.
|
//! Light constructor.
|
||||||
/*!
|
/*!
|
||||||
|
|
@ -91,9 +89,7 @@ moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEv
|
||||||
moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
|
moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
|
||||||
full_eval
|
full_eval
|
||||||
(__full_eval)
|
(__full_eval)
|
||||||
{
|
{}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Function which launches the HC
|
//! Function which launches the HC
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
|
|
@ -70,9 +70,7 @@ moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move,
|
||||||
move_init (__move_init),
|
move_init (__move_init),
|
||||||
next_move (__next_move),
|
next_move (__next_move),
|
||||||
incr_eval (__incr_eval), move_select (__move_select)
|
incr_eval (__incr_eval), move_select (__move_select)
|
||||||
{
|
{}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Procedure which launches the explorer.
|
//! Procedure which launches the explorer.
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
|
|
@ -62,9 +62,7 @@ public:
|
||||||
moItRandNextMove (moRandMove < M > &__rand_move,
|
moItRandNextMove (moRandMove < M > &__rand_move,
|
||||||
unsigned int __max_iter):rand_move (__rand_move),
|
unsigned int __max_iter):rand_move (__rand_move),
|
||||||
max_iter (__max_iter), num_iter (0)
|
max_iter (__max_iter), num_iter (0)
|
||||||
{
|
{}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//! Generation of a new move
|
//! Generation of a new move
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue