From 822c68a5132db075fa5283e40d278a9fa7c55b60 Mon Sep 17 00:00:00 2001
From: verel <verel@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 6 Dec 2011 21:34:08 +0000
Subject: [PATCH] Add the double incremental evaluation of a neighbor

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2553 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../src/eval/moDoubleIncrNeighborhoodEval.h   | 76 +++++++++++++++++++
 trunk/paradiseo-mo/src/eval/moEval.h          |  2 +-
 .../src/eval/moUBQPdoubleIncrEvaluation.h     |  3 +-
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 trunk/paradiseo-mo/src/eval/moDoubleIncrNeighborhoodEval.h

diff --git a/trunk/paradiseo-mo/src/eval/moDoubleIncrNeighborhoodEval.h b/trunk/paradiseo-mo/src/eval/moDoubleIncrNeighborhoodEval.h
new file mode 100644
index 000000000..96c3d6497
--- /dev/null
+++ b/trunk/paradiseo-mo/src/eval/moDoubleIncrNeighborhoodEval.h
@@ -0,0 +1,76 @@
+/*
+  <moDoubleIncrNeighborhoodEval.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+  Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
+
+  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 moDoubleIncrNeighborhoodEval_H
+#define moDoubleIncrNeighborhoodEval_H
+
+#include <eval/moEval.h>
+#include <evla/moDoubleIncrEvaluation.h>
+
+/**
+ * Evaluation of a neighbor from the full evaluation f the neighborhood
+ * 
+ *
+ */
+template<class Neighbor>
+class moDoubleIncrNeighborhoodEval : public moEval<Neighbor>
+{
+public:
+  typedef typename moEval<Neighbor>::EOT EOT;
+
+  /**
+   * Ctor
+   * @param _evaluation the double incremental evaluation  of the neighborhood
+   */
+  moDoubleIncrNeighborhoodEval(moDoubleIncrEvaluation<Neighbor>& _evaluation) : evaluation(_evaluation) {}
+
+  /**
+   * evaluation of a neighbor with the double incremental evaluation
+   *
+   * @param _sol current solution
+   * @param _neighbor the neighbor to be evaluated
+   */
+  void operator()(EOT & _sol, Neighbor & _neighbor)
+  {
+    _neighbor.fitness(_sol.fitness() + evaluation.deltaFitness[_neighbor.index()]);
+  }
+
+
+private:
+  /** the evaluation of the neighborhood */
+  moDoubleIncrEvaluation<Neighbor> & evaluation;
+
+};
+
+#endif
diff --git a/trunk/paradiseo-mo/src/eval/moEval.h b/trunk/paradiseo-mo/src/eval/moEval.h
index b1dac83a9..835a8ae8e 100644
--- a/trunk/paradiseo-mo/src/eval/moEval.h
+++ b/trunk/paradiseo-mo/src/eval/moEval.h
@@ -2,7 +2,7 @@
   <moEval.h>
   Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
 
-  Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
+  Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
 
   This software is governed by the CeCILL license under French law and
   abiding by the rules of distribution of free software.  You can  use,
diff --git a/trunk/paradiseo-mo/src/eval/moUBQPdoubleIncrEvaluation.h b/trunk/paradiseo-mo/src/eval/moUBQPdoubleIncrEvaluation.h
index f4a028e54..edad0f037 100644
--- a/trunk/paradiseo-mo/src/eval/moUBQPdoubleIncrEvaluation.h
+++ b/trunk/paradiseo-mo/src/eval/moUBQPdoubleIncrEvaluation.h
@@ -43,9 +43,10 @@
  * The neighborhood evaluation for the UBQP
  * The double incremental evaluation is used
  * 
+ * BECAREFULL: This object must be added to the moCheckpoint of the local search (init method)
  */
 template<class Neighbor>
-class moUBQPdoubleIncrEvaluation : public moNeighborhoodEvaluation<Neighbor>, moUpdater
+class moUBQPdoubleIncrEvaluation : public moNeighborhoodEvaluation<Neighbor>
 {
 public:
   using moDoubleIncrEvaluation::deltaFitness;