From 0f1add5c6a06cc395e6c773766d7f3a711038803 Mon Sep 17 00:00:00 2001
From: quemy <alexandre.quemy@gmail.com>
Date: Fri, 21 Dec 2012 19:21:39 +0100
Subject: [PATCH] Forgot test.

---
 smp/src/islandModelWrapper.h |  2 +-
 smp/src/policyElement.cpp    |  5 +--
 smp/test/t-smpMI_Wrapper.cpp | 78 ++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 smp/test/t-smpMI_Wrapper.cpp

diff --git a/smp/src/islandModelWrapper.h b/smp/src/islandModelWrapper.h
index 13fe15634..0aa278866 100644
--- a/smp/src/islandModelWrapper.h
+++ b/smp/src/islandModelWrapper.h
@@ -56,7 +56,7 @@ of specified islands, built with same parameters.
 */
 
 template<template <class> class EOAlgo, class EOT, class... IslandInit>
-std::vector<eoPop<EOT>> IslandModelWrapper(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit... args)
+std::vector<eoPop<EOT>> IslandModelWrapper(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit&&... args)
 {
     // Model creation
     IslandModel<EOT> model(_topo);
diff --git a/smp/src/policyElement.cpp b/smp/src/policyElement.cpp
index ac5d7df9a..d4dbcdde3 100644
--- a/smp/src/policyElement.cpp
+++ b/smp/src/policyElement.cpp
@@ -39,10 +39,7 @@ paradiseo::smp::PolicyElement<EOT>::PolicyElement(eoSelect<EOT>& _selection, eoC
 template <class EOT>
 bool paradiseo::smp::PolicyElement<EOT>::operator()(const eoPop<EOT>& _pop)
 {
-    // DEBUG
-    //static int i = 0;
-    //std::cout << " " << std::this_thread::get_id() << std::endl;   
-    //i++;
+
     // END DEBUG
         
     return criterion(_pop);
diff --git a/smp/test/t-smpMI_Wrapper.cpp b/smp/test/t-smpMI_Wrapper.cpp
new file mode 100644
index 000000000..47da29ad1
--- /dev/null
+++ b/smp/test/t-smpMI_Wrapper.cpp
@@ -0,0 +1,78 @@
+#include <smp>
+#include <eo>
+
+#include "smpTestClass.h"
+
+using namespace paradiseo::smp;
+using namespace std;
+
+int main(void)
+{
+    // Defining parameters
+    typedef struct {
+        unsigned popSize = 1000;
+        unsigned tSize = 2;
+        double pCross = 0.8;
+        double pMut = 0.7;
+        unsigned maxGen = 1000;
+    } Param; 
+
+    Param param;
+    
+    // Fixing the seed
+    rng.reseed(42);
+
+    // Load instance
+    loadInstances("t-data.dat", n, bkv, a, b);
+      
+    //Common part to all islands
+    IndiEvalFunc plainEval;
+    IndiInit chromInit;
+    eoDetTournamentSelect<Indi> selectOne(param.tSize);
+    eoSelectPerc<Indi> select(selectOne);// by default rate==1
+    IndiXover Xover;                 // CROSSOVER
+    IndiSwapMutation  mutationSwap;  // MUTATION
+    eoSGATransform<Indi> transform(Xover, param.pCross, mutationSwap, param.pMut);
+    eoPlusReplacement<Indi> replace;
+    
+    // MODEL
+    // Topologies
+    Topology<Complete> topo;
+    
+    // ISLAND 1
+    // // Algorithm part
+    eoGenContinue<Indi> genCont(param.maxGen+100);
+    eoPop<Indi> pop(param.popSize, chromInit);
+    // // Emigration policy
+    // // // Element 1
+    eoPeriodicContinue<Indi> criteria(5);
+    eoDetTournamentSelect<Indi> selectOne1(20);
+    eoSelectNumber<Indi> who(selectOne1, 3);
+    
+    MigPolicy<Indi> migPolicy;
+    migPolicy.push_back(PolicyElement<Indi>(who, criteria));
+        
+    // // Integration policy
+    eoPlusReplacement<Indi> intPolicy;    
+
+    try
+    {
+        
+        std::vector<eoPop<Indi>> pops = IslandModelWrapper<eoEasyEA,Indi>(50, topo, 100, chromInit,  intPolicy, migPolicy, genCont, plainEval, select, transform, replace);
+        
+        for(auto& pop : pops)
+        {
+            for(auto& indi : pop)
+                plainEval(indi);
+            pop.sort();
+            std::cout << pop << std::endl;
+        }        
+
+    }
+    catch(exception& e)
+    {
+      cout << "Exception: " << e.what() << '\n';
+    }
+    
+    return 0;
+}