particle-swarm-optimization includes added
This commit is contained in:
parent
860cb372b0
commit
703edd5087
2 changed files with 82 additions and 1 deletions
|
|
@ -16,11 +16,15 @@ pkginclude_HEADERS = eo \
|
||||||
EO.h \
|
EO.h \
|
||||||
apply.h \
|
apply.h \
|
||||||
eoAlgo.h \
|
eoAlgo.h \
|
||||||
|
eoBinaryFlight.h \
|
||||||
|
eoBitParticle.h \
|
||||||
eoBreed.h \
|
eoBreed.h \
|
||||||
eoCellularEasyEA.h \
|
eoCellularEasyEA.h \
|
||||||
eoCloneOps.h \
|
eoCloneOps.h \
|
||||||
eoCombinedContinue.h \
|
eoCombinedContinue.h \
|
||||||
eoCombinedInit.h \
|
eoCombinedInit.h \
|
||||||
|
eoConstrictedVariableWeightVelocity.h \
|
||||||
|
eoConstrictedVelocity.h \
|
||||||
eoContinue.h \
|
eoContinue.h \
|
||||||
eoCounter.h \
|
eoCounter.h \
|
||||||
eoCtrlCContinue.h \
|
eoCtrlCContinue.h \
|
||||||
|
|
@ -29,8 +33,10 @@ pkginclude_HEADERS = eo \
|
||||||
eoDistribUpdater.h \
|
eoDistribUpdater.h \
|
||||||
eoDistribution.h \
|
eoDistribution.h \
|
||||||
eoDominanceMap.h \
|
eoDominanceMap.h \
|
||||||
|
eoDummyFlight.h \
|
||||||
eoEDA.h \
|
eoEDA.h \
|
||||||
eoEasyEA.h \
|
eoEasyEA.h \
|
||||||
|
eoEasyPSO.h \
|
||||||
eoEvalContinue.h \
|
eoEvalContinue.h \
|
||||||
eoEvalFunc.h \
|
eoEvalFunc.h \
|
||||||
eoEvalFuncCounter.h \
|
eoEvalFuncCounter.h \
|
||||||
|
|
@ -38,22 +44,29 @@ pkginclude_HEADERS = eo \
|
||||||
eoFactory.h \
|
eoFactory.h \
|
||||||
eoFitContinue.h \
|
eoFitContinue.h \
|
||||||
eoFitnessScalingSelect.h \
|
eoFitnessScalingSelect.h \
|
||||||
|
eoFixedInertiaWeightedVelocity.h \
|
||||||
|
eoFlight.h \
|
||||||
eoFlOrBinOp.h \
|
eoFlOrBinOp.h \
|
||||||
eoFlOrMonOp.h \
|
eoFlOrMonOp.h \
|
||||||
eoFlOrQuadOp.h \
|
eoFlOrQuadOp.h \
|
||||||
eoFunctor.h \
|
eoFunctor.h \
|
||||||
eoFunctorStore.h \
|
eoFunctorStore.h \
|
||||||
eoG3Replacement.h \
|
eoG3Replacement.h \
|
||||||
|
eoGaussRealWeightUp.h \
|
||||||
eoGenContinue.h \
|
eoGenContinue.h \
|
||||||
eoGenOp.h \
|
eoGenOp.h \
|
||||||
eoGeneralBreeder.h \
|
eoGeneralBreeder.h \
|
||||||
eoInit.h \
|
eoInit.h \
|
||||||
eoInvalidateOps.h \
|
eoInvalidateOps.h \
|
||||||
|
eoLinearDecreasingWeightUp.h \
|
||||||
eoLinearFitScaling.h \
|
eoLinearFitScaling.h \
|
||||||
|
eoLinearTopology.h \
|
||||||
|
eoLSPSO.h \
|
||||||
eoMGGReplacement.h \
|
eoMGGReplacement.h \
|
||||||
eoMerge.h \
|
eoMerge.h \
|
||||||
eoMergeReduce.h \
|
eoMergeReduce.h \
|
||||||
eoNDSorting.h \
|
eoNDSorting.h \
|
||||||
|
eoNeighborhood.h \
|
||||||
eoObject.h \
|
eoObject.h \
|
||||||
eoOneToOneBreeder.h \
|
eoOneToOneBreeder.h \
|
||||||
eoOp.h \
|
eoOp.h \
|
||||||
|
|
@ -62,6 +75,7 @@ pkginclude_HEADERS = eo \
|
||||||
eoParetoConstraintFitness.h \
|
eoParetoConstraintFitness.h \
|
||||||
eoParetoFitness.h \
|
eoParetoFitness.h \
|
||||||
eoParetoRanking.h \
|
eoParetoRanking.h \
|
||||||
|
eoParticleBestInit.h \
|
||||||
eoPerf2Worth.h \
|
eoPerf2Worth.h \
|
||||||
eoPeriodicContinue.h \
|
eoPeriodicContinue.h \
|
||||||
eoPersistent.h \
|
eoPersistent.h \
|
||||||
|
|
@ -73,9 +87,13 @@ pkginclude_HEADERS = eo \
|
||||||
eoPropGAGenOp.h \
|
eoPropGAGenOp.h \
|
||||||
eoProportionalCombinedOp.h \
|
eoProportionalCombinedOp.h \
|
||||||
eoProportionalSelect.h \
|
eoProportionalSelect.h \
|
||||||
|
eoPSO.h \
|
||||||
|
eoRandomRealWeightUp.h \
|
||||||
eoRandomSelect.h \
|
eoRandomSelect.h \
|
||||||
eoRanking.h \
|
eoRanking.h \
|
||||||
eoRankingSelect.h \
|
eoRankingSelect.h \
|
||||||
|
eoRealBoundModifier.h \
|
||||||
|
eoRealParticle.h \
|
||||||
eoReduce.h \
|
eoReduce.h \
|
||||||
eoReduceMerge.h \
|
eoReduceMerge.h \
|
||||||
eoReduceMergeReduce.h \
|
eoReduceMergeReduce.h \
|
||||||
|
|
@ -98,19 +116,33 @@ pkginclude_HEADERS = eo \
|
||||||
eoSequentialSelect.h \
|
eoSequentialSelect.h \
|
||||||
eoSharing.h \
|
eoSharing.h \
|
||||||
eoSharingSelect.h \
|
eoSharingSelect.h \
|
||||||
|
eoSigBinaryFlight.h \
|
||||||
eoSimpleEDA.h \
|
eoSimpleEDA.h \
|
||||||
|
eoSocialNeighborhood.h \
|
||||||
|
eoSSPSO.h \
|
||||||
|
eoStandardFlight.h \
|
||||||
|
eoStandardVelocity.h \
|
||||||
|
eoStarTopology.h \
|
||||||
eoSteadyFitContinue.h \
|
eoSteadyFitContinue.h \
|
||||||
eoStochTournamentSelect.h \
|
eoStochTournamentSelect.h \
|
||||||
eoStochasticUniversalSelect.h \
|
eoStochasticUniversalSelect.h \
|
||||||
eoSurviveAndDie.h \
|
eoSurviveAndDie.h \
|
||||||
|
eoSyncEasyPSO.h \
|
||||||
|
eoTopology.h \
|
||||||
eoTransform.h \
|
eoTransform.h \
|
||||||
eoTruncSelect.h \
|
eoTruncSelect.h \
|
||||||
eoTruncatedSelectMany.h \
|
eoTruncatedSelectMany.h \
|
||||||
eoTruncatedSelectOne.h \
|
eoTruncatedSelectOne.h \
|
||||||
|
eoVariableInertiaWeightedVelocity.h \
|
||||||
eoVariableLengthCrossover.h \
|
eoVariableLengthCrossover.h \
|
||||||
eoVariableLengthMutation.h \
|
eoVariableLengthMutation.h \
|
||||||
eoVector.h \
|
eoVector.h \
|
||||||
|
eoVectorParticle.h \
|
||||||
|
eoVelocity.h \
|
||||||
|
eoVelocityInit.h \
|
||||||
|
eoWeightUpdater.h \
|
||||||
es.h \
|
es.h \
|
||||||
ga.h
|
ga.h \
|
||||||
|
PO.h
|
||||||
|
|
||||||
AM_CXXFLAGS = -I$(top_srcdir)/src
|
AM_CXXFLAGS = -I$(top_srcdir)/src
|
||||||
|
|
|
||||||
49
eo/src/eo
49
eo/src/eo
|
|
@ -82,6 +82,7 @@
|
||||||
#include <eoEvalContinue.h>
|
#include <eoEvalContinue.h>
|
||||||
#include <eoFitContinue.h>
|
#include <eoFitContinue.h>
|
||||||
#include <eoPeriodicContinue.h>
|
#include <eoPeriodicContinue.h>
|
||||||
|
#include <eoTimeContinue.h> // added th T.Legrand
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
#include <eoCtrlCContinue.h> // CtrlC handling (using 2 global variables!)
|
#include <eoCtrlCContinue.h> // CtrlC handling (using 2 global variables!)
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -145,6 +146,54 @@
|
||||||
// to be continued ...
|
// to be continued ...
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/*** Particle Swarm Optimization stuff ***/
|
||||||
|
|
||||||
|
// basic particle definitions
|
||||||
|
#include <PO.h>
|
||||||
|
#include <eoVectorParticle.h>
|
||||||
|
#include <eoBitParticle.h>
|
||||||
|
#include <eoRealParticle.h>
|
||||||
|
|
||||||
|
// initialization
|
||||||
|
#include <eoParticleBestInit.h>
|
||||||
|
|
||||||
|
// velocities
|
||||||
|
#include <eoVelocity.h>
|
||||||
|
#include <eoStandardVelocity.h>
|
||||||
|
#include <eoConstrictedVelocity.h>
|
||||||
|
#include <eoFixedInertiaWeightedVelocity.h>
|
||||||
|
#include <eoVariableInertiaWeightedVelocity.h>
|
||||||
|
#include <eoConstrictedVariableWeightVelocity.h>
|
||||||
|
|
||||||
|
// flights
|
||||||
|
#include <eoFlight.h>
|
||||||
|
#include <eoStandardFlight.h>
|
||||||
|
#include <eoVelocityInit.h>
|
||||||
|
#include <eoDummyFlight.h>
|
||||||
|
#include <eoBinaryFlight.h>
|
||||||
|
#include <eoSigBinaryFlight.h>
|
||||||
|
|
||||||
|
// topologies
|
||||||
|
#include <eoTopology.h>
|
||||||
|
#include <eoStarTopology.h>
|
||||||
|
#include <eoLinearTopology.h>
|
||||||
|
#include <eoNeighborhood.h>
|
||||||
|
#include <eoSocialNeighborhood.h>
|
||||||
|
|
||||||
|
// PS algorithms
|
||||||
|
#include <eoPSO.h>
|
||||||
|
#include <eoEasyPSO.h>
|
||||||
|
#include <eoLSPSO.h>
|
||||||
|
#include <eoSSPSO.h>
|
||||||
|
#include <eoSyncEasyPSO.h>
|
||||||
|
|
||||||
|
// utils
|
||||||
|
#include <eoRealBoundModifier.h>
|
||||||
|
#include <eoRandomRealWeightUp.h>
|
||||||
|
#include <eoWeightUpdater.h>
|
||||||
|
#include <eoLinearDecreasingWeightUp.h>
|
||||||
|
#include <eoGaussRealWeightUp.h>
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Reference in a new issue