Ajout d'un HC tenant compte du cas d'égalité dans les best, et pouvant explorer les plateaux

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1672 331e1502-861f-0410-8da2-ba01fb791d7f

branches/newMo/src/explorer/moHCneutralExplorer.h

@@ -0,0 +1,133 @@
+/*
+  <moHCneutralExplorer.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 _moHCneutralExplorer_h
+#define _moHCneutralExplorer_h
+
+#include <explorer/moSimpleHCneutralExplorer.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
+
+/**
+ * Explorer for a simple Hill-climbing
+ */
+template< class Neighborhood >
+class moHCneutralExplorer : public moSimpleHCneutralExplorer<Neighborhood>
+{
+public:
+    typedef typename Neighborhood::EOT EOT ;
+    typedef typename Neighborhood::Neighbor Neighbor ;
+
+    using moNeighborhoodExplorer<Neighborhood>::neighborhood;
+    using moSimpleHCneutralExplorer<Neighborhood>::solNeighborComparator;
+    using moSimpleHCneutralExplorer<Neighborhood>::isAccept;
+    using moSimpleHCneutralExplorer<Neighborhood>::bestVector;
+    using moSimpleHCneutralExplorer<Neighborhood>::initParam;
+    using moSimpleHCneutralExplorer<Neighborhood>::updateParam;
+
+	/**
+	 * Constructor
+	 * @param _neighborhood the neighborhood
+	 * @param _eval the evaluation function
+	 * @param _comparator a neighbor comparator
+	 */
+ moHCneutralExplorer(Neighborhood& _neighborhood, 
+			   moEval<Neighbor>& _eval, 
+			   moNeighborComparator<Neighbor>& _neighborComparator, 
+		     moSolNeighborComparator<Neighbor>& _solNeighborComparator,
+		     unsigned _nbStep) : 
+    moSimpleHCneutralExplorer<Neighborhood>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator), nbStep(_nbStep) {
+    }
+
+	/**
+	 * Destructor
+	 */
+    ~moHCneutralExplorer(){
+    }
+
+	/**
+	 *  initial number of step
+	 */
+    virtual void initParam(EOT & solution){
+      moSimpleHCneutralExplorer<Neighborhood>::initParam(solution);
+
+      step = 0;
+    };
+
+	/**
+	 * one more step
+	 */
+    virtual void updateParam(EOT & solution){
+      moSimpleHCneutralExplorer<Neighborhood>::updateParam(solution);
+      
+      step++;
+    };
+
+    /**
+     * continue if there is a neighbor and it is remainds some steps to do
+     * @param _solution the solution
+     * @return true there is some steps to do
+     */
+    virtual bool isContinue(EOT & _solution) {
+      return (step < nbStep)  && isAccept ;
+    };
+
+    /**
+     * accept test if an amelirated neighbor was be found
+     * @param _solution the solution
+     * @return true if the best neighbor ameliorate the fitness or is equals
+     */
+    virtual bool accept(EOT & _solution) {
+      if(neighborhood.hasNeighbor(_solution)){
+	isAccept = solNeighborComparator(_solution, bestVector[0]) || solNeighborComparator.equals(_solution, bestVector[0]) ;
+	std::cout << bestVector.size() << " " << bestVector[0] << " " ;
+	if (isAccept)
+	  std::cout << "true" << std::endl;
+	else
+	  std::cout << "false" << std::endl;
+      }
+      return isAccept;
+    };
+
+private:
+    // current number of step
+    unsigned int step;
+
+    // maximum number of steps to do
+    unsigned int nbStep;
+
+};
+
+
+#endif

branches/newMo/src/explorer/moSimpleHCneutralExplorer.h

@@ -172,7 +172,7 @@ public:
       return isAccept;
     };
 
-private:
+protected:
     // comparator betwenn solution and neighbor or between neighbors
     moNeighborComparator<Neighbor>& neighborComparator;
     moSolNeighborComparator<Neighbor>& solNeighborComparator;