ForwardVNselect compile et semble marcher, mais pas moBackwardVNSelection...

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

trunk/paradiseo-mo/src/explorer/moVNSexplorer.h

@@ -104,7 +104,8 @@ public:
     shake(current);
     std::cout << "current apres shake: "<< current << std::endl;
     ls(current);
-    std::cout << "current apres ls: "<< ls.className() << " " << current << std::endl;
+    std::cout << "current apres ls: "<< ls.className() ;
+    std::cout << " sol: " << current << std::endl;
   }
 
   /**

trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h

@@ -1,30 +1,30 @@
 /*
-<moBackwardVectorVNSelection.h>
-Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+  <moBackwardVectorVNSelection.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  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".
+  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.
+  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
+  ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+  Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
 #ifndef _moBackwardVectorVNSelection_h
@@ -35,52 +35,53 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 template< class EOT >
 class moBackwardVectorVNSelection: public moVectorVNSelection<EOT>{
 
-	using moVectorVNSelection<EOT>::LSvector;
-	using moVectorVNSelection<EOT>::shakeVector;
-	using moVectorVNSelection<EOT>::current;
-
+  using moVectorVNSelection<EOT>::LSvector;
+  using moVectorVNSelection<EOT>::shakeVector;
+  using moVectorVNSelection<EOT>::current;
+  
 public:
+  
+  moBackwardVectorVNSelection(eoMonOp<EOT>& _firstLS, eoMonOp<EOT>& _firstShake, bool _cycle):moVectorVNSelection<EOT>(_firstLS, _firstShake), cycle(_cycle){}
+  
+  /**
+   * Return the class id.
+   * @return the class name as a std::string
+   */
+  virtual std::string className() const {
+    return "moBackwardVectorVNSelection";
+  }
 
-	moBackwardVectorVNSelection(eoMonOp<EOT>& _firstLS, eoMonOp<EOT>& _firstShake, bool _cycle):moVectorVNSelection<EOT>(_firstLS, _firstShake), cycle(_cycle){}
+  /**
+   * test if there is still some neighborhood to explore
+   * @return true if there is some neighborhood to explore
+   */
+  virtual bool cont(EOT& _solution){
+    return (cycle || (current > 0));
+  }
 
-    /**
-     * Return the class id.
-     * @return the class name as a std::string
-     */
-    virtual std::string className() const {
-        return "moBackwardVectorVNSelection";
-    }
+  /**
+   * put the current neighborhood on the first one
+   */
+  virtual void init(EOT& _solution){
+    current = LSvector.size() - 1;
+    std::cout << "current LS: " << current << std::endl;
+    std::cout << _solution << std::endl;
 
-    /**
-     * test if there is still some neighborhood to explore
-     * @return true if there is some neighborhood to explore
-     */
-    virtual bool cont(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
-    	return (cycle || (current >0 ));
-    }
+  }
 
-    /**
-     * put the current neighborhood on the first one
-     */
-    virtual void init(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
-    	current=LSvector.size()-1;
-    	_ls= *(LSvector[current]);
-    	_shake = *(shakeVector[current]);
-    }
+  /**
+   * put the current neighborhood on the next one
+   */
+  virtual void next(EOT& _solution){
+    current = (current + LSvector.size() -1) % LSvector.size();
+    std::cout << "current LS: " << current << std::endl;
+    std::cout << _solution << std::endl;
 
-    /**
-     * put the current neighborhood on the next one
-     */
-    virtual void next(EOT& _solution, eoMonOp<EOT>& _shake, eoMonOp<EOT>& _ls){
-    	current= (current + LSvector.size() -1) % LSvector.size();
-    	_ls= *(LSvector[current]);
-    	_shake = *(shakeVector[current]);
-    }
+  }
 
 private:
-
-	bool cycle;
-
+  bool cycle;
+  
 };
 
 #endif

trunk/paradiseo-mo/src/neighborhood/moVariableNeighborhoodSelection.h

@@ -67,14 +67,14 @@ public:
    *
    * @return current shake operator
    */
-  virtual const eoMon<EOT> & getShake() = 0;
+  virtual eoMonOp<EOT> & getShake() = 0;
 
   /**
    * Get the current local search based on the current neighborhood
    *
    * @return current local search 
    */
-  virtual const eoMon<EOT> & getLocalSearch() = 0;
+  virtual eoMonOp<EOT> & getLocalSearch() = 0;
 
 };
 

trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h

@@ -62,7 +62,7 @@ public:
    *
    * @return current shake operator
    */
-  virtual const eoMon<EOT> & getShake() {
+  virtual eoMonOp<EOT> & getShake() {
     return *(shakeVector[current]);
   }
 
@@ -71,7 +71,9 @@ public:
    *
    * @return current local search 
    */
-  virtual const eoMon<EOT> & getLocalSearch() {
+  virtual eoMonOp<EOT> & getLocalSearch() {
+    std::cout << "getLS : " << current << " sur " << LSvector.size() << std::endl;
+    std::cout << "getLS : ls = " << LSvector[current]->className() << std::endl;
     return *(LSvector[current]);
   }