Change in terminology: EDA (Estimation of Distribution Algorithms) replaces
DEA (Distribution Evolution Algorithms), as it seems more widely used today.
This commit is contained in:
parent
d6cce45ad0
commit
21301c327d
2 changed files with 151 additions and 0 deletions
46
eo/src/eoEDA.h
Normal file
46
eo/src/eoEDA.h
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// eoEDA.h
|
||||
// (c) Marc Schoenauer, Maarten Keijzer, 2001
|
||||
/*
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
Contact: Marc.Schoenauer@polytechnique.fr
|
||||
mkeijzer@dhi.dk
|
||||
*/
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef _eoEDA_h
|
||||
#define _eoEDA_h
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#include <eoDistribution.h>
|
||||
|
||||
/** eoEDA: Estimation of Distribution Algorithm within EO
|
||||
*
|
||||
* The abstract class for algorithms that evolve a probability distribution
|
||||
* on the spaces of populations rather than a population
|
||||
*
|
||||
* It IS NOT an eoAlgo, as it evolves a distribution, not a population
|
||||
*/
|
||||
|
||||
template<class EOT> class eoEDA: public eoUF<eoDistribution<EOT>&, void>
|
||||
{
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
105
eo/src/eoSimpleEDA.h
Normal file
105
eo/src/eoSimpleEDA.h
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// eoSimpleEDA.h
|
||||
// (c) Marc Schoenauer, Maarten Keijzer, 2001
|
||||
/*
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
Contact: Marc.Schoenauer@polytechnique.fr
|
||||
mkeijzer@dhi.dk
|
||||
*/
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef _eoSimpleEDA_h
|
||||
#define _eoSimpleEDA_h
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#include <apply.h>
|
||||
#include <eoEDA.h>
|
||||
#include <eoContinue.h>
|
||||
#include <eoDistribUpdater.h>
|
||||
#include <eoEvalFunc.h>
|
||||
|
||||
/** eoSimpleEDA: a very simple Estimation of Distribution Algorithm
|
||||
*
|
||||
* The algorithm that evolves a probability distribution
|
||||
* on the spaces of populations with the loop
|
||||
* generate a population from the current distribution
|
||||
* evaluate that population
|
||||
* update the distribution
|
||||
*/
|
||||
|
||||
template<class EOT> class eoSimpleEDA: public eoEDA<EOT>
|
||||
{
|
||||
public:
|
||||
|
||||
/** Ctor from an eoDistribUpdater
|
||||
* ... plus an eoEval and eoContinue of course
|
||||
*/
|
||||
eoSimpleEDA(eoDistribUpdater<EOT>& _update,
|
||||
eoEvalFunc<EOT>& _eval,
|
||||
unsigned _popSize,
|
||||
eoContinue<EOT>& _continuator
|
||||
) :
|
||||
update(_update),
|
||||
eval(_eval),
|
||||
popSize(_popSize),
|
||||
continuator(_continuator)
|
||||
{}
|
||||
|
||||
/** The algorithm:
|
||||
* generate pop from distrib,
|
||||
* evaluate pop,
|
||||
* update distrib
|
||||
*/
|
||||
virtual void operator()(eoDistribution<EOT>& _distrib)
|
||||
{
|
||||
eoPop<EOT> pop(popSize, _distrib);
|
||||
do
|
||||
{
|
||||
try
|
||||
{
|
||||
apply<EOT>(_distrib, pop); // re-init. of _pop from distrib
|
||||
|
||||
apply<EOT>(eval, pop); // eval of current population
|
||||
|
||||
update(_distrib, pop); // updates distrib from _pop
|
||||
|
||||
}
|
||||
catch (std::exception& e)
|
||||
{
|
||||
std::string s = e.what();
|
||||
s.append( " in eoSimpleEDA");
|
||||
throw std::runtime_error( s );
|
||||
}
|
||||
} while ( continuator( pop ) );
|
||||
}
|
||||
|
||||
private:
|
||||
eoDistribUpdater<EOT> & update;
|
||||
|
||||
eoEvalFunc<EOT>& eval;
|
||||
|
||||
unsigned popSize;
|
||||
|
||||
eoContinue<EOT>& continuator;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#endif
|
||||
|
||||
Reference in a new issue