From 5f108b9b744a7f10c0056bded3037283ddc8c497 Mon Sep 17 00:00:00 2001
From: verel <verel@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 6 Dec 2011 13:52:23 +0000
Subject: [PATCH] Add the notion of currentNeighbor in the moVNSExplorer

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2546 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-mo/src/explorer/moVNSexplorer.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h b/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h
index 41c0f99f8..5eeaddf6b 100644
--- a/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h
+++ b/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h
@@ -83,7 +83,7 @@ public:
     if ((*this).moveApplied()) {
       selection.init(_solution);
     } else 
-      if (selection.cont(current)) {
+      if (selection.cont(currentSol)) {
 	selection.next(_solution);
       } else
 	stop = true;
@@ -102,9 +102,9 @@ public:
     eoMonOp<EOT> & shake = selection.getShake();
     eoMonOp<EOT> & ls    = selection.getLocalSearch();
 
-    current = _solution;
-    shake(current);
-    ls(current);
+    currentSol = _solution;
+    shake(currentSol);
+    ls(currentSol);
   }
 
   /**
@@ -121,7 +121,7 @@ public:
    * @param _solution the solution to move
    */
   virtual void move(EOT & _solution) {
-    _solution = current;
+    _solution = currentSol;
   };
 
   /**
@@ -130,7 +130,7 @@ public:
    * @return true if the neighbor ameliorate the fitness
    */
   virtual bool accept(EOT & _solution) {
-    return acceptCrit(_solution, current);
+    return acceptCrit(_solution, currentSol);
   };
 
   /**
@@ -145,7 +145,7 @@ private:
   moVariableNeighborhoodSelection<EOT>& selection;
   moAcceptanceCriterion<Neighbor>& acceptCrit;
   bool stop;
-  EOT current;
+  EOT currentSol;
 };