From ab30bca09756420b73a1368942a215886bf9a756 Mon Sep 17 00:00:00 2001
From: boufaras <boufaras@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 24 Jan 2012 01:38:16 +0000
Subject: [PATCH] Test & Update for new version

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2684 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../testKswapNeighborhood.cu                  | 49 ++++++++++++++-----
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/KswapNeighborhood/testKswapNeighborhood.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/KswapNeighborhood/testKswapNeighborhood.cu
index b41209147..dbbb4fc80 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/KswapNeighborhood/testKswapNeighborhood.cu
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/KswapNeighborhood/testKswapNeighborhood.cu
@@ -1,10 +1,37 @@
-//-----------------------------------------------------------------------------
-/** testKswapNeighborhood.cpp
- *
- * KB - 20/10/10
- *
- */
-//-----------------------------------------------------------------------------
+/*
+  <testKswapNeighborhood.cu>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
+
+  Karima Boufaras, Thé Van LUONG
+
+  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
+*/
+
 
 // standard includes
 #define HAVE_SSTREAM
@@ -37,8 +64,8 @@ using namespace std;
 #include <problems/permutation/moSwapNeighbor.h>
 #include <problems/permutation/moSwapNeighborhood.h>
 
-#include <neighborhood/moXSwapNeighbor.h>
-#include <neighborhood/moXChangeNeighborhood.h>
+#include <neighborhood/moGPUXSwapN.h>
+#include <neighborhood/moGPUXChange.h>
 #include <neighborhood/moGPUNeighborhoodSizeUtils.h>
 
 #include <neighborhood/moRndWithReplNeighborhood.h>
@@ -52,8 +79,8 @@ typedef eoInt<unsigned int> Queen; //Permutation (Queen's problem representation
 typedef moSwapNeighbor<Queen> swapNeighbor; //swap Neighbor
 typedef moSwapNeighborhood<Queen> swapNeighborhood; //classical swap Neighborhood
 
-typedef moXSwapNeighbor<Queen> xSwapNeighbor; //X-Swap Neighbor
-typedef moXChangeNeighborhood<xSwapNeighbor> xSwapNeighborhood; // x-Swap Neighborhood
+typedef moGPUXSwapN<Queen> xSwapNeighbor; //X-Swap Neighbor
+typedef moGPUXChange<xSwapNeighbor> xSwapNeighborhood; // x-Swap Neighborhood
 
 void main_function(int argc, char **argv) {