From 5e35350068979383f0df291ac92ca75f265b6919 Mon Sep 17 00:00:00 2001
From: verel <verel@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 9 Dec 2011 10:46:16 +0000
Subject: [PATCH] Add a sol-sol comparator with egality

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2556 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-mo/src/algo/moLocalSearch.h   |  4 ++
 .../src/comparator/moEqualSolComparator.h     | 68 +++++++++++++++++++
 .../neighborhood/moEvaluatedNeighborhood.h    |  7 ++
 3 files changed, 79 insertions(+)
 create mode 100644 trunk/paradiseo-mo/src/comparator/moEqualSolComparator.h

diff --git a/trunk/paradiseo-mo/src/algo/moLocalSearch.h b/trunk/paradiseo-mo/src/algo/moLocalSearch.h
index bf77a8f3f..6417af30f 100644
--- a/trunk/paradiseo-mo/src/algo/moLocalSearch.h
+++ b/trunk/paradiseo-mo/src/algo/moLocalSearch.h
@@ -78,6 +78,8 @@ public:
 		// initialization of the external continuator (for example the time, or the number of generations)
 		cont->init(_solution);
 
+		std::cout << _solution.fitness() << std::endl;
+
 		bool b;
 		do {
 			// explore the neighborhood of the solution
@@ -89,6 +91,8 @@ public:
 			} else
 				searchExplorer.moveApplied(false);
 
+			std::cout << _solution.fitness() << std::endl;
+		
 			// update the parameter of the search (for ex. Temperature of the SA)
 			searchExplorer.updateParam(_solution);
 
diff --git a/trunk/paradiseo-mo/src/comparator/moEqualSolComparator.h b/trunk/paradiseo-mo/src/comparator/moEqualSolComparator.h
new file mode 100644
index 000000000..0764d4e21
--- /dev/null
+++ b/trunk/paradiseo-mo/src/comparator/moEqualSolComparator.h
@@ -0,0 +1,68 @@
+/*
+  <moEqualSolComparator.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+  Sébastien Verel, Arnaud Liefooghe, Jérémie 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 _moEqualSolComparator_h
+#define _moEqualSolComparator_h
+
+#include <comparator/moSolComparator.h>
+
+/**
+ * Comparator of two solutions : a neighbor is better if the fitness is higher or equal
+ */
+template< class EOT >
+class moEqualSolComparator : public moSolComparator<EOT>
+{
+public:
+
+    /**
+     * Compare two solutions
+     * @param _sol1 the first solution
+     * @param _sol2 the second solution
+     * @return true if the solution2 is better than solution1
+     */
+    virtual bool operator()(const EOT& _sol1, const EOT& _sol2) {
+        return (_sol1.fitness() <= _sol2.fitness());
+    }
+
+      /**
+     * Return the class Name
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+        return "moEqualSolComparator";
+    }
+};
+
+
+#endif
diff --git a/trunk/paradiseo-mo/src/neighborhood/moEvaluatedNeighborhood.h b/trunk/paradiseo-mo/src/neighborhood/moEvaluatedNeighborhood.h
index 705e554f5..c71663d8d 100644
--- a/trunk/paradiseo-mo/src/neighborhood/moEvaluatedNeighborhood.h
+++ b/trunk/paradiseo-mo/src/neighborhood/moEvaluatedNeighborhood.h
@@ -63,6 +63,13 @@ public:
     moNeighborhood<Neighbor>(), originalNeighborhood(_originalNeighborhood), nhEval(_nhEval) {
   }
   
+  /**
+   * @return true if the neighborhood is random (default false)
+   */
+  virtual bool isRandom() {
+    return originalNeighborhood.isRandom();
+  }
+
   /**
    * Test if a neighbor exists
    * @param _solution the solution to explore