Updated makefile.am such that "make check" will run all test programs. Fixed

a number of erronuous return values that made the script fail. What's left
is let Marc clean up the mess he made with t-eoReal and t-eoRealAllESAllAgain

eo/test/Makefile.am

@@ -16,7 +16,13 @@ CXXFLAGS = -g -Wall
 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
-TESTS=run_tests t-eoVector t-eoRandom t-eoSSGA t-eoPareto t-eoParetoFitness
+
+
+TESTS=$(check_PROGRAMS) run_tests
+
+#TESTS=run_tests t-eoVector t-eoRandom t-eoSSGA t-eoPareto t-eoParetoFitness t-eoReal t-eo \
+#	t-eoReplacement t-eoExternalEO t-eoGenOp t-eoSelect t-eoStateAndParser t-eoSymreg \
+#	t-eobin t-eofitness  
 # removing temporarily t-eoESFull
 # noinst_PROGRAMS = t-eofitness t-eobin t-eoStateAndParser t-eoCheckpointing t-eoExternalEO t-eoESFull t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA t-eoReal
 

eo/test/run_tests

@@ -1,43 +1,7 @@
 #!/bin/sh
-echo "Starting t-eo"
-./t-eo > eo.log
-
-echo "Starting t-eoReplacement"
-./t-eoReplacement > replacement.log
-
-echo "Starting t-eoCheckpointing"
-./t-eoCheckpointing > checkpointing.log
 
 echo "Testing -h"
-./t-eoCheckpointing -h > ch2.log
-
-echo "Testing t-eoExternalEO"
-./t-eoExternalEO > externalEO.log
-
-echo "Testing t-eoGenOp"
-./t-eoGenOp > genOp.log
-
-echo "Testing t-eoSelect"
-./t-eoSelect > select.log
-
-echo "Testing t-eoStateAndParser"
-# TODO, many different parameter settings and checks
-./t-eoStateAndParser > stateAndParser.log
-
-echo "Testing t-eoSymreg"
-./t-eoSymreg > symreg.log
-
-echo "Testing t-eobin"
-./t-eobin > bin.log
-
-echo "Testing t-eofitness"
-./t-eofitness > fitness.log
-
-echo "Testing t-eoGA"
-./t-eoGA > t-eoGA.log
-
-echo "Testing t-eoGenOp"
-./t-eoGenOp > t-eoGenOp.log
+./t-eoCheckpointing -h 
 
 echo "Finished"
 

eo/test/t-MGE-control.cpp

@@ -25,7 +25,7 @@ typedef eoVirus<float> Chrom;
 
 int main()
 {
-  const unsigned POP_SIZE = 1000, CHROM_SIZE = 128;
+  const unsigned POP_SIZE = 10, CHROM_SIZE = 12;
   unsigned i;
   eoBooleanGenerator gen;
 
@@ -63,8 +63,8 @@ int main()
   eoCommaReplacement<Chrom> replace;
 
   // Terminators
-  eoGenContinue<Chrom> continuator1(500);
-  eoFitContinue<Chrom> continuator2(128);
+  eoGenContinue<Chrom> continuator1(10);
+  eoFitContinue<Chrom> continuator2(CHROM_SIZE);
   eoCombinedContinue<Chrom> continuator(continuator1, continuator2);  
   eoCheckPoint<Chrom> checkpoint(continuator);
   eoStdoutMonitor monitor;

eo/test/t-MGE.cpp

@@ -25,7 +25,7 @@ typedef eoVirus<float> Chrom;
 
 int main()
 {
-  const unsigned POP_SIZE = 1000, CHROM_SIZE = 128;
+  const unsigned POP_SIZE = 10, CHROM_SIZE = 12;
   unsigned i;
   eoBooleanGenerator gen;
 
@@ -67,8 +67,8 @@ int main()
   eoCommaReplacement<Chrom> replace;
 
   // Terminators
-  eoGenContinue<Chrom> continuator1(500);
-  eoFitContinue<Chrom> continuator2(128);
+  eoGenContinue<Chrom> continuator1(10);
+  eoFitContinue<Chrom> continuator2(CHROM_SIZE);
   eoCombinedContinue<Chrom> continuator(continuator1, continuator2);  
   eoCheckPoint<Chrom> checkpoint(continuator);
   eoStdoutMonitor monitor;

eo/test/t-MGE1bit.cpp

@@ -25,7 +25,7 @@ typedef eoVirus<float> Chrom;
 
 int main()
 {
-  const unsigned POP_SIZE = 1000, CHROM_SIZE = 128;
+  const unsigned POP_SIZE = 10, CHROM_SIZE = 12;
   unsigned i;
   eoBooleanGenerator gen;
 
@@ -67,8 +67,8 @@ int main()
   eoCommaReplacement<Chrom> replace;
 
   // Terminators
-  eoGenContinue<Chrom> continuator1(500);
-  eoFitContinue<Chrom> continuator2(128);
+  eoGenContinue<Chrom> continuator1(10);
+  eoFitContinue<Chrom> continuator2(CHROM_SIZE);
   eoCombinedContinue<Chrom> continuator(continuator1, continuator2);  
   eoCheckPoint<Chrom> checkpoint(continuator);
   eoStdoutMonitor monitor;

eo/test/t-eoCheckpointing.cpp

@@ -180,5 +180,4 @@ int main(int argc, char **argv)
         cout << "Exception: " << e.what() << endl;
     }
 
-    return 1;
 }

eo/test/t-eoExternalEO.cpp

@@ -129,5 +129,4 @@ int main()
 
     cross2(eo1,eo2);
 
-    return 1;
 };

eo/test/t-eoGenOp.cpp

@@ -385,7 +385,6 @@ int main(int argc, char **argv)
         cout << "Exception: " << e.what() << endl;
     }
 
-    return 1;
 }
 
 /*

eo/test/t-eoReplacement.cpp

@@ -220,5 +220,4 @@ int main(int argc, char **argv)
         cout << "Exception: " << e.what() << endl;
     }
 
-    return 1;
 }

eo/test/t-eoSelect.cpp

@@ -125,7 +125,7 @@ eoValueParam<unsigned int> tournamentSizeParam = parser.createParam<unsigned int
     if (parser.userNeedsHelp())
       {
         parser.printHelp(cout);
-        exit(1);
+        exit(0);
       }
 
     cout << "Testing the Selections\nParents size = " << pSize 
@@ -164,7 +164,7 @@ eoValueParam<unsigned int> tournamentSizeParam = parser.createParam<unsigned int
     eoStochTournamentSelect<Dummy> stochTourSelect(tRate);
     testSelectOne<Dummy>(stochTourSelect, oRate, "stochTourSelect");
 
-    exit(1);
+    exit(0);
 
     // Fitness scaling
 //     eoFitnessScalingSelect<Dummy> fitScaleSelect(rankingPressure);
@@ -186,7 +186,6 @@ int main(int argc, char **argv)
     catch(exception& e)
     {
         cout << "Exception: " << e.what() << endl;
+        return 1;
     }
-
-    return 1;
 }

eo/test/t-eoStateAndParser.cpp

@@ -136,5 +136,4 @@ int main(int argc, char **argv)
         cout << "Exception: " << e.what() << endl;
     }
 
-    return 1;
 }

eo/test/t-eoSymreg.cpp

@@ -277,7 +277,6 @@ int main()
 
     print_best<EoType, FitnessType>(pop);
 
-    return 1;
 }
 
 

eo/test/t-eobin.cpp

@@ -212,5 +212,4 @@ int main()
         cout << "Exception: " << e.what() << '\n';
     }
 
-    return 1;
 }

eo/test/t-eofitness.cpp

@@ -84,7 +84,6 @@ int main()
     
     test_fitness(b1,a1);
 
-    return 1;
 }
 
 //-----------------------------------------------------------------------------