Change in terminology: EDA (Estimation of Distribution Algorithms) replaces

DEA (Distribution Evolution Algorithms), as it seems more widely used today.

eo/src/obsolete/eoDEA.h

@@ -0,0 +1,46 @@
+// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+
+//-----------------------------------------------------------------------------
+// eoDEA.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 _eoDEA_h
+#define _eoDEA_h
+
+//-----------------------------------------------------------------------------
+
+#include <eoDistribution.h>
+
+/** eoDEA: Distribution Evolution 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 eoDEA: public eoUF<eoDistribution<EOT>&, void>
+{
+};
+
+#endif
+

eo/src/obsolete/eoSimpleDEA.h

@@ -0,0 +1,105 @@
+// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
+
+//-----------------------------------------------------------------------------
+// eoSimpleDEA.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 _eoSimpleDEA_h
+#define _eoSimpleDEA_h
+
+//-----------------------------------------------------------------------------
+
+#include <apply.h>
+#include <eoDEA.h>
+#include <eoContinue.h>
+#include <eoDistribUpdater.h>
+#include <eoEvalFunc.h>
+
+/** eoSimpleDEA: a very simple Distribution Evolution 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 eoSimpleDEA: public eoDEA<EOT>
+{
+ public:
+
+  /** Ctor from an eoDistribUpdater
+   * ... plus an eoEval and eoContinue of course 
+   */
+  eoSimpleDEA(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 eoSimpleDEA");
+	    throw std::runtime_error( s );
+      }
+    } while ( continuator( pop ) );
+  }
+
+ private:
+  eoDistribUpdater<EOT> & update;
+
+  eoEvalFunc<EOT>&          eval;
+  
+  unsigned                  popSize;
+
+  eoContinue<EOT>&          continuator;
+};
+
+//-----------------------------------------------------------------------------
+
+#endif
+

eo/test/t-eoPBIL.cpp

@@ -32,7 +32,7 @@
 #include <ga/eoPBILDistrib.h>
 #include <ga/eoPBILOrg.h>
 #include <ga/eoPBILAdditive.h>
-#include <eoSimpleDEA.h>
+#include <eoSimpleEDA.h>
 
 using namespace std;
 
@@ -106,10 +106,10 @@ int main(int argc, char* argv[])
       }
 #endif
 
-  // the algorithm: DEA
+  // the algorithm: EDA
     // don't know where else to put the population size!
   unsigned popSize = parser.createParam(unsigned(100), "popSize", "Population Size", 'P', "Algorithm").value();
-  eoSimpleDEA<Indi> dea(update, eval, popSize, checkpoint);
+  eoSimpleEDA<Indi> eda(update, eval, popSize, checkpoint);
 
   ///// End of construction of the algorith
   /////////////////////////////////////////
@@ -119,7 +119,7 @@ int main(int argc, char* argv[])
   //// GO
   ///////
 
-  dea(distrib); // run the dea
+  eda(distrib); // run the eda
 
   std::cout << "Final Distribution\n";
   distrib.printOn(std::cout);