tiny TPA cleanup, ref #88

Author: Emmanuel Benazera

src/esostrategy.cc

@@ -338,33 +338,28 @@ namespace libcmaes
       }
     _solutions._candidates = ncandidates;
   }
-
+  
   template<class TParameters,class TSolutions,class TStopCriteria>
   void ESOStrategy<TParameters,TSolutions,TStopCriteria>::tpa_update()
   {
     int r1 = -1;
     int r2 = -1;
-    double fval1;
-    double fval2;
     for (size_t i=0;i<_solutions._candidates.size();i++)
       {
 	if (r1 == -1 && (_solutions._candidates.at(i).get_x_dvec()-_solutions._tpa_x1).isMuchSmallerThan(1e-15))
 	  {
 	    r1 = i;
-	    fval1 = _solutions._candidates.at(i).get_fvalue();
 	  }
 	if (r2 == -1 && (_solutions._candidates.at(i).get_x_dvec()-_solutions._tpa_x2).isMuchSmallerThan(1e-15))
 	  {
 	    r2 = i;
-	    fval2 = _solutions._candidates.at(i).get_fvalue();
 	  }
 	if (r1 != -1 && r2 != -1)
 	  {
-	    //std::cout << "r1=" << r1 << " / r2=" << r2 << " / fval1=" << fval1 << " / fval2=" << fval2 << std::endl;
 	    break;
 	  }
       }
-    int rank_diff = r2-r1;//std::floor((r2 - r1)/4.0);
+    int rank_diff = r2-r1;
     _solutions._tpa_s = (1.0 - _parameters._tpa_csigma) * _solutions._tpa_s
       + _parameters._tpa_csigma * rank_diff / (_parameters._lambda - 1.0);
   }