fix examples using binary_value

eo/test/binary_value.h

@@ -8,6 +8,7 @@ typedef eoBin<float> Chrom;
     the fitnes.
     @param _chrom A binary chromosome 
 */
+
 float binary_value(const Chrom& _chrom)
 {
   float sum = 0;
@@ -16,3 +17,11 @@ float binary_value(const Chrom& _chrom)
       sum += pow(2, _chrom.size() - i - 1);
   return sum;
 }
+
+struct BinaryValue
+{
+  template <class Chrom> void operator()(Chrom& _chrom)
+  {
+    _chrom.fitness(binary_value(_chrom));
+  }
+};

eo/test/t-eo.cpp

@@ -17,7 +17,7 @@ int main()
   cout << "chrom1 = " << chrom1 << endl
        << "chrom2 = " << chrom2 << endl;
 
-  return 1;
+  return 0;
 }
 
 //-----------------------------------------------------------------------------

eo/test/t-eobreeder.cpp

@@ -51,11 +51,13 @@ main()
   eoBinRandom<Chrom> random;
   eoPop<Chrom> pop; 
 
+  BinaryValue eval;
+  
   for (i = 0; i < POP_SIZE; ++i)
     {
       Chrom chrom(CHROM_SIZE);
       random(chrom);
-      binary_value(chrom);
+      eval(chrom);
       pop.push_back(chrom);
     }
   
@@ -73,7 +75,7 @@ main()
   breeder(pop);
 
   // reevaluation of fitness 
-  for_each(pop.begin(), pop.end(), binary_value);
+  for_each(pop.begin(), pop.end(), eval);
 
   cout << "new population:" << endl;
   for (i = 0; i < pop.size(); ++i)

eo/test/t-eogeneration.cpp

@@ -49,6 +49,7 @@ main()
 
   eoBinRandom<Chrom> random;
   eoPop<Chrom> pop; 
+
   // Evaluation
   eoEvalFuncPtr<Chrom> eval( binary_value );
 

eo/test/t-eoinclusion.cpp

@@ -19,6 +19,7 @@ main()
   const unsigned CHROM_SIZE = 4;
 
   eoBinRandom<Chrom> random;
+  BinaryValue eval;
 
   for (unsigned POP_SIZE = 4; POP_SIZE <=6; POP_SIZE++)
     {
@@ -28,7 +29,7 @@ main()
 	    {
 	      Chrom chrom(CHROM_SIZE);
 	      random(chrom);
-	      binary_value(chrom);
+	      eval(chrom);
 	      pop.push_back(chrom);
 	    }
       
@@ -40,7 +41,7 @@ main()
 	    {
 	      Chrom chrom(CHROM_SIZE);
 	      random(chrom);
-	      binary_value(chrom);
+	      eval(chrom);
 	      pop2.push_back(chrom);
 	    }
 	

eo/test/t-eoinsertion.cpp

@@ -105,3 +105,4 @@ main()
 }
 
 //-----------------------------------------------------------------------------
+

eo/test/t-selectOne.cpp

@@ -58,7 +58,7 @@ main()
   for (i = 0; i < POP_SIZE; ++i) {
     Chrom chrom(CHROM_SIZE);
     random(chrom);
-    binary_value(chrom);
+    BinaryValue()(chrom);
     pop.push_back(chrom);
   }