From 88d17c9aff38c0453322ed31b29228afd9a0f72c Mon Sep 17 00:00:00 2001 From: jboisson Date: Thu, 8 Nov 2007 10:14:27 +0000 Subject: [PATCH] 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 --- .../trunk/combinatorial/routing/tsp/src/tsp | 41 +++++++++++++++ .../trunk/combinatorial/routing/tsp/src/tsp.h | 52 +++++++++++++++++++ .../trunk/combinatorial/routing/tsp/tsp.cpp | 15 +----- 3 files changed, 95 insertions(+), 13 deletions(-) create mode 100644 contribution/trunk/combinatorial/routing/tsp/src/tsp create mode 100644 contribution/trunk/combinatorial/routing/tsp/src/tsp.h diff --git a/contribution/trunk/combinatorial/routing/tsp/src/tsp b/contribution/trunk/combinatorial/routing/tsp/src/tsp new file mode 100644 index 000000000..adf8189ca --- /dev/null +++ b/contribution/trunk/combinatorial/routing/tsp/src/tsp @@ -0,0 +1,41 @@ +/* +* +* 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 diff --git a/contribution/trunk/combinatorial/routing/tsp/src/tsp.h b/contribution/trunk/combinatorial/routing/tsp/src/tsp.h new file mode 100644 index 000000000..e49c80ada --- /dev/null +++ b/contribution/trunk/combinatorial/routing/tsp/src/tsp.h @@ -0,0 +1,52 @@ +/* +* +* 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 diff --git a/contribution/trunk/combinatorial/routing/tsp/tsp.cpp b/contribution/trunk/combinatorial/routing/tsp/tsp.cpp index be17fbb14..bf6404123 100644 --- a/contribution/trunk/combinatorial/routing/tsp/tsp.cpp +++ b/contribution/trunk/combinatorial/routing/tsp/tsp.cpp @@ -34,19 +34,8 @@ * */ -#include -#include -#include -#include -#include - -#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 +#include int main (int __argc, char * __argv []) {