From fa108bbd6bd9c342c62e1086249277f62be7019d Mon Sep 17 00:00:00 2001
From: kuepper <kuepper>
Date: Fri, 24 Sep 2004 11:55:09 +0000
Subject: [PATCH] minor fixes

---
 eo/configure.in       |  2 +-
 eo/test/Makefile.am   | 32 +++++++++++++++++++++++++++++---
 eo/test/t-MGE1bit.cpp | 14 +++++++-------
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/eo/configure.in b/eo/configure.in
index 5234233d..6569c2b8 100644
--- a/eo/configure.in
+++ b/eo/configure.in
@@ -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
diff --git a/eo/test/Makefile.am b/eo/test/Makefile.am
index b662839c..94fcee7b 100644
--- a/eo/test/Makefile.am
+++ b/eo/test/Makefile.am
@@ -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
diff --git a/eo/test/t-MGE1bit.cpp b/eo/test/t-MGE1bit.cpp
index c4e68d05..3e1da98a 100644
--- a/eo/test/t-MGE1bit.cpp
+++ b/eo/test/t-MGE1bit.cpp
@@ -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)