From 6dfe8036dfd0f31a7f31dcc0597bb23d7ad31bb1 Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Mon, 2 Feb 2009 16:53:31 +0000
Subject: [PATCH] Little changed in prevision of Multi-objective local search

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1386 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-moeo/src/algo/moeoEA.h      |  5 +-
 trunk/paradiseo-moeo/src/algo/moeoPopAlgo.h | 52 +++++++++++++++++++++
 trunk/paradiseo-moeo/src/moeo               |  1 +
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 trunk/paradiseo-moeo/src/algo/moeoPopAlgo.h

diff --git a/trunk/paradiseo-moeo/src/algo/moeoEA.h b/trunk/paradiseo-moeo/src/algo/moeoEA.h
index 9e6ba3e48..a37407f87 100644
--- a/trunk/paradiseo-moeo/src/algo/moeoEA.h
+++ b/trunk/paradiseo-moeo/src/algo/moeoEA.h
@@ -38,14 +38,13 @@
 #ifndef MOEOEA_H_
 #define MOEOEA_H_
 
-#include <eoAlgo.h>
-#include <algo/moeoAlgo.h>
+#include <algo/moeoPopAlgo.h>
 
 /**
  * Abstract class for multi-objective evolutionary algorithms.
  */
 template < class MOEOT >
-class moeoEA : public moeoAlgo, public eoAlgo < MOEOT >
+class moeoEA : public moeoPopAlgo < MOEOT >
   {};
 
 #endif /*MOEOEA_H_*/
diff --git a/trunk/paradiseo-moeo/src/algo/moeoPopAlgo.h b/trunk/paradiseo-moeo/src/algo/moeoPopAlgo.h
new file mode 100644
index 000000000..a3b948a3e
--- /dev/null
+++ b/trunk/paradiseo-moeo/src/algo/moeoPopAlgo.h
@@ -0,0 +1,52 @@
+/*
+* <moeoPopAlgo.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, LIFL, 2002-2007
+*
+* Arnaud Liefooghe
+* Jérémie Humeau
+*
+* 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: paradiseo-help@lists.gforge.inria.fr
+*
+*/
+//-----------------------------------------------------------------------------
+
+#ifndef MOEOPOPALGO_H_
+#define MOEOPOPALGO_H_
+
+#include <eoAlgo.h>
+#include <algo/moeoAlgo.h>
+
+/**
+ * Abstract class for population based multi-objective evolutionary algorithms.
+ */
+template < class MOEOT >
+class moeoPopAlgo : public moeoAlgo, public eoAlgo < MOEOT >
+  {};
+
+#endif /*MOEOPOPALGO_H_*/
diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo
index 6a12ce121..11fc3b66a 100644
--- a/trunk/paradiseo-moeo/src/moeo
+++ b/trunk/paradiseo-moeo/src/moeo
@@ -42,6 +42,7 @@
 #include <eo>
 
 #include <algo/moeoAlgo.h>
+#include <algo/moeoPopAlgo.h>
 #include <algo/moeoCombinedLS.h>
 #include <algo/moeoEA.h>
 #include <algo/moeoEasyEA.h>