nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates,

Browse source 
start supoorting ParadisEO
This commit is contained in:
kuepper 2004-09-21 17:01:14 +00:00
commit 63cbb12e69
7 changed files with 66 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
eo/.cvsignore
View file

@ -9,11 +9,12 @@ autom4te.cache
build* build*
confdefs.h confdefs.h
config.cache config.cache
config.cache config.guess
config.h config.h
config.h.in config.h.in
config.log config.log
config.status config.status
config.sub
configure configure
depcomp depcomp
install-sh install-sh

24
eo/Makefile.am
View file

@ -4,28 +4,18 @@
## ##
############################################################################### ###############################################################################
SUBDIRS = src test doc app tutorial contrib win SUBDIRS = src test doc app tutorial contrib win
#Directory for documents #Directory for documents
DOCDIR = ~/public_html/eodocs DOCDIR = ~/public_html/eodocs
#Directory for indices -- not useful for the user #Directory for indices -- not useful for the user
IDXDIR = ~/index IDXDIR = ~/index
# special targets dist-hook:
app: $(MAKE) doc
cd app; $(MAKE) all; cd ..
# so that make doc always compiles the doc ... doc: $(srcdir)/doc/eo.cfg
doc: doc/eo.cfg cd doc && $(MAKE) doc && cd ..
cd doc; $(MAKE) doc; touch eo.cfg; cd ..
###############################################################################
#lib:
# cd src; $(MAKE) all; cd ..

25
eo/acinclude.m4
View file

@ -1,3 +1,26 @@
# AC_PARADISEO()
#
# Compile ParadisEO if user requests it.
AC_DEFUN([AC_PARADISEO],[dnl
AC_ARG_ENABLE([paradiseo],[ --enable-paradiseo build ParadisEO (default=no)],
[ case "${enableval}" in
yes) paradiseo=true ;;
no) paradiseo=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for paradiseo option) ;;
esac],
[paradiseo=false])
if test "$paradiseo" = "true"; then
AC_DEFINE([PARADISEO], 1, [ParadisEO flag])
AM_CONDITIONAL([USE_PARADISEO], true)
AC_CHECK_PROG([MPICXX], [mpiCC], [], AC_MSG_ERROR([Need mpiCC to build PAradisEO.]))
AC_CHECK_PROG([MPIRUN], [mpirun], [], AC_MSG_ERROR([Need mpirun to use PAradisEO.]))
else
AM_CONDITIONAL([USE_PARADISEO], false)
fi
])
dnl Available from the GNU Autoconf Macro Archive at: dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_sstream.html dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_sstream.html
dnl dnl
@ -24,6 +47,8 @@ if test "$ac_cv_cxx_have_sstream" = yes; then
AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream]) AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream])
fi fi
]) ])
dnl Available from the GNU Autoconf Macro Archive at: dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
dnl dnl

15
eo/configure.in
View file

@ -2,12 +2,22 @@ dnl Process this file with autoconf to produce a configure script.
dnl Change the version number here 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-main@sourceforge.net, eo)
AC_PREREQ(2.53) AC_PREREQ(2.53)
dnl make sure we are compiling from the correct sources dnl make sure we are compiling from the correct sources
AC_CONFIG_SRCDIR(src/eoOp.h) AC_CONFIG_SRCDIR(src/eoOp.h)
dnl define host, build, and target machine
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
dnl automake initialization
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
dnl user-switches
AC_PARADISEO
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
@ -15,10 +25,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_RANLIB AC_PROG_RANLIB
AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, true)
# Why shall we check for these, we just build them...
# AC_CHECK_LIB(eo, main)
# AC_CHECK_LIB(eoutils, main)
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC

12
eo/doc/Makefile.am
View file

@ -5,10 +5,14 @@
############################################################################### ###############################################################################
# EXTRA_DIST = eo.cfg foot.html html/* latex/* EXTRA_DIST = eo.cfg foot.html \
$(srcdir)/html/* \
$(srcdir)/latex/* \
$(srcdir)/man/*
doc: eo.cfg
doxygen eo.cfg doc:
cd $(srcdir) && $(DOXYGEN) eo.cfg && touch eo.cfg
clean-local: clean-local:
rm -rf html latex man cd $(srcdir) && rm -rf html latex man && touch eo.cfg

2
eo/doc/eo.cfg
View file

@ -23,7 +23,7 @@ PROJECT_NAME = EO
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 0.9.2 PROJECT_NUMBER = 0.9.3
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

29
eo/test/Makefile.am
View file

@ -9,27 +9,25 @@ LIBEOUTILS = $(top_builddir)/src/utils/libeoutils.a
LIBES = $(top_builddir)/src/es/libes.a LIBES = $(top_builddir)/src/es/libes.a
LIBGA = $(top_builddir)/src/ga/libga.a LIBGA = $(top_builddir)/src/ga/libga.a
AM_CXXFLAGS = -g -Wall -I$(top_srcdir)/src
CLEANFILES = monitor.csv t-eoRandom.out
DEPS = $(LIBGA) $(LIBES) $(LIBEO) $(LIBEOUTILS)
LIBS = $(DEPS)
# PLEASE don't break the line (see create_batch.sh) # PLEASE don't break the line (see create_batch.sh)
check_PROGRAMS = t-eoParetoFitness t-eoPareto t-eofitness t-eoRandom t-eobin t-eoVirus t-MGE t-MGE1bit t-MGE-control t-eoStateAndParser t-eoCheckpointing t-eoSSGA t-eoExternalEO t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA t-eoReal t-eoVector t-eoESAll t-eoPBIL t-eoFitnessAssembled t-eoFitnessAssembledEA t-eoRoulette t-eoSharing check_PROGRAMS = t-eoParetoFitness t-eoPareto t-eofitness t-eoRandom t-eobin t-eoVirus t-MGE t-MGE1bit t-MGE-control t-eoStateAndParser t-eoCheckpointing t-eoSSGA t-eoExternalEO t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA t-eoReal t-eoVector t-eoESAll t-eoPBIL t-eoFitnessAssembled t-eoFitnessAssembledEA t-eoRoulette t-eoSharing
noinst_headers = binary_value.h real_value.h RoyalRoad.h
TESTS = $(check_PROGRAMS) \
run_tests # This script can be used to check command-line arguments
noinst_HEADERS = binary_value.h real_value.h RoyalRoad.h
# The run_tests script can be used to check various arguments AM_CXXFLAGS = -g -Wall -I$(top_srcdir)/src
TESTS=$(check_PROGRAMS) run_tests DEPS = $(LIBGA) $(LIBES) $(LIBEO) $(LIBEOUTILS)
LIBS = $(DEPS)
CLEANFILES = monitor.csv t-eoRandom.out
EXTRA_DIST = run_tests
# extra flags for specific targets
t_eoVirus_CXXFLAGS = -I$(top_srcdir)/contrib
# Specify source-files, # Specify source-files,
# otherwise automake/make looks for C sources # otherwise automake/make looks for C sources
@ -61,6 +59,3 @@ t_eoPBIL_SOURCES = t-eoPBIL.cpp
t_eoFitnessAssembled_SOURCES = t-eoFitnessAssembled.cpp t_eoFitnessAssembled_SOURCES = t-eoFitnessAssembled.cpp
t_eoRoulette_SOURCES = t-eoRoulette.cpp t_eoRoulette_SOURCES = t-eoRoulette.cpp
t_eoSharing_SOURCES = t-eoSharing.cpp t_eoSharing_SOURCES = t-eoSharing.cpp
# extra flags for specific targets
t_eoVirus_CXXFLAGS = -I$(top_srcdir)/contrib