diff --git a/eo/src/ga/eoPBILAdditive.h b/deprecated/eo/es/eoPBILAdditive.h similarity index 100% rename from eo/src/ga/eoPBILAdditive.h rename to deprecated/eo/es/eoPBILAdditive.h diff --git a/eo/src/ga/eoPBILDistrib.h b/deprecated/eo/es/eoPBILDistrib.h similarity index 100% rename from eo/src/ga/eoPBILDistrib.h rename to deprecated/eo/es/eoPBILDistrib.h diff --git a/eo/src/ga/eoPBILOrg.h b/deprecated/eo/es/eoPBILOrg.h similarity index 100% rename from eo/src/ga/eoPBILOrg.h rename to deprecated/eo/es/eoPBILOrg.h diff --git a/eo/test/t-eoPBIL.cpp b/deprecated/eo/es/t-eoPBIL.cpp similarity index 100% rename from eo/test/t-eoPBIL.cpp rename to deprecated/eo/es/t-eoPBIL.cpp diff --git a/edo/test/t-bounderno.cpp b/edo/test/t-bounderno.cpp index ac294ce7d..8f7a49b0c 100644 --- a/edo/test/t-bounderno.cpp +++ b/edo/test/t-bounderno.cpp @@ -28,7 +28,7 @@ Authors: #include #include -#include "Rosenbrock.h" +#include "../application/common/Rosenbrock.h" typedef eoReal< eoMinimizingFitness > EOT; diff --git a/edo/test/t-continue.cpp b/edo/test/t-continue.cpp index 2f2bd3247..a5d661dac 100644 --- a/edo/test/t-continue.cpp +++ b/edo/test/t-continue.cpp @@ -28,7 +28,7 @@ Authors: #include #include -#include "Rosenbrock.h" +#include "../application/common/Rosenbrock.h" typedef eoReal< eoMinimizingFitness > EOT; typedef edoUniform< EOT > Distrib; diff --git a/edo/test/t-edoEstimatorNormalMulti.cpp b/edo/test/t-edoEstimatorNormalMulti.cpp index 6483a1062..4bc802fbd 100644 --- a/edo/test/t-edoEstimatorNormalMulti.cpp +++ b/edo/test/t-edoEstimatorNormalMulti.cpp @@ -33,8 +33,8 @@ Authors: #include -#include "Rosenbrock.h" -#include "Sphere.h" +#include "../application/common/Rosenbrock.h" +#include "../application/common/Sphere.h" typedef eoReal< eoMinimizingFitness > EOT; typedef edoNormalMulti< EOT > Distrib; diff --git a/edo/test/t-mean-distance.cpp b/edo/test/t-mean-distance.cpp index 59b1c8aa5..8c79bc037 100644 --- a/edo/test/t-mean-distance.cpp +++ b/edo/test/t-mean-distance.cpp @@ -38,8 +38,8 @@ Authors: #include -#include "Rosenbrock.h" -#include "Sphere.h" +#include "../application/common/Rosenbrock.h" +#include "../application/common/Sphere.h" typedef eoReal< eoMinimizingFitness > EOT; typedef edoNormalMulti< EOT > Distrib; diff --git a/edo/test/t-uniform.cpp b/edo/test/t-uniform.cpp index 228ce5e22..8496425b3 100644 --- a/edo/test/t-uniform.cpp +++ b/edo/test/t-uniform.cpp @@ -28,7 +28,7 @@ Authors: #include #include -#include "Rosenbrock.h" +#include "../application/common/Rosenbrock.h" typedef eoReal< eoMinimizingFitness > EOT; diff --git a/eo/src/eoCombinedContinue.h b/eo/src/eoCombinedContinue.h index 96878b4ea..756a44a89 100644 --- a/eo/src/eoCombinedContinue.h +++ b/eo/src/eoCombinedContinue.h @@ -22,8 +22,8 @@ Authors : todos@geneura.ugr.es Marc Schoenauer - Ram�n Casero Ca�as - Johann Dr�o + Ramón Casero Cañas + 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�n Casero Ca�as - added the removeLast() method +02/2003 Ramón Casero Cañas - added the removeLast() method @ingroup Combination */ diff --git a/eo/src/eoFactory.h b/eo/src/eoFactory.h index 51cbc678b..b6dd62de0 100644 --- a/eo/src/eoFactory.h +++ b/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�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, diff --git a/eo/src/eoObject.h b/eo/src/eoObject.h index 1e119b988..9744c35e7 100644 --- a/eo/src/eoObject.h +++ b/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�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. diff --git a/eo/src/eoOpSelMason.h b/eo/src/eoOpSelMason.h index 377de0c95..7df95066f 100644 --- a/eo/src/eoOpSelMason.h +++ b/eo/src/eoOpSelMason.h @@ -79,7 +79,7 @@ public: _is >> rate; if ( _is ) { eoOp* op = operatorFactory.make( _is ); // This reads the rest of the line - // Add the operators to the selector, don�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 ); diff --git a/eo/src/eoPrintable.h b/eo/src/eoPrintable.h index f04f50fb6..1f2404a89 100644 --- a/eo/src/eoPrintable.h +++ b/eo/src/eoPrintable.h @@ -27,8 +27,8 @@ //----------------------------------------------------------------------------- -#include "iostream" // std::istream, std::ostream -#include "string" // para std::string +#include // std::istream, std::ostream +#include // para std::string /* This functionality was separated from eoObject, since it makes no sense to print diff --git a/eo/src/es.h b/eo/src/es.h index 9e2fd78f9..d38485b69 100644 --- a/eo/src/es.h +++ b/eo/src/es.h @@ -36,28 +36,28 @@ //----------------------------------------------------------------------------- // the genotypes - from plain std::vector to full correlated mutation -#include "eoReal.h" -#include "eoEsSimple.h" -#include "eoEsStdev.h" -#include "eoEsFull.h" +#include "es/eoReal.h" +#include "es/eoEsSimple.h" +#include "es/eoEsStdev.h" +#include "es/eoEsFull.h" // the initialization -#include "eoEsChromInit.h" +#include "es/eoEsChromInit.h" // general operators -#include "eoRealOp.h" -#include "eoNormalMutation.h" -#include "eoRealAtomXover.h" // for generic operators +#include "es/eoRealOp.h" +#include "es/eoNormalMutation.h" +#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 "eoEsStandardXover.h" // 2-parents ES Xover +#include "es/eoEsGlobalXover.h" // Global ES Xover +#include "es/eoEsStandardXover.h" // 2-parents ES Xover // the ES-mutations -#include "eoEsMutationInit.h" -#include "eoEsMutate.h" +#include "es/eoEsMutationInit.h" +#include "es/eoEsMutate.h" #endif diff --git a/eo/src/ga/ChangeLog b/eo/src/ga/ChangeLog index b8ba4afa0..4d62600ed 100644 --- a/eo/src/ga/ChangeLog +++ b/eo/src/ga/ChangeLog @@ -2,7 +2,7 @@ * all files: Change from absolute to relative include. -2007-08-21 Jochen K�pper +2007-08-21 Jochen Küpper * eoBitOp.h (eoNPtsBitXover::operator()): Make sure bit is within allocated length of vector points: [0, max_size). diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt index 4a0c74e43..aa4f17035 100644 --- a/eo/test/CMakeLists.txt +++ b/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