From 49eb52be2aeb6a74587e1617c64ed66ae662805e Mon Sep 17 00:00:00 2001
From: Emmanuel Benazera <emmanuel.benazera@lri.fr>
Date: Sat, 25 Oct 2014 08:22:52 +0200
Subject: [PATCH] fixed surrogate support for strategies with restart, ref #80

---
 surrogatestrategy.cc |  4 ++++
 surrogatestrategy.h  | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/surrogatestrategy.cc b/surrogatestrategy.cc
index 4204a8f8..42f9f7ef 100644
--- a/surrogatestrategy.cc
+++ b/surrogatestrategy.cc
@@ -216,6 +216,10 @@ namespace libcmaes
   template<template <class U,class V> class TStrategy, class TCovarianceUpdate, class TGenoPheno>
   dMat ACMSurrogateStrategy<TStrategy,TCovarianceUpdate,TGenoPheno>::ask()
   {
+    // when starting or restarting, make sure the training set is reset.
+    if (this->_niter == 0)
+      this->reset_training_set();
+    
     if (this->_exploit && (int)this->_tset.size() >= this->_l)
       {
 	double lambda = eostrat<TGenoPheno>::_parameters._lambda; // XXX: hacky.
diff --git a/surrogatestrategy.h b/surrogatestrategy.h
index 9bbf33f3..d44d3972 100644
--- a/surrogatestrategy.h
+++ b/surrogatestrategy.h
@@ -176,6 +176,16 @@ namespace libcmaes
 	_auto_nsteps = true;
     }
 
+    /**
+     * \brief resets training set and related information, useful when using algorithms with restarts
+     */
+    inline void reset_training_set()
+    {
+      _tset.clear();
+      _train_err = _test_err = 0.0;
+      _smooth_test_err = 0.5;
+    }
+    
     /**
      * \brief returns the current surrogate lifelength
      * @return current surrogate lifelength