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

minor fixes

Browse source
This commit is contained in:
kuepper 2004-09-24 11:55:09 +00:00
commit fa108bbd6b
3 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eo/configure.in
View file

@ -13,7 +13,7 @@ AC_CANONICAL_TARGET
dnl automake initialization
AM_INIT_AUTOMAKE([gnu dist-bzip2])
AM_CONFIG_HEADER([config.h])
AM_CONFIG_HEADER(config.h)
dnl user-switches
AC_APPLICATIONS

32
eo/test/Makefile.am
View file

@ -10,7 +10,33 @@ LIBES = $(top_builddir)/src/es/libes.a
LIBGA = $(top_builddir)/src/ga/libga.a
# 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) \
@ -19,7 +45,7 @@ TESTS = $(check_PROGRAMS) \
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)
LIBS = $(DEPS)
@ -27,7 +53,7 @@ CLEANFILES = monitor.csv t-eoRandom.out
EXTRA_DIST = run_tests
# extra flags for specific targets
t_eoVirus_CXXFLAGS = -I$(top_srcdir)/contrib
t_eoVirus_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)/contrib
# Specify source-files,
# otherwise automake/make looks for C sources

14
eo/test/t-MGE1bit.cpp
View file

@ -80,18 +80,18 @@ int main()
checkpoint.add(stats);
// GA generation
eoEasyEA<Chrom> ea(checkpoint, eval, breeder, replace );
eoEasyEA<Chrom> ea(checkpoint, eval, breeder, replace);
// evolution
try
{
{
ea(pop);
}
}
catch (std::exception& e)
{
std::cout << "exception: " << e.what() << std::endl;;
exit(EXIT_FAILURE);
}
{
std::cout << "exception: " << e.what() << std::endl;;
exit(EXIT_FAILURE);
}
std::cout << "pop" << std::endl;
for (i = 0; i < pop.size(); ++i)