From 81dba00e10efa1953f49979f4e9dafaa1c46f699 Mon Sep 17 00:00:00 2001
From: canape <canape@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Wed, 7 Nov 2007 15:59:30 +0000
Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@764
 331e1502-861f-0410-8da2-ba01fb791d7f

---
 trunk/paradiseo-peo/src/peo.h         |  1 +
 trunk/paradiseo-peo/src/peoEvalFunc.h | 60 +++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 trunk/paradiseo-peo/src/peoEvalFunc.h

diff --git a/trunk/paradiseo-peo/src/peo.h b/trunk/paradiseo-peo/src/peo.h
index 3ec407c7c..15dee65f4 100644
--- a/trunk/paradiseo-peo/src/peo.h
+++ b/trunk/paradiseo-peo/src/peo.h
@@ -329,6 +329,7 @@
 #include "peoSeqTransform.h"
 #include "peoParaSGATransform.h"
 #include "peoSeqPopEval.h"
+#include "peoEvalFunc.h"
 #include "peoParaPopEval.h"
 
 /* Cooperative island model */
diff --git a/trunk/paradiseo-peo/src/peoEvalFunc.h b/trunk/paradiseo-peo/src/peoEvalFunc.h
new file mode 100644
index 000000000..a5231d551
--- /dev/null
+++ b/trunk/paradiseo-peo/src/peoEvalFunc.h
@@ -0,0 +1,60 @@
+/* 
+* <peoEvalFunc.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, INRIA, 2007
+*
+* Clive Canape
+*
+* This software is governed by the CeCILL license under French law and
+* abiding by the rules of distribution of free software.  You can  use,
+* modify and/ or redistribute the software under the terms of the CeCILL
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* "http://www.cecill.info".
+*
+* As a counterpart to the access to the source code and  rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty  and the software's author,  the holder of the
+* economic rights,  and the successive licensors  have only  limited liability.
+*
+* In this respect, the user's attention is drawn to the risks associated
+* with loading,  using,  modifying and/or developing or reproducing the
+* software by the user in light of its specific status of free software,
+* that may mean  that it is complicated to manipulate,  and  that  also
+* therefore means  that it is reserved for developers  and  experienced
+* professionals having in-depth computer knowledge. Users are therefore
+* encouraged to load and test the software's suitability as regards their
+* requirements in conditions enabling the security of their systems and/or
+* data to be ensured and,  more generally, to use and operate it in the
+* same conditions as regards security.
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL license and that you accept its terms.
+*
+* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+* Contact: clive.canape@inria.fr
+*
+*/
+
+#ifndef PEOEVALFUNC_H
+#define PEOEVALFUNC_H
+
+#ifdef _MSC_VER
+template< class EOT, class FitT = EOT::Fitness, class FunctionArg = const EOT& >
+#else
+template< class EOT, class FitT = typename EOT::Fitness, class FunctionArg = const EOT& >
+#endif
+struct peoEvalFunc: public eoEvalFunc<EOT> {
+
+  peoEvalFunc( FitT (* _eval)( FunctionArg ) )
+    : eoEvalFunc<EOT>(), evalFunc( _eval ) {};
+
+  virtual void operator() ( EOT & _peo ) 
+  {
+        _peo.fitness((*evalFunc)( _peo ));
+  };
+    
+  private:
+    FitT (* evalFunc )( FunctionArg );
+};
+
+#endif
+