fix back some errors inserted by previous refactoring

- move PBIL classes in deprecated/, superseeded by the EDO module

edo/test/t-bounderno.cpp

@@ -28,7 +28,7 @@ Authors:
 #include <eo>
 #include <edo>
 
-#include "Rosenbrock.h"
+#include "../application/common/Rosenbrock.h"
 
 typedef eoReal< eoMinimizingFitness > EOT;
 

edo/test/t-continue.cpp

@@ -28,7 +28,7 @@ Authors:
 #include <eo>
 #include <edo>
 
-#include "Rosenbrock.h"
+#include "../application/common/Rosenbrock.h"
 
 typedef eoReal< eoMinimizingFitness > EOT;
 typedef edoUniform< EOT > Distrib;

edo/test/t-edoEstimatorNormalMulti.cpp

@@ -33,8 +33,8 @@ Authors:
 
 #include <edo>
 
-#include "Rosenbrock.h"
+#include "../application/common/Rosenbrock.h"
-#include "Sphere.h"
+#include "../application/common/Sphere.h"
 
 typedef eoReal< eoMinimizingFitness > EOT;
 typedef edoNormalMulti< EOT > Distrib;

edo/test/t-mean-distance.cpp

@@ -38,8 +38,8 @@ Authors:
 #include <edo>
 
 
-#include "Rosenbrock.h"
+#include "../application/common/Rosenbrock.h"
-#include "Sphere.h"
+#include "../application/common/Sphere.h"
 
 typedef eoReal< eoMinimizingFitness > EOT;
 typedef edoNormalMulti< EOT > Distrib;

edo/test/t-uniform.cpp

@@ -28,7 +28,7 @@ Authors:
 #include <eo>
 #include <edo>
 
-#include "Rosenbrock.h"
+#include "../application/common/Rosenbrock.h"
 
 typedef eoReal< eoMinimizingFitness > EOT;
 

eo/src/eoCombinedContinue.h

@@ -22,8 +22,8 @@
 Authors :
     todos@geneura.ugr.es
     Marc Schoenauer
-    Ram<EFBFBD>n Casero Ca<EFBFBD>as
+    Ramón Casero Cañas
-    Johann Dr<EFBFBD>o
+    Johann Dreo
  */
 //-----------------------------------------------------------------------------
 
@@ -40,7 +40,7 @@ Authors :
              to be consistent with other Combined constructs
              and allow to easily handle more than 2 continuators
 
-02/2003 Ram<EFBFBD>n Casero Ca<EFBFBD>as - added the removeLast() method
+02/2003 Ramón Casero Cañas - added the removeLast() method
 
 @ingroup Combination
 */

eo/src/eoFactory.h

@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 
 /** EO Factory. A factory is used to create other objects. In particular,
-it can be used so that objects of that kind can<EFBFBD>t be created in any other
+it can be used so that objects of that kind can't be created in any other
 way. It should be instantiated with anything that needs a factory, like selectors
 or whatever; but the instance class should be the parent class from which all the
 object that are going to be created descend. This class basically defines an interface,

eo/src/eoObject.h

@@ -39,7 +39,7 @@ changed. eoObject is used to define a name (#className#)
 that is used when loading or saving the state.
 
 Previously, this object also defined a print and read
-interface, but it<EFBFBD>s been moved to eoPrintable and eoPersistent.
+interface, but it's been moved to eoPrintable and eoPersistent.
 */
 
 /** Defines a name (#className#), used when loading or saving a state.

eo/src/eoOpSelMason.h

@@ -79,7 +79,7 @@ public:
                         _is >> rate;
                         if ( _is ) {
                                 eoOp<eoClass>* op = operatorFactory.make( _is );	// This reads the rest of the line
-                                // Add the operators to the selector, don<EFBFBD>t pay attention to the IDs
+                                // Add the operators to the selector, don't pay attention to the IDs
                                 opSelectorP->addOp( *op, rate );
                                 // Keep it in the store, to destroy later
                                 tmpPVec.push_back( op );

eo/src/eoPrintable.h

@@ -27,8 +27,8 @@
 
 //-----------------------------------------------------------------------------
 
-#include "iostream"  // std::istream, std::ostream
+#include <iostream>  // std::istream, std::ostream
-#include "string" // para std::string
+#include <string> // para std::string
 
 /*
 This functionality was separated from eoObject, since it makes no sense to print

eo/src/es.h

@@ -36,28 +36,28 @@
 //-----------------------------------------------------------------------------
 
 // the genotypes - from plain std::vector<double> to full correlated mutation
-#include "eoReal.h"
+#include "es/eoReal.h"
-#include "eoEsSimple.h"
+#include "es/eoEsSimple.h"
-#include "eoEsStdev.h"
+#include "es/eoEsStdev.h"
-#include "eoEsFull.h"
+#include "es/eoEsFull.h"
 
 // the initialization
-#include "eoEsChromInit.h"
+#include "es/eoEsChromInit.h"
 
 // general operators
-#include "eoRealOp.h"
+#include "es/eoRealOp.h"
-#include "eoNormalMutation.h"
+#include "es/eoNormalMutation.h"
-#include "eoRealAtomXover.h"	// for generic operators
+#include "es/eoRealAtomXover.h"	// for generic operators
 
 // SBX crossover (following Deb)
-#include "eoSBXcross.h"
+#include "es/eoSBXcross.h"
 
 // ES specific operators
-#include "eoEsGlobalXover.h" // Global ES Xover
+#include "es/eoEsGlobalXover.h" // Global ES Xover
-#include "eoEsStandardXover.h" // 2-parents ES Xover
+#include "es/eoEsStandardXover.h" // 2-parents ES Xover
 
 // the ES-mutations
-#include "eoEsMutationInit.h"
+#include "es/eoEsMutationInit.h"
-#include "eoEsMutate.h"
+#include "es/eoEsMutate.h"
 
 #endif

eo/src/ga/ChangeLog

@@ -2,7 +2,7 @@
 
 	* all files: Change from absolute to relative include.
 
-2007-08-21  Jochen K<EFBFBD>pper  <jochen@fhi-berlin.mpg.de>
+2007-08-21  Jochen Küpper  <jochen@fhi-berlin.mpg.de>
 
 	* eoBitOp.h (eoNPtsBitXover::operator()): Make sure bit is within
 	allocated length of vector points: [0, max_size).

eo/test/CMakeLists.txt

@@ -45,7 +45,7 @@ set (TEST_LIST
   t-eoReal
   t-eoVector
   t-eoESAll
-  t-eoPBIL
+  # t-eoPBIL # deprecated, see EDO module.
   t-eoFitnessAssembled
   t-eoFitnessAssembledEA
   t-eoRoulette