From e64417f2a56ec86b5a13ecb5897a778edec788ee Mon Sep 17 00:00:00 2001
From: nojhan <nojhan@nojhan.net>
Date: Tue, 10 Dec 2019 11:11:47 +0100
Subject: [PATCH] BREAKING CHANGE: set standard to C++11, feat: accessor to
 breeder ops

Give an access to the operators held by a breeder.
This is needed to design algorithms that dynamically update their
internal parameters during search.
To simplify the interface, we use a returned tuple, and thus upgrade the
C++ standard to C++11.
---
 CMakeLists.txt            |  1 +
 eo/src/eoGeneralBreeder.h | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bb3a2c4e..b125b0966 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ project("ParadisEO")
 
 ## Language
 enable_language(CXX)
+set(CMAKE_CXX_STANDARD 11)
 
 ## Test the presence of a compiler
 if("${CMAKE_CXX_COMPILER}" STREQUAL "" OR "${CMAKE_C_COMPILER}" STREQUAL "")
diff --git a/eo/src/eoGeneralBreeder.h b/eo/src/eoGeneralBreeder.h
index 1fdbd5c40..fb1bc88b8 100644
--- a/eo/src/eoGeneralBreeder.h
+++ b/eo/src/eoGeneralBreeder.h
@@ -32,6 +32,8 @@
  * eoGeneralBreeder: transforms a population using the generalOp construct.
  *****************************************************************************/
 
+#include <tuple>
+
 #include "eoOp.h"
 #include "eoGenOp.h"
 #include "eoPopulator.h"
@@ -58,9 +60,12 @@ class eoGeneralBreeder: public eoBreed<EOT>
   eoGeneralBreeder(
           eoSelectOne<EOT>& _select,
           eoGenOp<EOT>& _op,
-                double  _rate=1.0,
+          double  _rate=1.0,
           bool _interpret_as_rate = true) :
-      select( _select ), op(_op),  howMany(_rate, _interpret_as_rate) {}
+      select( _select ), op(_op),
+      local_howMany(_rate, _interpret_as_rate),
+      howMany(local_howMany)
+    {}
 
   /** Ctor:
    *
@@ -71,8 +76,8 @@ class eoGeneralBreeder: public eoBreed<EOT>
   eoGeneralBreeder(
           eoSelectOne<EOT>& _select,
           eoGenOp<EOT>& _op,
-          eoHowMany _howMany ) :
-      select( _select ), op(_op),  howMany(_howMany) {}
+          eoHowMany& _howMany ) :
+      select( _select ), op(_op), howMany(_howMany) {}
 
   /** The breeder: simply calls the genOp on a selective populator!
    *
@@ -82,7 +87,6 @@ class eoGeneralBreeder: public eoBreed<EOT>
   void operator()(const eoPop<EOT>& _parents, eoPop<EOT>& _offspring)
     {
       unsigned target = howMany(_parents.size());
-
       _offspring.clear();
       eoSelectivePopulator<EOT> it(_parents, _offspring, select);
 
@@ -98,10 +102,20 @@ class eoGeneralBreeder: public eoBreed<EOT>
   /// The class name.
   virtual std::string className() const { return "eoGeneralBreeder"; }
 
- private:
+  virtual std::tuple
+      <eoSelectOne<EOT>&,eoGenOp<EOT>&,eoHowMany&>
+      operators()
+  {
+      return std::forward_as_tuple
+          <eoSelectOne<EOT>&,eoGenOp<EOT>&,eoHowMany&>
+          (select, op, howMany);
+  }
+
+ protected:
   eoSelectOne<EOT>& select;
   eoGenOp<EOT>& op;
-  eoHowMany howMany;
+  eoHowMany local_howMany;
+  eoHowMany& howMany;
 };
 
 #endif