tsp has been updated, include lines have been simplified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@771 331e1502-861f-0410-8da2-ba01fb791d7f

contribution/trunk/combinatorial/routing/tsp/src/tsp

@@ -0,0 +1,41 @@
+/* 
+* <tsp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, LIFL, 2002-2007
+*
+* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+*
+* 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 __tsp
+#define __tsp
+
+#include "tsp.h"
+
+#endif

contribution/trunk/combinatorial/routing/tsp/src/tsp.h

@@ -0,0 +1,52 @@
+/* 
+* <tsp.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, LIFL, 2002-2007
+*
+* Sébastien Cahon, Jean-Charles Boisson (Jean-Charles.Boisson@lifl.fr)
+*
+* 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 __tsp_h
+#define __tsp_h
+
+#include "city_swap.h"
+#include "edge_xover.h"
+#include "graph.h"
+#include "mix.h"
+#include "order_xover.h"
+#include "partial_mapped_xover.h"
+#include "part_route_eval.h"
+#include "route_eval.h"
+#include "route.h"
+#include "route_init.h"
+#include "route_valid.h"
+
+#endif

contribution/trunk/combinatorial/routing/tsp/tsp.cpp

@@ -34,19 +34,8 @@
 *
 */
 
-#include <eoEasyEA.h>
-#include <eoGenContinue.h>
-#include <eoStochTournamentSelect.h>
-#include <eoSGATransform.h>
-#include <eoSelectNumber.h>
-
-#include "graph.h"
-#include "route.h"
-#include "route_init.h"
-#include "route_eval.h"
-#include "order_xover.h"
-#include "partial_mapped_xover.h"
-#include "city_swap.h"
+#include <eo>
+#include <tsp>
 
 int main (int __argc, char * __argv []) {