From e6beab8e5c5290c1bc30aa15d6f492d5a3e31ded Mon Sep 17 00:00:00 2001
From: Johann Dreo <johann.dreo@thalesgroup.com>
Date: Tue, 25 Jun 2013 15:42:56 +0200
Subject: [PATCH] Use the fitness type instead of the objective vectors in
 fitness assignments

---
 .../moeoExpBinaryIndicatorBasedDualFitnessAssignment.h     | 7 ++++---
 .../fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/moeo/src/fitness/moeoExpBinaryIndicatorBasedDualFitnessAssignment.h b/moeo/src/fitness/moeoExpBinaryIndicatorBasedDualFitnessAssignment.h
index d3b01eaed..959be717d 100644
--- a/moeo/src/fitness/moeoExpBinaryIndicatorBasedDualFitnessAssignment.h
+++ b/moeo/src/fitness/moeoExpBinaryIndicatorBasedDualFitnessAssignment.h
@@ -38,6 +38,7 @@ protected:
 public:
     typedef typename MOEOT::ObjectiveVector ObjectiveVector;
     typedef typename ObjectiveVector::Type Type;
+    typedef typename MOEOT::Fitness Fitness;
 
     using moeoExpBinaryIndicatorBasedFitnessAssignment<MOEOT>::values;
 
@@ -146,10 +147,10 @@ protected:
         }
     }
 
-    virtual Type computeFitness(const unsigned int _idx)
+    virtual Fitness computeFitness(const unsigned int _idx)
     {
-        // Type result( 0.0, values[_idx][_idx].is_feasible() );
-        Type result( 0.0, values[_idx][_idx].is_feasible() );
+        // Fitness result( 0.0, values[_idx][_idx].is_feasible() );
+        Fitness result( 0.0, values[_idx][_idx].is_feasible() );
         for (unsigned int i=0; i<values.size(); i++) {
             if (i != _idx) {
                 result -= exp(-values[i][_idx]/kappa);
diff --git a/moeo/src/fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h b/moeo/src/fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h
index cbcbb33c4..fdc2f9240 100644
--- a/moeo/src/fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h
+++ b/moeo/src/fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h
@@ -57,8 +57,8 @@ class moeoExpBinaryIndicatorBasedFitnessAssignment : public moeoBinaryIndicatorB
 
     /** The type of objective vector */
     typedef typename MOEOT::ObjectiveVector ObjectiveVector;
-
     typedef typename ObjectiveVector::Type Type;
+    typedef typename MOEOT::Fitness Fitness;
 
     /**
      * Ctor.
@@ -211,9 +211,9 @@ class moeoExpBinaryIndicatorBasedFitnessAssignment : public moeoBinaryIndicatorB
      * Returns the fitness value of the _idx th individual of the population
      * @param _idx the index
      */
-    virtual Type computeFitness(const unsigned int _idx)
+    virtual Fitness computeFitness(const unsigned int _idx)
     {
-      Type result(0.0);
+      Fitness result(0.0);
       for (unsigned int i=0; i<values.size(); i++)
         {
           if (i != _idx)