From c39c51efd7abe856682ba7a9b93eae7434e2c3f7 Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 27 Aug 2010 12:34:42 +0000
Subject: [PATCH] VNS modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1923 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../src/neighborhood/moBackwardVectorVNSelection.h     |  8 ++++----
 .../src/neighborhood/moForwardVectorVNSelection.h      |  8 ++++----
 .../src/neighborhood/moRndVectorVNSelection.h          | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h
index 52d52e925..a62085493 100644
--- a/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h
+++ b/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h
@@ -64,8 +64,8 @@ public:
      */
     virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
     	current=LSvector.size()-1;
-    	_ls=LSvector[current];
-    	_shake = shakeVector[current];
+    	_ls= *(LSvector[current]);
+    	_shake = *(shakeVector[current]);
     }
 
     /**
@@ -73,8 +73,8 @@ public:
      */
     virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
     	current= (current + LSvector.size() -1) % LSvector.size();
-    	_ls=LSvector[current];
-    	_shake = shakeVector[current];
+    	_ls= *(LSvector[current]);
+    	_shake = *(shakeVector[current]);
     }
 
 private:
diff --git a/trunk/paradiseo-mo/src/neighborhood/moForwardVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moForwardVectorVNSelection.h
index 5f9e4703a..ea897240f 100644
--- a/trunk/paradiseo-mo/src/neighborhood/moForwardVectorVNSelection.h
+++ b/trunk/paradiseo-mo/src/neighborhood/moForwardVectorVNSelection.h
@@ -64,8 +64,8 @@ public:
      */
     virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
     	current=0;
-    	_ls = LSvector[current];
-    	_shake = shakeVector[current];
+    	_ls = *(LSvector[current]);
+    	_shake = *(shakeVector[current]);
     }
 
     /**
@@ -73,8 +73,8 @@ public:
      */
     virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
     	current = (current+1) % LSvector.size();
-    	_ls = LSvector[current];
-    	_shake = shakeVector[current];
+    	_ls = *(LSvector[current]);
+    	_shake = *(shakeVector[current]);
     }
 
 private:
diff --git a/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h
index 247eaa725..e375a6efa 100644
--- a/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h
+++ b/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h
@@ -69,11 +69,11 @@ public:
     	if(order.size()==0){
     		for(unsigned int i=0; i<LSvector.size(); i++)
     			order.push_back(i);
-    		std::random_shuffle(order.begin(), order.end(),gen);
     	}
+		std::random_shuffle(order.begin(), order.end(),gen);
     	current=0;
-    	_ls=LSvector[order[current]];
-    	_shake=shakeVector[order[current]];
+    	_ls=*(LSvector[order[current]]);
+    	_shake=*(shakeVector[order[current]]);
     }
 
     /**
@@ -81,8 +81,8 @@ public:
      */
     virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
     	current= (current+1) % LSvector.size();
-    	_ls=LSvector[order[current]];
-    	_shake=shakeVector[order[current]];
+    	_ls=*(LSvector[order[current]]);
+    	_shake=*(shakeVector[order[current]]);
     }
 
 private: