All files in eo directory refactored to relative #include's
This commit is contained in:
parent
de830229e8
commit
ad71aba24a
125 changed files with 352 additions and 352 deletions
|
|
@ -26,7 +26,7 @@
|
||||||
#define EOBINARYFLIGHT_H
|
#define EOBINARYFLIGHT_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFlight.h>
|
#include "eoFlight.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#define _EOBITPARTICLE_H
|
#define _EOBITPARTICLE_H
|
||||||
|
|
||||||
|
|
||||||
#include <eoVectorParticle.h>
|
#include "eoVectorParticle.h"
|
||||||
|
|
||||||
|
|
||||||
/** eoBitParticle: Implementation of a bit-coded particle (swarm optimization).
|
/** eoBitParticle: Implementation of a bit-coded particle (swarm optimization).
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,10 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoSelect.h>
|
#include "eoSelect.h"
|
||||||
#include <eoTransform.h>
|
#include "eoTransform.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** Breeding: combination of selecting and transforming a population
|
/** Breeding: combination of selecting and transforming a population
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,12 @@
|
||||||
#ifndef eoCellularEasyEA_h
|
#ifndef eoCellularEasyEA_h
|
||||||
#define eoCellularEasyEA_h
|
#define eoCellularEasyEA_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <eoPopEvalFunc.h>
|
#include "eoPopEvalFunc.h"
|
||||||
#include <eoAlgo.h>
|
#include "eoAlgo.h"
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
The abstract cellular easy algorithm.
|
The abstract cellular easy algorithm.
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef _eoCloneOps_H
|
#ifndef _eoCloneOps_H
|
||||||
#define _eoCloneOps_H
|
#define _eoCloneOps_H
|
||||||
|
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The different null-variation operators (i.e. they do nothing)
|
* The different null-variation operators (i.e. they do nothing)
|
||||||
|
|
|
||||||
|
|
@ -22,15 +22,15 @@
|
||||||
Authors :
|
Authors :
|
||||||
todos@geneura.ugr.es
|
todos@geneura.ugr.es
|
||||||
Marc Schoenauer
|
Marc Schoenauer
|
||||||
Ramón Casero Cañas
|
Ram<EFBFBD>n Casero Ca<EFBFBD>as
|
||||||
Johann Dréo
|
Johann Dr<EFBFBD>o
|
||||||
*/
|
*/
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#ifndef _eoCombinedContinue_h
|
#ifndef _eoCombinedContinue_h
|
||||||
#define _eoCombinedContinue_h
|
#define _eoCombinedContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Combined continuators - logical AND:
|
Combined continuators - logical AND:
|
||||||
|
|
@ -40,7 +40,7 @@ Authors :
|
||||||
to be consistent with other Combined constructs
|
to be consistent with other Combined constructs
|
||||||
and allow to easily handle more than 2 continuators
|
and allow to easily handle more than 2 continuators
|
||||||
|
|
||||||
02/2003 Ramón Casero Cañas - added the removeLast() method
|
02/2003 Ram<EFBFBD>n Casero Ca<EFBFBD>as - added the removeLast() method
|
||||||
|
|
||||||
@ingroup Combination
|
@ingroup Combination
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef _eoCombinedInit_h
|
#ifndef _eoCombinedInit_h
|
||||||
#define _eoCombinedInit_h
|
#define _eoCombinedInit_h
|
||||||
|
|
||||||
#include <eoInit.h>
|
#include "eoInit.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Combined INIT: a proportional recombination of eoInit objects
|
Combined INIT: a proportional recombination of eoInit objects
|
||||||
|
|
|
||||||
|
|
@ -26,11 +26,11 @@
|
||||||
#define EOCONSTRICTEDVARIABLEWEIGHTVELOCITY_H
|
#define EOCONSTRICTEDVARIABLEWEIGHTVELOCITY_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoVelocity.h>
|
#include "eoVelocity.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
#include <eoWeightUpdater.h>
|
#include "eoWeightUpdater.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoRealBoundModifier.h>
|
#include "eoRealBoundModifier.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,11 @@
|
||||||
#define EOCONSTRICTEDVELOCITY_H
|
#define EOCONSTRICTEDVELOCITY_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,9 @@
|
||||||
#ifndef _eoContinue_h
|
#ifndef _eoContinue_h
|
||||||
#define _eoContinue_h
|
#define _eoContinue_h
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoPersistent.h>
|
#include "eoPersistent.h"
|
||||||
|
|
||||||
/** @defgroup Continuators Stopping criteria
|
/** @defgroup Continuators Stopping criteria
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@
|
||||||
#ifndef _eoCounter_h
|
#ifndef _eoCounter_h
|
||||||
#define _eoCounter_h
|
#define _eoCounter_h
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoFunctorStore.h>
|
#include "eoFunctorStore.h"
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Generic counter class that counts the number of times
|
Generic counter class that counts the number of times
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
#define eoCtrlCContinue_h
|
#define eoCtrlCContinue_h
|
||||||
|
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @addtogroup Continuators
|
* @addtogroup Continuators
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,8 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoSelect.h>
|
#include "eoSelect.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,10 @@
|
||||||
#include <functional> //
|
#include <functional> //
|
||||||
#include <numeric> // accumulate
|
#include <numeric> // accumulate
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
#include <utils/selectors.h>
|
#include "utils/selectors.h"
|
||||||
|
|
||||||
/** eoDetTournamentSelect: a selection method that selects ONE individual by
|
/** eoDetTournamentSelect: a selection method that selects ONE individual by
|
||||||
deterministic tournament
|
deterministic tournament
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <eoDistribution.h>
|
#include "eoDistribution.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base class for Distribution Evolution Algorithms within EO:
|
* Base class for Distribution Evolution Algorithms within EO:
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <eoInit.h>
|
#include "eoInit.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstract class for Distribution Evolution Algorithms within EO:
|
* Abstract class for Distribution Evolution Algorithms within EO:
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ Authors:
|
||||||
#include <utility> // for std::pair
|
#include <utility> // for std::pair
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <utils/eoStat.h>
|
#include "utils/eoStat.h"
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
|
|
||||||
/** @addtogroup Evaluation
|
/** @addtogroup Evaluation
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <eoDistribution.h>
|
#include "eoDistribution.h"
|
||||||
|
|
||||||
/** The abstract class for estimation of disribution algorithms.
|
/** The abstract class for estimation of disribution algorithms.
|
||||||
* This design evolve a probability distribution
|
* This design evolve a probability distribution
|
||||||
|
|
|
||||||
|
|
@ -27,15 +27,15 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <apply.h>
|
#include "apply.h"
|
||||||
#include <eoAlgo.h>
|
#include "eoAlgo.h"
|
||||||
#include <eoPopEvalFunc.h>
|
#include "eoPopEvalFunc.h"
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <eoSelect.h>
|
#include "eoSelect.h"
|
||||||
#include <eoTransform.h>
|
#include "eoTransform.h"
|
||||||
#include <eoBreed.h>
|
#include "eoBreed.h"
|
||||||
#include <eoMergeReduce.h>
|
#include "eoMergeReduce.h"
|
||||||
#include <eoReplacement.h>
|
#include "eoReplacement.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
#define _EOEASYPSO_H
|
#define _EOEASYPSO_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <eoPSO.h>
|
#include "eoPSO.h"
|
||||||
#include <eoVelocity.h>
|
#include "eoVelocity.h"
|
||||||
#include <eoFlight.h>
|
#include "eoFlight.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** An easy-to-use particle swarm algorithm.
|
/** An easy-to-use particle swarm algorithm.
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#ifndef _eoEvalContinue_h
|
#ifndef _eoEvalContinue_h
|
||||||
#define _eoEvalContinue_h
|
#define _eoEvalContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <eoEvalFuncCounter.h>
|
#include "eoEvalFuncCounter.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Continues until a number of evaluations has been made
|
* Continues until a number of evaluations has been made
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@ Caner Candan <caner.candan@thalesgroup.com>
|
||||||
#ifndef __eoEvalCounterThrowException_h__
|
#ifndef __eoEvalCounterThrowException_h__
|
||||||
#define __eoEvalCounterThrowException_h__
|
#define __eoEvalCounterThrowException_h__
|
||||||
|
|
||||||
#include <eoEvalFuncCounter.h>
|
#include "eoEvalFuncCounter.h"
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
#include <eoExceptions.h>
|
#include "eoExceptions.h"
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Wrap an evaluation function so that an exception may be thrown when the
|
Wrap an evaluation function so that an exception may be thrown when the
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Dump an evaluated individual to a given file.
|
Dump an evaluated individual to a given file.
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef eoEvalFunc_H
|
#ifndef eoEvalFunc_H
|
||||||
#define eoEvalFunc_H
|
#define eoEvalFunc_H
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
|
|
||||||
/** @defgroup Evaluation Evaluation
|
/** @defgroup Evaluation Evaluation
|
||||||
* @ingroup Operators
|
* @ingroup Operators
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
#ifndef eoEvalFuncCounter_H
|
#ifndef eoEvalFuncCounter_H
|
||||||
#define eoEvalFuncCounter_H
|
#define eoEvalFuncCounter_H
|
||||||
|
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Counts the number of evaluations actually performed.
|
Counts the number of evaluations actually performed.
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
#ifndef eoEvalFuncCounterBounder_H
|
#ifndef eoEvalFuncCounterBounder_H
|
||||||
#define eoEvalFuncCounterBounder_H
|
#define eoEvalFuncCounterBounder_H
|
||||||
|
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
|
|
||||||
/** @addtogroup Evaluation
|
/** @addtogroup Evaluation
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
#ifndef EOEVALFUNCPTR_H
|
#ifndef EOEVALFUNCPTR_H
|
||||||
#define EOEVALFUNCPTR_H
|
#define EOEVALFUNCPTR_H
|
||||||
|
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
|
|
||||||
/** EOEvalFuncPtr: This class
|
/** EOEvalFuncPtr: This class
|
||||||
* takes an existing function pointer and converts it into a evaluation
|
* takes an existing function pointer and converts it into a evaluation
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Evaluate with the given evaluator and keep the best individual found so far.
|
Evaluate with the given evaluator and keep the best individual found so far.
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ Johann Dréo <johann.dreo@thalesgroup.com>
|
||||||
|
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
|
|
||||||
#include <eoExceptions.h>
|
#include "eoExceptions.h"
|
||||||
|
|
||||||
/** Check at each evaluation if a given tie contract has been reached.
|
/** Check at each evaluation if a given tie contract has been reached.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ Johann Dréo <johann.dreo@thalesgroup.com>
|
||||||
* @ingroup Evaluation
|
* @ingroup Evaluation
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <eoExceptions.h>
|
#include "eoExceptions.h"
|
||||||
|
|
||||||
#ifdef __unix__
|
#ifdef __unix__
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,12 +26,12 @@
|
||||||
#define eoExtendedVelocity_H
|
#define eoExtendedVelocity_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoRealBoundModifier.h>
|
#include "eoRealBoundModifier.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,12 +26,12 @@
|
||||||
#define _EOFACTORY_H
|
#define _EOFACTORY_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoObject.h>
|
#include "eoObject.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** EO Factory. A factory is used to create other objects. In particular,
|
/** 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<EFBFBD>t be created in any other
|
||||||
way. It should be instantiated with anything that needs a factory, like selectors
|
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
|
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,
|
object that are going to be created descend. This class basically defines an interface,
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@
|
||||||
#ifndef _eoFitContinue_h
|
#ifndef _eoFitContinue_h
|
||||||
#define _eoFitContinue_h
|
#define _eoFitContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Continues until the optimum fitness level is reached.
|
Continues until the optimum fitness level is reached.
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,8 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <eoSelectFromWorth.h>
|
#include "eoSelectFromWorth.h"
|
||||||
#include <eoLinearFitScaling.h>
|
#include "eoLinearFitScaling.h"
|
||||||
|
|
||||||
/** eoFitnessScalingSelect: select an individual proportional to the
|
/** eoFitnessScalingSelect: select an individual proportional to the
|
||||||
* linearly scaled fitness that is computed by the private
|
* linearly scaled fitness that is computed by the private
|
||||||
|
|
|
||||||
|
|
@ -26,11 +26,11 @@
|
||||||
#define EOFIXEDINERTIAWEIGHTEDVELOCITY_H
|
#define EOFIXEDINERTIAWEIGHTEDVELOCITY_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#ifndef _eoFlOrBinOp_h
|
#ifndef _eoFlOrBinOp_h
|
||||||
#define _eoFlOrBinOp_h
|
#define _eoFlOrBinOp_h
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
|
|
||||||
/** @addtogroup Variators
|
/** @addtogroup Variators
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@
|
||||||
#ifndef _eoFlOrMonOp_h
|
#ifndef _eoFlOrMonOp_h
|
||||||
#define _eoFlOrMonOp_h
|
#define _eoFlOrMonOp_h
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
#include <eoInit.h>
|
#include "eoInit.h"
|
||||||
|
|
||||||
/** @addtogroup Variators
|
/** @addtogroup Variators
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#ifndef _eoFlOrQuadOp_h
|
#ifndef _eoFlOrQuadOp_h
|
||||||
#define _eoFlOrQuadOp_h
|
#define _eoFlOrQuadOp_h
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
|
|
||||||
/** @addtogroup Variators
|
/** @addtogroup Variators
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#define EOFLIGHT_H
|
#define EOFLIGHT_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** Abstract class for particle swarm optimization flight.
|
/** Abstract class for particle swarm optimization flight.
|
||||||
|
|
|
||||||
|
|
@ -28,12 +28,12 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoMerge.h>
|
#include "eoMerge.h"
|
||||||
#include <eoReduce.h>
|
#include "eoReduce.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
#include <eoReduceSplit.h>
|
#include "eoReduceSplit.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#define EOGAUSSREALWEIGHTUP_H
|
#define EOGAUSSREALWEIGHTUP_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoWeightUpdater.h>
|
#include "eoWeightUpdater.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,9 @@
|
||||||
#ifndef _eoGenContinue_h
|
#ifndef _eoGenContinue_h
|
||||||
#define _eoGenContinue_h
|
#define _eoGenContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Generational continuator: continues until a number of generations is reached
|
Generational continuator: continues until a number of generations is reached
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@
|
||||||
#ifndef _eoGenOp_H
|
#ifndef _eoGenOp_H
|
||||||
#define _eoGenOp_H
|
#define _eoGenOp_H
|
||||||
|
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
#include <eoPopulator.h>
|
#include "eoPopulator.h"
|
||||||
#include <eoFunctorStore.h>
|
#include "eoFunctorStore.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
/** @name General variation operators
|
/** @name General variation operators
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,12 @@
|
||||||
* eoGeneralBreeder: transforms a population using the generalOp construct.
|
* eoGeneralBreeder: transforms a population using the generalOp construct.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
#include <eoGenOp.h>
|
#include "eoGenOp.h"
|
||||||
#include <eoPopulator.h>
|
#include "eoPopulator.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <eoBreed.h>
|
#include "eoBreed.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Base class for breeders using generalized operators.
|
Base class for breeders using generalized operators.
|
||||||
|
|
|
||||||
|
|
@ -29,10 +29,10 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
#include <eoSTLFunctor.h>
|
#include "eoSTLFunctor.h"
|
||||||
#include <utils/eoRndGenerators.h>
|
#include "utils/eoRndGenerators.h"
|
||||||
#include <utils/rnd_generators.h> // for shuffle method
|
#include "utils/rnd_generators.h" // for shuffle method
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,11 @@
|
||||||
#ifndef _eoInitializer_H
|
#ifndef _eoInitializer_H
|
||||||
#define _eoInitializer_H
|
#define _eoInitializer_H
|
||||||
|
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoVelocityInit.h>
|
#include "eoVelocityInit.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoParticleBestInit.h>
|
#include "eoParticleBestInit.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@addtogroup Initializators
|
@addtogroup Initializators
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
#include <iostream> // std::ostream, std::istream
|
#include <iostream> // std::ostream, std::istream
|
||||||
#include <string> // std::string
|
#include <string> // std::string
|
||||||
|
|
||||||
#include <eoVector.h>
|
#include "eoVector.h"
|
||||||
|
|
||||||
/** eoInt: implementation of simple integer-valued chromosome.
|
/** eoInt: implementation of simple integer-valued chromosome.
|
||||||
* based on eoVector class
|
* based on eoVector class
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,12 @@
|
||||||
#define EOINTEGERVELOCITY_H
|
#define EOINTEGERVELOCITY_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoRealBoundModifier.h>
|
#include "eoRealBoundModifier.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
#ifndef _eoInvalidateOps_h
|
#ifndef _eoInvalidateOps_h
|
||||||
#define _eoInvalidateOps_h
|
#define _eoInvalidateOps_h
|
||||||
|
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
|
|
||||||
/** @addtogroup Utilities
|
/** @addtogroup Utilities
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
|
||||||
#ifndef _eoInvertedContinue_h
|
#ifndef _eoInvertedContinue_h
|
||||||
#define _eoInvertedContinue_h
|
#define _eoInvertedContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the opposite of the wrapped continuator
|
* Return the opposite of the wrapped continuator
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#define EOLINEARDECREASINGWEIGHTUP_H
|
#define EOLINEARDECREASINGWEIGHTUP_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoWeightUpdater.h>
|
#include "eoWeightUpdater.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
#ifndef eoLinearFitScaling_h
|
#ifndef eoLinearFitScaling_h
|
||||||
#define eoLinearFitScaling_h
|
#define eoLinearFitScaling_h
|
||||||
|
|
||||||
#include <eoSelectFromWorth.h>
|
#include "eoSelectFromWorth.h"
|
||||||
#include <eoPerf2Worth.h>
|
#include "eoPerf2Worth.h"
|
||||||
|
|
||||||
/** An instance of eoPerf2Worth
|
/** An instance of eoPerf2Worth
|
||||||
* COmputes the linearly scaled fitnesses
|
* COmputes the linearly scaled fitnesses
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@
|
||||||
#define EOLINEARTOPOLOGY_H_
|
#define EOLINEARTOPOLOGY_H_
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
#include <eoSocialNeighborhood.h>
|
#include "eoSocialNeighborhood.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,12 +28,12 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoMerge.h>
|
#include "eoMerge.h"
|
||||||
#include <eoReduce.h>
|
#include "eoReduce.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
#include <eoReduceSplit.h>
|
#include "eoReduceSplit.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,9 @@
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
// EO includes
|
// EO includes
|
||||||
#include <eoPop.h> // eoPop
|
#include "eoPop.h" // eoPop
|
||||||
#include <eoFunctor.h> // eoMerge
|
#include "eoFunctor.h" // eoMerge
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eoMerge: Base class for elitist replacement algorithms.
|
* eoMerge: Base class for elitist replacement algorithms.
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,12 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoMerge.h>
|
#include "eoMerge.h"
|
||||||
#include <eoReduce.h>
|
#include "eoReduce.h"
|
||||||
#include <eoReplacement.h>
|
#include "eoReplacement.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
/**
|
/**
|
||||||
Replacement strategies that combine en eoMerge and an eoReduce.
|
Replacement strategies that combine en eoMerge and an eoReduce.
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,10 @@
|
||||||
#ifndef eoNDSorting_h
|
#ifndef eoNDSorting_h
|
||||||
#define eoNDSorting_h
|
#define eoNDSorting_h
|
||||||
|
|
||||||
#include <EO.h>
|
#include "EO.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoPerf2Worth.h>
|
#include "eoPerf2Worth.h"
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,11 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <utils/eoData.h> // For limits definition
|
#include "utils/eoData.h" // For limits definition
|
||||||
#include <iostream> // std::istream, std::ostream
|
#include <iostream> // std::istream, std::ostream
|
||||||
#include <string> // std::string
|
#include <string> // std::string
|
||||||
|
|
||||||
#include <utils/compatibility.h>
|
#include "utils/compatibility.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
eoObject used to be the base class for the whole hierarchy, but this has
|
eoObject used to be the base class for the whole hierarchy, but this has
|
||||||
|
|
@ -39,7 +39,7 @@ changed. eoObject is used to define a name (#className#)
|
||||||
that is used when loading or saving the state.
|
that is used when loading or saving the state.
|
||||||
|
|
||||||
Previously, this object also defined a print and read
|
Previously, this object also defined a print and read
|
||||||
interface, but it´s been moved to eoPrintable and eoPersistent.
|
interface, but it<EFBFBD>s been moved to eoPrintable and eoPersistent.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** Defines a name (#className#), used when loading or saving a state.
|
/** Defines a name (#className#), used when loading or saving a state.
|
||||||
|
|
|
||||||
|
|
@ -28,15 +28,15 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
#include <eoGenOp.h>
|
#include "eoGenOp.h"
|
||||||
#include <eoPopulator.h>
|
#include "eoPopulator.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <eoSequentialSelect.h>
|
#include "eoSequentialSelect.h"
|
||||||
#include <eoBreed.h>
|
#include "eoBreed.h"
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <eoPopulator.h>
|
#include "eoPopulator.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
|
|
||||||
/** eoOneToOneBreeder: transforms a population using
|
/** eoOneToOneBreeder: transforms a population using
|
||||||
* - an operator that MODIFIES only one parent from the populator
|
* - an operator that MODIFIES only one parent from the populator
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,10 @@
|
||||||
#ifndef _eoOp_H
|
#ifndef _eoOp_H
|
||||||
#define _eoOp_H
|
#define _eoOp_H
|
||||||
|
|
||||||
#include <eoObject.h>
|
#include "eoObject.h"
|
||||||
#include <eoPrintable.h>
|
#include "eoPrintable.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@defgroup Operators Evolutionary Operators
|
@defgroup Operators Evolutionary Operators
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#ifndef _eoOpContainer_H
|
#ifndef _eoOpContainer_H
|
||||||
#define _eoOpContainer_H
|
#define _eoOpContainer_H
|
||||||
|
|
||||||
#include <eoGenOp.h>
|
#include "eoGenOp.h"
|
||||||
|
|
||||||
/** eoOpContainer is a base class for the sequential and proportional selectors
|
/** eoOpContainer is a base class for the sequential and proportional selectors
|
||||||
* It takes care of wrapping the other operators,
|
* It takes care of wrapping the other operators,
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,8 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <eoInit.h>
|
#include "eoInit.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* apply orderXover on two chromosomes.
|
* apply orderXover on two chromosomes.
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#define _EOPSO_H
|
#define _EOPSO_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoAlgo.h>
|
#include "eoAlgo.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#define _EOPARTICLEBESTINIT_H
|
#define _EOPARTICLEBESTINIT_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,11 @@
|
||||||
#ifndef _eoParticleFullInitializer_H
|
#ifndef _eoParticleFullInitializer_H
|
||||||
#define _eoParticleFullInitializer_H
|
#define _eoParticleFullInitializer_H
|
||||||
|
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
#include <eoVelocityInit.h>
|
#include "eoVelocityInit.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoParticleBestInit.h>
|
#include "eoParticleBestInit.h"
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@addtogroup Initializators
|
@addtogroup Initializators
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@
|
||||||
#ifndef eoPerf2Worth_h
|
#ifndef eoPerf2Worth_h
|
||||||
#define eoPerf2Worth_h
|
#define eoPerf2Worth_h
|
||||||
|
|
||||||
#include <utils/eoParam.h>
|
#include "utils/eoParam.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@
|
||||||
#ifndef __eoPeriodicContinue_h
|
#ifndef __eoPeriodicContinue_h
|
||||||
#define __eoPeriodicContinue_h
|
#define __eoPeriodicContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
|
|
||||||
/** A continue that becomes true periodically.
|
/** A continue that becomes true periodically.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,10 @@ Authors:
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
// EO includes
|
// EO includes
|
||||||
#include <eoOp.h> // for eoInit
|
#include "eoOp.h" // for eoInit
|
||||||
#include <eoPersistent.h>
|
#include "eoPersistent.h"
|
||||||
#include <eoInit.h>
|
#include "eoInit.h"
|
||||||
#include <utils/rnd_generators.h> // for shuffle method
|
#include "utils/rnd_generators.h" // for shuffle method
|
||||||
|
|
||||||
/** A std::vector of EO object, to be used in all algorithms
|
/** A std::vector of EO object, to be used in all algorithms
|
||||||
* (selectors, operators, replacements, ...).
|
* (selectors, operators, replacements, ...).
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
#ifndef eoPopEvalFunc_H
|
#ifndef eoPopEvalFunc_H
|
||||||
#define eoPopEvalFunc_H
|
#define eoPopEvalFunc_H
|
||||||
|
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <apply.h>
|
#include "apply.h"
|
||||||
|
|
||||||
# ifdef WITH_MPI
|
# ifdef WITH_MPI
|
||||||
#include <mpi/eoMpi.h>
|
#include <mpi/eoMpi.h>
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#ifndef _eoPopulator_H
|
#ifndef _eoPopulator_H
|
||||||
#define _eoPopulator_H
|
#define _eoPopulator_H
|
||||||
|
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
|
|
||||||
/** eoPopulator is a helper class for general operators eoGenOp
|
/** eoPopulator is a helper class for general operators eoGenOp
|
||||||
It is an eoPop but also behaves like an eoPop::iterator
|
It is an eoPop but also behaves like an eoPop::iterator
|
||||||
|
|
|
||||||
|
|
@ -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
|
This functionality was separated from eoObject, since it makes no sense to print
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,12 @@
|
||||||
#ifndef _eoCombinedOp_H
|
#ifndef _eoCombinedOp_H
|
||||||
#define _eoCombinedOp_H
|
#define _eoCombinedOp_H
|
||||||
|
|
||||||
#include <eoObject.h>
|
#include "eoObject.h"
|
||||||
#include <eoPrintable.h>
|
#include "eoPrintable.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoOp.h>
|
#include "eoOp.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\defgroup Utilities Utilities
|
\defgroup Utilities Utilities
|
||||||
|
|
|
||||||
|
|
@ -29,10 +29,10 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <utils/selectors.h>
|
#include "utils/selectors.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
|
|
||||||
/** eoProportionalSelect: select an individual proportional to her stored fitness
|
/** eoProportionalSelect: select an individual proportional to her stored fitness
|
||||||
value
|
value
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#define EORANDOMREALWEIGHTUP_H
|
#define EORANDOMREALWEIGHTUP_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoWeightUpdater.h>
|
#include "eoWeightUpdater.h"
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@
|
||||||
* eoSequentialSelect returns all individuals in turn
|
* eoSequentialSelect returns all individuals in turn
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <utils/eoRNG.h>
|
#include "utils/eoRNG.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
|
|
||||||
/** eoRandomSelect: a selection method that selects ONE individual randomly
|
/** eoRandomSelect: a selection method that selects ONE individual randomly
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
#ifndef eoRanking_h
|
#ifndef eoRanking_h
|
||||||
#define eoRanking_h
|
#define eoRanking_h
|
||||||
|
|
||||||
#include <eoPerf2Worth.h>
|
#include "eoPerf2Worth.h"
|
||||||
|
|
||||||
/** An instance of eoPerfFromWorth
|
/** An instance of eoPerfFromWorth
|
||||||
* COmputes the ranked fitness: fitnesses range in [m,M]
|
* COmputes the ranked fitness: fitnesses range in [m,M]
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <eoSelectFromWorth.h>
|
#include "eoSelectFromWorth.h"
|
||||||
#include <eoRanking.h>
|
#include "eoRanking.h"
|
||||||
|
|
||||||
/** eoRankingSelect: select an individual by roulette wheel on its rank
|
/** eoRankingSelect: select an individual by roulette wheel on its rank
|
||||||
* is an eoRouletteWorthSelect, i.e. a selector using a std::vector of worthes
|
* is an eoRouletteWorthSelect, i.e. a selector using a std::vector of worthes
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@
|
||||||
#ifndef EOREALBOUNDMODIFIER_H
|
#ifndef EOREALBOUNDMODIFIER_H
|
||||||
#define EOREALBOUNDMODIFIER_H
|
#define EOREALBOUNDMODIFIER_H
|
||||||
|
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <utils/eoRealVectorBounds.h>
|
#include "utils/eoRealVectorBounds.h"
|
||||||
|
|
||||||
/** @defgroup Bounds Bounds management
|
/** @defgroup Bounds Bounds management
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#define _EOREALPARTICLE_H
|
#define _EOREALPARTICLE_H
|
||||||
|
|
||||||
|
|
||||||
#include <eoVectorParticle.h>
|
#include "eoVectorParticle.h"
|
||||||
|
|
||||||
|
|
||||||
/** eoRealParticle: Implementation of a real-coded particle for
|
/** eoRealParticle: Implementation of a real-coded particle for
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,10 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
// EO includes
|
// EO includes
|
||||||
#include <eoPop.h> // eoPop
|
#include "eoPop.h" // eoPop
|
||||||
#include <eoFunctor.h> // eoReduce
|
#include "eoFunctor.h" // eoReduce
|
||||||
#include <utils/selectors.h>
|
#include "utils/selectors.h"
|
||||||
#include <utils/eoLogger.h>
|
#include "utils/eoLogger.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eoReduce: .reduce the new generation to the specified size
|
* eoReduce: .reduce the new generation to the specified size
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,12 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoMerge.h>
|
#include "eoMerge.h"
|
||||||
#include <eoReduce.h>
|
#include "eoReduce.h"
|
||||||
#include <eoReplacement.h>
|
#include "eoReplacement.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** @addtogroup Replacors
|
/** @addtogroup Replacors
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,11 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoMerge.h>
|
#include "eoMerge.h"
|
||||||
#include <eoReduce.h>
|
#include "eoReduce.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,9 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
// EO includes
|
// EO includes
|
||||||
#include <eoPop.h> // eoPop
|
#include "eoPop.h" // eoPop
|
||||||
#include <eoFunctor.h> // eoReduce
|
#include "eoFunctor.h" // eoReduce
|
||||||
#include <utils/selectors.h>
|
#include "utils/selectors.h"
|
||||||
|
|
||||||
/** @addtogroup Replacors
|
/** @addtogroup Replacors
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -29,11 +29,11 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
#include <eoMerge.h>
|
#include "eoMerge.h"
|
||||||
#include <eoReduce.h>
|
#include "eoReduce.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,8 @@
|
||||||
#define EORINGTOPOLOGY_H_
|
#define EORINGTOPOLOGY_H_
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoTopology.h>
|
#include "eoTopology.h"
|
||||||
#include <eoSocialNeighborhood.h>
|
#include "eoSocialNeighborhood.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,14 +27,14 @@
|
||||||
#ifndef _eoSGA_h
|
#ifndef _eoSGA_h
|
||||||
#define _eoSGA_h
|
#define _eoSGA_h
|
||||||
|
|
||||||
#include <eoInvalidateOps.h>
|
#include "eoInvalidateOps.h"
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <eoSelectPerc.h>
|
#include "eoSelectPerc.h"
|
||||||
#include <eoEvalFunc.h>
|
#include "eoEvalFunc.h"
|
||||||
#include <eoAlgo.h>
|
#include "eoAlgo.h"
|
||||||
#include <apply.h>
|
#include "apply.h"
|
||||||
|
|
||||||
/** The Simple Genetic Algorithm, following Holland and Goldberg
|
/** The Simple Genetic Algorithm, following Holland and Goldberg
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
#ifndef _eoSGATransform_h
|
#ifndef _eoSGATransform_h
|
||||||
#define _eoSGATransform_h
|
#define _eoSGATransform_h
|
||||||
|
|
||||||
#include <eoInvalidateOps.h>
|
#include "eoInvalidateOps.h"
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// class eoSGATransform
|
// class eoSGATransform
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
#define eoSIGContinue_h
|
#define eoSIGContinue_h
|
||||||
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
|
|
||||||
/** @addtogroup Continuators
|
/** @addtogroup Continuators
|
||||||
* @{
|
* @{
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef _eoSecondsElapsedContinue_h
|
#ifndef _eoSecondsElapsedContinue_h
|
||||||
#define _eoSecondsElapsedContinue_h
|
#define _eoSecondsElapsedContinue_h
|
||||||
|
|
||||||
#include <eoContinue.h>
|
#include "eoContinue.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Timed continuator: continues until a number of seconds is used
|
Timed continuator: continues until a number of seconds is used
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@
|
||||||
#ifndef _EOSELECTFACTORY_H
|
#ifndef _EOSELECTFACTORY_H
|
||||||
#define _EOSELECTFACTORY_H
|
#define _EOSELECTFACTORY_H
|
||||||
|
|
||||||
#include <eoFactory.h>
|
#include "eoFactory.h"
|
||||||
#include <eoRandomSelect.h>
|
#include "eoRandomSelect.h"
|
||||||
#include <eoTournament.h>
|
#include "eoTournament.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,9 @@
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <eoPerf2Worth.h>
|
#include "eoPerf2Worth.h"
|
||||||
#include <utils/selectors.h>
|
#include "utils/selectors.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** selects one element from a population (is an eoSelectOne)
|
/** selects one element from a population (is an eoSelectOne)
|
||||||
|
|
|
||||||
|
|
@ -29,9 +29,9 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoSelect.h>
|
#include "eoSelect.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <utils/eoHowMany.h>
|
#include "utils/eoHowMany.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoSelect.h>
|
#include "eoSelect.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoPop.h>
|
#include "eoPop.h"
|
||||||
#include <eoFunctor.h>
|
#include "eoFunctor.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
/** eoSelectOne selects only one element from a whole population.
|
/** eoSelectOne selects only one element from a whole population.
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoSelect.h>
|
#include "eoSelect.h"
|
||||||
#include <eoSelectOne.h>
|
#include "eoSelectOne.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
#ifndef eoSharing_h
|
#ifndef eoSharing_h
|
||||||
#define eoSharing_h
|
#define eoSharing_h
|
||||||
|
|
||||||
#include <eoPerf2Worth.h>
|
#include "eoPerf2Worth.h"
|
||||||
#include <utils/eoDistance.h>
|
#include "utils/eoDistance.h"
|
||||||
|
|
||||||
/** Sharing is a perf2worth class that implements
|
/** Sharing is a perf2worth class that implements
|
||||||
* Goldberg and Richardson's basic sharing
|
* Goldberg and Richardson's basic sharing
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <eoSelectFromWorth.h>
|
#include "eoSelectFromWorth.h"
|
||||||
#include <eoSharing.h>
|
#include "eoSharing.h"
|
||||||
|
|
||||||
/** eoSharingSelect: select an individual by roulette wheel
|
/** eoSharingSelect: select an individual by roulette wheel
|
||||||
* on its SHARED fitness. It is an eoRouletteWorthSelect,
|
* on its SHARED fitness. It is an eoRouletteWorthSelect,
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
#define EOSIGBINARYFLIGHT_H
|
#define EOSIGBINARYFLIGHT_H
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include <eoBinaryFlight.h>
|
#include "eoBinaryFlight.h"
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue