diff --git a/eo/Makefile.am b/eo/Makefile.am index 07b73ede..925bbf89 100644 --- a/eo/Makefile.am +++ b/eo/Makefile.am @@ -1,17 +1,16 @@ -############################################################################### -## ## Makefile.am for eo -## -############################################################################### -SUBDIRS = src test doc contrib win if USE_APPLICATIONS -SUBDIRS += app +SUBDIRS_APP = app endif + if USE_TUTORIAL -SUBDIRS += tutorial +SUBDIRS_TUT = tutorial endif +SUBDIRS = src test doc contrib win $(SUBDIRS_APP) $(SUBDIRS_TUT) + + # Directory for documents DOCDIR = ~/public_html/eodocs diff --git a/eo/THANKS b/eo/THANKS new file mode 100644 index 00000000..e69de29b diff --git a/eo/configure.in b/eo/configure.in index 501f4e2b..6a770c30 100644 --- a/eo/configure.in +++ b/eo/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl Change the version number here -AC_INIT(Evolving Objects, 0.9.3, eodev-main@sourceforge.net, eo) +AC_INIT(Evolving Objects, 0.9.3, eodev-help@sourceforge.net, eo) AC_PREREQ(2.53) dnl make sure we are compiling from the correct sources @@ -12,7 +12,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET dnl automake initialization -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([gnu dist-bzip2]) AM_CONFIG_HEADER([config.h]) dnl user-switches @@ -59,6 +59,14 @@ AC_OUTPUT(Makefile \ src/gp/Makefile \ src/ga/Makefile \ src/other/Makefile \ + src/paradisEO/Makefile \ + src/paradisEO/comm/Makefile \ + src/paradisEO/comm/messages/Makefile \ + src/paradisEO/comm/messages/from/Makefile \ + src/paradisEO/comm/messages/to/Makefile \ + src/paradisEO/eval/Makefile \ + src/paradisEO/island/Makefile \ + src/paradisEO/island/topologies/Makefile \ src/utils/Makefile \ test/Makefile \ tutorial/Makefile \ diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am index 906bb994..04e71ee2 100644 --- a/eo/src/Makefile.am +++ b/eo/src/Makefile.am @@ -1,11 +1,12 @@ -############################################################################### -## -## Makefile.am for eo/src -## -############################################################################### - -SUBDIRS = es ga gp utils other do +# Makefile.am for eo/src +if USE_PARADISEO +SUBDIRS = es ga gp do utils other paradisEO +PARADISEO_H = paradiseo.h +else +SUBDIRS = es ga gp do utils other +PARADISEO_H = +endif lib_LIBRARIES = libeo.a @@ -16,9 +17,118 @@ libeo_a_SOURCES = eoFunctorStore.cpp \ eoParetoFitness.cpp \ eoScalarFitnessAssembled.cpp -pkginclude_HEADERS = $(srcdir)/eo $(srcdir)/*.h $(srcdir)/do/*.h - AM_CXXFLAGS = -I$(top_srcdir)/src -EXTRA_DIST = eo *.h do/*.h +pkginclude_HEADERS = eo \ + EO.h \ + apply.h \ + eoAlgo.h \ + eoBreed.h \ + eoCellularEasyEA.h \ + eoCloneOps.h \ + eoCombinedContinue.h \ + eoCombinedInit.h \ + eoContinue.h \ + eoCounter.h \ + eoCtrlCContinue.h \ + eoDetSelect.h \ + eoDetTournamentSelect.h \ + eoDistribUpdater.h \ + eoDistribution.h \ + eoDominanceMap.h \ + eoEDA.h \ + eoEasyEA.h \ + eoEvalContinue.h \ + eoEvalFunc.h \ + eoEvalFuncCounter.h \ + eoEvalFuncPtr.h \ + eoFactory.h \ + eoFitContinue.h \ + eoFitnessScalingSelect.h \ + eoFlOrBinOp.h \ + eoFlOrMonOp.h \ + eoFlOrQuadOp.h \ + eoFunctor.h \ + eoFunctorStore.h \ + eoG3Replacement.h \ + eoGenContinue.h \ + eoGenOp.h \ + eoGeneralBreeder.h \ + eoInit.h \ + eoInvalidateOps.h \ + eoLinearFitScaling.h \ + eoMGGReplacement.h \ + eoMerge.h \ + eoMergeReduce.h \ + eoNDSorting.h \ + eoObject.h \ + eoOneToOneBreeder.h \ + eoOp.h \ + eoOpContainer.h \ + eoOpSelMason.h \ + eoParetoConstraintFitness.h \ + eoParetoFitness.h \ + eoParetoRanking.h \ + eoPerf2Worth.h \ + eoPersistent.h \ + eoPop.h \ + eoPopAlgo.h \ + eoPopEvalFunc.h \ + eoPopulator.h \ + eoPrintable.h \ + eoProportionalCombinedOp.h \ + eoProportionalSelect.h \ + eoRandomSelect.h \ + eoRanking.h \ + eoRankingSelect.h \ + eoReduce.h \ + eoReduceMerge.h \ + eoReduceMergeReduce.h \ + eoReduceSplit.h \ + eoReplacement.h \ + eoSGA.h \ + eoSGAGenOp.h \ + eoSGATransform.h \ + eoSTLFunctor.h \ + eoScalarFitness.h \ + eoScalarFitnessAssembled.cpp \ + eoScalarFitnessAssembled.h \ + eoSelect.h \ + eoSelectFactory.h \ + eoSelectFromWorth.h \ + eoSelectMany.h \ + eoSelectNumber.h \ + eoSelectOne.h \ + eoSelectPerc.h \ + eoSequentialSelect.h \ + eoSharing.h \ + eoSharingSelect.h \ + eoSimpleEDA.h \ + eoSteadyFitContinue.h \ + eoStochTournamentSelect.h \ + eoStochasticUniversalSelect.h \ + eoSurviveAndDie.h \ + eoToricCellularEasyEA.h \ + eoTransform.h \ + eoTruncSelect.h \ + eoTruncatedSelectMany.h \ + eoTruncatedSelectOne.h \ + eoVariableLengthCrossover.h \ + eoVariableLengthMutation.h \ + eoVector.h \ + es.h \ + ga.h \ + do/make_algo_easea.h \ + do/make_algo_pareto.h \ + do/make_algo_scalar.h \ + do/make_checkpoint.h \ + do/make_checkpoint_FDC.h \ + do/make_checkpoint_assembled.h \ + do/make_checkpoint_pareto.h \ + do/make_continue.h \ + do/make_continue_pareto.h \ + do/make_general_replacement.h \ + do/make_pop.h \ + do/make_run.h \ + $(PARADISEO_H) diff --git a/eo/src/do/Makefile.am b/eo/src/do/Makefile.am index 998e0782..ca6877ec 100644 --- a/eo/src/do/Makefile.am +++ b/eo/src/do/Makefile.am @@ -1,3 +1 @@ -EXTRA_DIST = *.h Readme - -CLEANFILES = *~ +EXTRA_DIST = Readme diff --git a/eo/src/es/Makefile.am b/eo/src/es/Makefile.am index e15e5eff..c9faaaa7 100644 --- a/eo/src/es/Makefile.am +++ b/eo/src/es/Makefile.am @@ -1,8 +1,4 @@ -############################################################################### -## ## Makefile.am for eo/src/es -## -############################################################################### lib_LIBRARIES = libes.a diff --git a/eo/src/paradisEO/.cvsignore b/eo/src/paradisEO/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/Makefile.am b/eo/src/paradisEO/Makefile.am new file mode 100644 index 00000000..dcf813f1 --- /dev/null +++ b/eo/src/paradisEO/Makefile.am @@ -0,0 +1,7 @@ +# Copyright (C) 2004 Jochen Küpper + +SUBDIRS = comm eval island + +pkginclude_HEADERS = eoPopAgent.h eoSolAgent.h + +### Makefile.am ends here diff --git a/eo/src/paradisEO/comm/.cvsignore b/eo/src/paradisEO/comm/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/comm/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/comm/Makefile.am b/eo/src/paradisEO/comm/Makefile.am new file mode 100644 index 00000000..62654d8f --- /dev/null +++ b/eo/src/paradisEO/comm/Makefile.am @@ -0,0 +1,7 @@ +# Copyright (C) 2004 Jochen Küpper + +SUBDIRS = messages + +pkginclude_HEADERS = eoListener.h eoLocalListener.h + +### Makefile.am ends here diff --git a/eo/src/paradisEO/comm/messages/.cvsignore b/eo/src/paradisEO/comm/messages/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/comm/messages/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/comm/messages/Makefile.am b/eo/src/paradisEO/comm/messages/Makefile.am new file mode 100644 index 00000000..c3caa886 --- /dev/null +++ b/eo/src/paradisEO/comm/messages/Makefile.am @@ -0,0 +1,8 @@ +# Copyright (C) 2004 Jochen Küpper + +SUBDIRS = from to + +pkginclude_HEADERS = eoMessFrom.h eoMessTo.h + + +### Makefile.am ends here diff --git a/eo/src/paradisEO/comm/messages/from/.cvsignore b/eo/src/paradisEO/comm/messages/from/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/comm/messages/from/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/comm/messages/from/Makefile.am b/eo/src/paradisEO/comm/messages/from/Makefile.am new file mode 100644 index 00000000..94a772db --- /dev/null +++ b/eo/src/paradisEO/comm/messages/from/Makefile.am @@ -0,0 +1,9 @@ +# Copyright (C) 2004 Jochen Küpper + +pkginclude_HEADERS = eoEOReceiveMessFrom.h \ + eoEOSendMessFrom.h \ + eoHeaderMessFrom.h \ + eoKillMessFrom.h \ + eoPublishMessFrom.h + +### Makefile.am ends here diff --git a/eo/src/paradisEO/comm/messages/to/.cvsignore b/eo/src/paradisEO/comm/messages/to/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/comm/messages/to/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/comm/messages/to/Makefile.am b/eo/src/paradisEO/comm/messages/to/Makefile.am new file mode 100644 index 00000000..0a8259bf --- /dev/null +++ b/eo/src/paradisEO/comm/messages/to/Makefile.am @@ -0,0 +1,9 @@ +# Copyright (C) 2004 Jochen Küpper + +pkginclude_HEADERS = eoEOReceiveMessTo.h \ + eoEOSendMessTo.h \ + eoHeaderMessTo.h \ + eoKillMessTo.h \ + eoPublishMessTo.h + +### Makefile.am ends here diff --git a/eo/src/paradisEO/eval/.cvsignore b/eo/src/paradisEO/eval/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/eval/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/eval/Makefile.am b/eo/src/paradisEO/eval/Makefile.am new file mode 100644 index 00000000..a6947edf --- /dev/null +++ b/eo/src/paradisEO/eval/Makefile.am @@ -0,0 +1,9 @@ +# Copyright (C) 2004 Jochen Küpper + +pkginclude_HEADERS = eoDistEvalEasyEA.h \ + eoDistEvalEasyEA.h \ + eoDistPopEvalFunc.h \ + eoEvaluator.h \ + eoPopEval.h + +### Makefile.am ends here diff --git a/eo/src/paradisEO/island/.cvsignore b/eo/src/paradisEO/island/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/island/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/island/Makefile.am b/eo/src/paradisEO/island/Makefile.am new file mode 100644 index 00000000..96c78619 --- /dev/null +++ b/eo/src/paradisEO/island/Makefile.am @@ -0,0 +1,10 @@ +# Copyright (C) 2004 Jochen Küpper + +SUBDIRS = topologies + +pkginclude_HEADERS = eoConnectivity.h \ + eoCyclicGenContinue.h \ + eoIslandsEasyEA.h \ + eoMigUpdater.h + +### Makefile.am ends here diff --git a/eo/src/paradisEO/island/topologies/.cvsignore b/eo/src/paradisEO/island/topologies/.cvsignore new file mode 100644 index 00000000..70845e08 --- /dev/null +++ b/eo/src/paradisEO/island/topologies/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/eo/src/paradisEO/island/topologies/Makefile.am b/eo/src/paradisEO/island/topologies/Makefile.am new file mode 100644 index 00000000..946d9d9c --- /dev/null +++ b/eo/src/paradisEO/island/topologies/Makefile.am @@ -0,0 +1,6 @@ +# Copyright (C) 2004 Jochen Küpper + +pkginclude_HEADERS = eoFullConnectivity.h\ + eoRingConnectivity.h + +### Makefile.am ends here diff --git a/eo/src/utils/Makefile.am b/eo/src/utils/Makefile.am index 8dc5d138..77fbf080 100644 --- a/eo/src/utils/Makefile.am +++ b/eo/src/utils/Makefile.am @@ -1,8 +1,4 @@ -############################################################################### -## ## Makefile.am for eo/src/utils -## -############################################################################### lib_LIBRARIES = libeoutils.a @@ -15,8 +11,38 @@ libeoutils_a_SOURCES = eoParser.cpp \ eoRealBounds.cpp \ make_help.cpp -pkginclude_HEADERS = checkpointing $(srcdir)/*.h - AM_CXXFLAGS = -I$(top_srcdir)/src -EXTRA_DIST = *.h +pkginclude_HEADERS = checkpointing \ + compatibility.h \ + eoAssembledFitnessStat.h \ + eoCheckPoint.h \ + eoData.h \ + eoDistance.h \ + eoFDCStat.h \ + eoFileMonitor.h \ + eoFileSnapshot.h \ + eoGnuplot.h \ + eoGnuplot1DMonitor.h \ + eoGnuplot1DSnapshot.h \ + eoHowMany.h \ + eoMOFitnessStat.h \ + eoMonitor.h \ + eoParam.h \ + eoParser.h \ + eoPopStat.h \ + eoRNG.h \ + eoRealBounds.h \ + eoRealVectorBounds.h \ + eoRndGenerators.h \ + eoScalarFitnessStat.h \ + eoStat.h \ + eoState.h \ + eoStdoutMonitor.h \ + eoTimeCounter.h \ + eoUniformInit.h \ + eoUpdatable.h \ + eoUpdater.h \ + pipecom.h \ + rnd_generators.h \ + selectors.h