From 949fa3319d7264138e15c6317680da4308b2a0e9 Mon Sep 17 00:00:00 2001
From: verel <verel@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 29 Apr 2010 15:35:46 +0000
Subject: [PATCH] Ajout de incremental evaluation for the royal road problem

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1767 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../src/problems/eval/moRoyalRoadIncrEval.h   | 80 +++++++++++++++++++
 trunk/problems/eval/royalRoadEval.h           |  4 +-
 2 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 trunk/paradiseo-mo/src/problems/eval/moRoyalRoadIncrEval.h

diff --git a/trunk/paradiseo-mo/src/problems/eval/moRoyalRoadIncrEval.h b/trunk/paradiseo-mo/src/problems/eval/moRoyalRoadIncrEval.h
new file mode 100644
index 000000000..ca85e69de
--- /dev/null
+++ b/trunk/paradiseo-mo/src/problems/eval/moRoyalRoadIncrEval.h
@@ -0,0 +1,80 @@
+/*
+<moRoyalRoadIncrEval.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  ue,
+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".
+
+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 _moRoyalRoadIncrEval_H
+#define _moRoyalRoadIncrEval_H
+
+#include <eval/moEval.h>
+
+/**
+ * Incremental evaluation Function for the Royal Road problem
+ */
+template< class Neighbor >
+class moRoyalRoadIncrEval : public moEval<Neighbor>
+{
+public:
+  typedef typename Neighbor::EOT EOT;
+
+  /**
+   * Default constructor
+   * @param _k size of a block
+   */
+  moRoyalRoadIncrEval(unsigned int _k) : k(_k) {}
+
+  /*
+   * incremental evaluation of the neighbor for the Royal Road problem
+   * @param _solution the solution to move (bit string)
+   * @param _neighbor the neighbor to consider (of type moBitNeigbor)
+   */
+  virtual void operator()(EOT & _solution, Neighbor & _neighbor) {
+    // which block can change?
+    unsigned int n = _neighbor.index() / k;
+    
+    // complete block?
+    offset = n * k;
+    
+    j = 0;
+    while (_solution[offset + j] && j < k) j++;
+    
+    if (j == k) // the block is complete, so the fitness decreases from one
+      _neighbor.fitness(_solution.fitness() - 1);
+    else {
+      if ((_solution[_neighbor.index()] == 0) && (offset + j == _neighbor.index())) { // can the block be filled?
+	j++;
+	while (_solution[offset + j] && j < k) j++;
+
+	if (j == k) // the block can be filled, so the fitness increases from one
+	  _neighbor.fitness(_solution.fitness() + 1);
+      }
+    }
+  }
+};
+
+#endif
+
diff --git a/trunk/problems/eval/royalRoadEval.h b/trunk/problems/eval/royalRoadEval.h
index decaabcab..5081868b9 100644
--- a/trunk/problems/eval/royalRoadEval.h
+++ b/trunk/problems/eval/royalRoadEval.h
@@ -40,7 +40,7 @@ class RoyalRoadEval : public eoEvalFunc<EOT>
 {
 public:
   /**
-   * Dfault constructor
+   * Default constructor
    * @param _k size of a block
    */
   RoyalRoad(unsigned int _k) : k(_k) {}
@@ -58,7 +58,7 @@ public:
     unsigned int n = _solution.size() / k;
 
     for (i = 0; i < n; i++) {
-      offset = i * n;
+      offset = i * k;
 
       j = 0;
       while (_solution[offset + j] && j < k) j++;