Migration from SVN

mo/src/eval/moDoubleIncrEvaluation.h

@@ -0,0 +1,104 @@
+/*
+  <moDoubleIncrEvaluation.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 moDoubleIncrEvaluation_H
+#define moDoubleIncrEvaluation_H
+
+#include <eval/moNeighborhoodEvaluation.h>
+#include <continuator/moUpdater.h>
+
+/**
+ * Base class for the double incremental evaluation of the neighborhood
+ *
+ * The sizes of the neighborhoods are equal
+ */
+template<class Neighbor>
+class moDoubleIncrEvaluation : public moNeighborhoodEvaluation<Neighbor>, public moUpdater
+{
+public:
+  typedef typename Neighbor::EOT EOT;
+  typedef typename EOT::Fitness Fitness;
+
+  /**
+   * Constructor 
+   *
+   * @param _neighborhoodSize the size of the neighborhood
+   */
+  moDoubleIncrEvaluation(unsigned int _neighborhoodSize) : moNeighborhoodEvaluation<Neighbor>(), moUpdater(), neighborhoodSize(_neighborhoodSize), firstEval(true) { 
+    deltaFitness = new Fitness[neighborhoodSize];
+  }
+  
+  /**
+   * Destructor
+   */
+  ~moDoubleIncrEvaluation() {
+    if (deltaFitness != NULL)
+      delete [] deltaFitness;
+  }
+
+  /**
+   * Initialisation of the evaluation process
+   * The first evaluation will be a simple incremental evaluation
+   *
+   */
+  virtual void init() {
+    firstEval = true;
+  }
+
+  virtual void operator()() {
+  }
+
+  /**
+   *  Evaluation of the neighborhood
+   *  Here nothing to do 
+   *
+   * @param _solution the current solution 
+   */
+  virtual void operator()(EOT & _solution) {
+  }
+
+  /** the delta of fitness for each neighbors 
+   *  The fitness of the neighbor i is given by : fitness(solution) + deltaFitness[i]
+   */
+  Fitness * deltaFitness;
+
+protected:
+  /** the neighborhood size */
+  unsigned int neighborhoodSize;
+
+  /** flag : true when it is the first evaluation */
+  bool firstEval;
+};
+
+#endif

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 <eval/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

mo/src/eval/moDummyEval.h

@@ -0,0 +1,53 @@
+/*
+<moDummyEval.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  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 _moDummyEval_h
+#define _moDummyEval_h
+
+#include <eval/moEval.h>
+
+/**
+ * Dummy Evaluation function
+ */
+template<class Neighbor>
+class moDummyEval : public moEval<Neighbor> {
+public:
+    typedef typename Neighbor::EOT EOT;
+    typedef typename EOT::Fitness Fitness;
+
+    /**
+     * NOTHING TO DO
+     * @param _sol unused solution
+     * @param _n unused neighbor
+     */
+    void operator()(EOT& _sol, Neighbor& _n) {}
+
+};
+
+#endif

mo/src/eval/moEval.h

@@ -0,0 +1,51 @@
+/*
+  <moEval.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 moEval_H
+#define moEval_H
+
+#include <eoFunctor.h>
+
+/**
+ * Abstract class for the evaluation
+ */
+template<class Neighbor>
+class moEval : public eoBF<typename Neighbor::EOT &, Neighbor&, void>
+{
+public:
+    typedef typename Neighbor::EOT EOT;
+    typedef typename EOT::Fitness Fitness;
+};
+
+#endif

mo/src/eval/moEvalCounter.h

@@ -0,0 +1,66 @@
+/*
+<moEvalCounter.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 _moEvalCounter_h
+#define _moEvalCounter_h
+
+#include <eval/moEval.h>
+#include <utils/eoParam.h>
+
+/**
+    Counts the number of neighbor evaluations actually performed, thus checks first
+    if it has to evaluate.. etc.
+*/
+template<class Neighbor>
+class moEvalCounter : public moEval<Neighbor>, public eoValueParam<unsigned long>
+{
+public:
+    typedef typename Neighbor::EOT EOT;
+    typedef typename EOT::Fitness Fitness;
+
+    moEvalCounter(moEval<Neighbor>& _eval, std::string _name = "Neighbor Eval. ")
+            : eoValueParam<unsigned long>(0, _name), eval(_eval) {}
+
+    /**
+     * Increase the number of neighbor evaluations and perform the evaluation
+     *
+     * @param _solution a solution
+     * @param _neighbor a neighbor
+     */
+    void operator()(EOT& _solution, Neighbor& _neighbor) {
+        value()++;
+        eval(_solution, _neighbor);
+    }
+
+private:
+    moEval<Neighbor> & eval;
+
+};
+
+#endif

mo/src/eval/moFullEvalByCopy.h

@@ -0,0 +1,82 @@
+	/*
+  <moFullEvalByCopy.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 moFullEvalByCopy_H
+#define moFullEvalByCopy_H
+
+#include <eoEvalFunc.h>
+#include <eval/moEval.h>
+
+/**
+ * Evaluation by copy
+ */
+template<class Neighbor>
+class moFullEvalByCopy : public moEval<Neighbor>
+{
+public:
+    typedef typename moEval<Neighbor>::EOT EOT;
+    typedef typename moEval<Neighbor>::Fitness Fitness;
+
+    /**
+     * Ctor
+     * @param _eval the full evaluation object
+     */
+    moFullEvalByCopy(eoEvalFunc<EOT> & _eval) : eval(_eval) {}
+
+    /**
+     * Full evaluation of the neighbor by copy
+     * @param _sol current solution
+     * @param _neighbor the neighbor to be evaluated
+     */
+    void operator()(EOT & _sol, Neighbor & _neighbor)
+    {
+        // tmp solution
+        EOT tmp(_sol);
+        // move tmp solution wrt _neighbor
+        _neighbor.move(tmp);
+        // eval copy
+        tmp.invalidate();
+        eval(tmp);
+        // set the fitness value to the neighbor
+        _neighbor.fitness(tmp.fitness());
+    }
+
+
+private:
+    /** the full evaluation object */
+    eoEvalFunc<EOT> & eval;
+
+};
+
+#endif

mo/src/eval/moFullEvalByModif.h

@@ -0,0 +1,96 @@
+/*
+  <moFullEvalByModif.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 moFullEvalByModif_H
+#define moFullEvalByModif_H
+
+#include <eoEvalFunc.h>
+#include <eval/moEval.h>
+
+/**
+ * Full evaluation to use with a moBackableNeighbor
+ * !!!WARNING!!! Use only when your solution is composed by a fitness Value and a "genotype"
+ *
+ */
+template<class BackableNeighbor>
+class moFullEvalByModif : public moEval<BackableNeighbor>
+{
+public:
+    typedef typename moEval<BackableNeighbor>::EOT EOT;
+    typedef typename moEval<BackableNeighbor>::Fitness Fitness;
+
+    /**
+     * Ctor
+     * @param _eval the full evaluation object
+     */
+    moFullEvalByModif(eoEvalFunc<EOT>& _eval) : eval(_eval) {}
+
+    /**
+     * Full evaluation of the neighbor by copy
+     * @param _sol current solution
+     * @param _neighbor the neighbor to be evaluated
+     */
+    void operator()(EOT & _sol, BackableNeighbor & _neighbor)
+    {
+        // tmp fitness value of the current solution
+        Fitness tmpFit;
+
+        // save current fitness value
+        tmpFit = _sol.fitness();
+
+        // move the current solution wrt _neighbor
+        _neighbor.move(_sol);
+
+        // eval the modified solution
+        _sol.invalidate();
+        eval(_sol);
+
+        // set the fitness value to the neighbor
+        _neighbor.fitness(_sol.fitness());
+
+        // move the current solution back
+        _neighbor.moveBack(_sol);
+
+        // set the fitness back
+        _sol.fitness(tmpFit);
+    }
+
+
+private:
+    /** the full evaluation object */
+    eoEvalFunc<EOT> & eval;
+
+};
+
+#endif

mo/src/eval/moNeighborhoodEvaluation.h

@@ -0,0 +1,56 @@
+/*
+  <moNeighborhoodEvaluation.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 moNeighborhoodEvaluation_H
+#define moNeighborhoodEvaluation_H
+
+#include <eoFunctor.h>
+
+/**
+ * Abstract class for the evaluation 
+ * of all the neighborhood
+ * in one step
+ *
+ * It is usefull for example in a double incremental evaluation (QAP, UBQP problems)
+ * This class is used in combinaison with the class moEvaluatedNeighborhood
+ */
+template<class Neighbor>
+class moNeighborhoodEvaluation : public eoUF<typename Neighbor::EOT &, void>
+{
+public:
+    typedef typename Neighbor::EOT EOT;
+    typedef typename EOT::Fitness Fitness;
+};
+
+#endif