minor fixes
This commit is contained in:
parent
503efdcdb6
commit
fa108bbd6b
3 changed files with 37 additions and 11 deletions
|
|
@ -13,7 +13,7 @@ AC_CANONICAL_TARGET
|
||||||
|
|
||||||
dnl automake initialization
|
dnl automake initialization
|
||||||
AM_INIT_AUTOMAKE([gnu dist-bzip2])
|
AM_INIT_AUTOMAKE([gnu dist-bzip2])
|
||||||
AM_CONFIG_HEADER([config.h])
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
dnl user-switches
|
dnl user-switches
|
||||||
AC_APPLICATIONS
|
AC_APPLICATIONS
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,33 @@ LIBES = $(top_builddir)/src/es/libes.a
|
||||||
LIBGA = $(top_builddir)/src/ga/libga.a
|
LIBGA = $(top_builddir)/src/ga/libga.a
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
|
|
||||||
TESTS = $(check_PROGRAMS) \
|
TESTS = $(check_PROGRAMS) \
|
||||||
|
|
@ -19,7 +45,7 @@ TESTS = $(check_PROGRAMS) \
|
||||||
noinst_HEADERS = binary_value.h real_value.h RoyalRoad.h
|
noinst_HEADERS = binary_value.h real_value.h RoyalRoad.h
|
||||||
|
|
||||||
|
|
||||||
AM_CXXFLAGS = -g -Wall -I$(top_srcdir)/src
|
AM_CXXFLAGS = -I$(top_srcdir)/src
|
||||||
DEPS = $(LIBGA) $(LIBES) $(LIBEO) $(LIBEOUTILS)
|
DEPS = $(LIBGA) $(LIBES) $(LIBEO) $(LIBEOUTILS)
|
||||||
LIBS = $(DEPS)
|
LIBS = $(DEPS)
|
||||||
|
|
||||||
|
|
@ -27,7 +53,7 @@ CLEANFILES = monitor.csv t-eoRandom.out
|
||||||
EXTRA_DIST = run_tests
|
EXTRA_DIST = run_tests
|
||||||
|
|
||||||
# extra flags for specific targets
|
# extra flags for specific targets
|
||||||
t_eoVirus_CXXFLAGS = -I$(top_srcdir)/contrib
|
t_eoVirus_CXXFLAGS = $(AM_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
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ int main()
|
||||||
checkpoint.add(stats);
|
checkpoint.add(stats);
|
||||||
|
|
||||||
// GA generation
|
// GA generation
|
||||||
eoEasyEA<Chrom> ea(checkpoint, eval, breeder, replace );
|
eoEasyEA<Chrom> ea(checkpoint, eval, breeder, replace);
|
||||||
|
|
||||||
// evolution
|
// evolution
|
||||||
try
|
try
|
||||||
|
|
|
||||||
Reference in a new issue