tests added

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

branches/newMo/src/explorer/moMetropolisHastingExplorer.h

@@ -39,6 +39,8 @@
 #include <comparator/moNeighborComparator.h>
 #include <comparator/moSolNeighborComparator.h>
 
+#include <utils/eoRNG.h>
+
 /**
  * Explorer for the Metropolis-Hasting Sampling
  * Only the symetric case is considered when Q(x,y) = Q(y,x)
@@ -61,7 +63,7 @@ public:
 	 * @param _solNeighborComparator a solution vs neighbor comparator
 	 * @param _nbStep maximum number of step to do
 	 */
- moMetropolisHastingExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator, unsigned int _nbStep) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), nbStep(_nbStep) {
+    moMetropolisHastingExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator, unsigned int _nbStep) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), nbStep(_nbStep) {
     	isAccept = false;
     	current=new Neighbor();
     }
@@ -78,8 +80,8 @@ public:
 	 * @param _solution the solution (unused here)
 	 */
     virtual void initParam(EOT & _solution){
-      step     = 0;
+    	step     = 0;
-      isAccept = true;
+    	isAccept = true;
     };
 
 	/**
@@ -87,7 +89,7 @@ public:
 	 * @param _solution the solution (unused here)
 	 */
     virtual void updateParam(EOT & _solution){
-      step++;
+    	step++;
     };
 
 	/**
@@ -138,19 +140,23 @@ public:
     };
 
     /**
-     * accept test if an amelirated neighbor was be found
+     * accept test if an ameliorated neighbor was be found
      * @param _solution the solution
      * @return true if the best neighbor ameliorate the fitness
      */
     virtual bool accept(EOT & _solution) {
+    	double alpha=0.0;
 		if(neighborhood.hasNeighbor(_solution)){
-		  if (solNeighborComparator(_solution, *current))
+			if (solNeighborComparator(_solution, *current))
-		    isAccept = true;
+				isAccept = true;
-		  else {
+			else{
-		    double alpha = (double) current->fitness() / (double) _solution.fitness();
+				if(_solution.fitness() != 0){
-		    
+					alpha = (double) current->fitness() / (double) _solution.fitness();
-		    isAccept = (rng.uniform() < alpha) ;
+					isAccept = (rng.uniform() < alpha) ;
-		  }
+				}
+				else
+					isAccept = false;
+			}
 		}
 		return isAccept;
     };

branches/newMo/src/explorer/moRandomNeutralWalkExplorer.h

@@ -60,13 +60,13 @@ public:
 	 * @param _solNeighborComparator a solution vs neighbor comparator
 	 * @param _nbStep maximum number of step to do
 	 */
- moRandomNeutralWalkExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, 
+    moRandomNeutralWalkExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval,
 			     moSolNeighborComparator<Neighbor>& _solNeighborComparator,
-			     unsigned _nbStep) 
+			     unsigned _nbStep):
-  : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), 
+			    	 moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval),
-    solNeighborComparator(_solNeighborComparator), 
+			    	 solNeighborComparator(_solNeighborComparator),
-    nbStep(_nbStep) {
+			    	 nbStep(_nbStep) {
-    	isAccept = false;
+		isAccept = false;
     	current=new Neighbor();
     }
 
@@ -81,15 +81,15 @@ public:
 	 * initialization of the number of step to be done
 	 */
     virtual void initParam(EOT & solution){
-      step     = 0;
+    	step     = 0;
-      isAccept = true;
+    	isAccept = true;
     };
 
 	/**
 	 * increase the number of step
 	 */
     virtual void updateParam(EOT & solution){
-      step++;
+    	step++;
     };
 
 	/**
@@ -102,27 +102,27 @@ public:
      * @param _solution
      */
     virtual void operator()(EOT & _solution){
-      //Test if _solution has a Neighbor
+    	//Test if _solution has a Neighbor
-      if(neighborhood.hasNeighbor(_solution)){
+    	if(neighborhood.hasNeighbor(_solution)){
-	//init the first neighbor
+    		//init the first neighbor
-	neighborhood.init(_solution, (*current));
+    		neighborhood.init(_solution, (*current));
 
-	//eval the _solution moved with the neighbor and stock the result in the neighbor
+    		//eval the _solution moved with the neighbor and stock the result in the neighbor
-	eval(_solution, (*current));
+    		eval(_solution, (*current));
 
-	//test all others neighbors
+    		//test all others neighbors
-	while (! solNeighborComparator.equals(_solution, *current) && neighborhood.cont(_solution)) {
+    		while (! solNeighborComparator.equals(_solution, *current) && neighborhood.cont(_solution)) {
-	  //next neighbor
+    			//next neighbor
-	  neighborhood.next(_solution, (*current));
+    			neighborhood.next(_solution, (*current));
-	  //eval
+    			//eval
-	  eval(_solution, (*current));
+    			eval(_solution, (*current));
-	}
+    		}
-      }
+    	}
-      else{
+    	else{
-	//if _solution hasn't neighbor,
+    		//if _solution hasn't neighbor,
-	isAccept=false;
+    		isAccept=false;
-      }
+    	}
-    };
+	};
 
     /**
      * continue if there is a neighbor and it is remainds some steps to do
@@ -130,7 +130,7 @@ public:
      * @return true there is some steps to do
      */
     virtual bool isContinue(EOT & _solution) {
-      return (step < nbStep)  && isAccept ;
+    	return (step < nbStep)  && isAccept ;
     };
 
     /**
@@ -145,15 +145,14 @@ public:
     };
 
     /**
-     * accept test if an amelirated neighbor was be found
+     * accept test if an ameliorated neighbor was be found
      * @param _solution the solution
      * @return true if the best neighbor ameliorate the fitness
      */
     virtual bool accept(EOT & _solution) {
-      if(neighborhood.hasNeighbor(_solution)){
+    	if(neighborhood.hasNeighbor(_solution))
-	isAccept = solNeighborComparator.equals(_solution, (*current)) ;
+    		isAccept = solNeighborComparator.equals(_solution, (*current)) ;
-      }
+    	return isAccept;
-      return isAccept;
     };
 
 private:

branches/newMo/src/explorer/moRandomWalkExplorer.h

@@ -40,7 +40,7 @@
 #include <comparator/moSolNeighborComparator.h>
 
 /**
- * Explorer for a first imporvement heuristic
+ * Explorer for a random walk explorer
  */
 template< class Neighborhood >
 class moRandomWalkExplorer : public moNeighborhoodExplorer<Neighborhood>
@@ -58,11 +58,11 @@ public:
 	 * @param _eval the evaluation function
 	 * @param _nbStep maximum number of step to do
 	 */
- moRandomWalkExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, unsigned _nbStep) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), nbStep(_nbStep) {
+    moRandomWalkExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, unsigned _nbStep) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), nbStep(_nbStep) {
     	isAccept = false;
     	current=new Neighbor();
-	// number of step done
+    	// number of step done
-	step = 0;
+    	step = 0;
     }
 
 	/**
@@ -98,7 +98,6 @@ public:
      */
     virtual void operator()(EOT & _solution){
 
-	//est qu'on peut initializer
     	//Test if _solution has a Neighbor
 		if(neighborhood.hasNeighbor(_solution)){
 			//init the first neighbor
@@ -141,9 +140,8 @@ public:
      * @return true if the best neighbor ameliorate the fitness
      */
     virtual bool accept(EOT & _solution) {
-		if(neighborhood.hasNeighbor(_solution)){
+		if(neighborhood.hasNeighbor(_solution))
 		  isAccept = true ;
-		}
 		return isAccept;
     };
 

branches/newMo/src/memory/moDiversification.h

@@ -2,6 +2,7 @@
 #define _moDiversification_h
 
 #include <memory/moMemory.h>
+#include <eoFunctor.h>
 
 /**
  * Abstract class for diversification strategy

branches/newMo/src/memory/moIntensification.h

@@ -2,6 +2,7 @@
 #define _moIntensification_h
 
 #include <memory/moMemory.h>
+#include <eoFunctor.h>
 
 /**
  * Abstract class for intensification strategy

branches/newMo/test/CMakeLists.txt

@@ -47,10 +47,12 @@ SET (TEST_LIST
 		t-moCounterMonitorSaver
 		t-moSolutionStat
 		t-moCheckpoint
+		t-moDummyMemory
 		t-moSimpleHCexplorer
 		t-moSimpleHCneutralExplorer
 		t-moHCneutralExplorer
 		t-moFirstImprExplorer
+		t-moRandomWalkExplorer
 		
 		)
 				

branches/newMo/test/t-moDummyMemory.cpp

@@ -0,0 +1,63 @@
+/*
+<t-moDummyMemory.cpp>
+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
+*/
+
+#include <memory/moDummyIntensification.h>
+#include <memory/moDummyDiversification.h>
+#include "moTestClass.h"
+
+#include <iostream>
+#include <cstdlib>
+#include <cassert>
+
+int main(){
+
+	std::cout << "[t-moDummyMemory] => START" << std::endl;
+
+	eoBit<eoMinimizingFitness> sol(4);
+	bitNeighbor n;
+	moDummyDiversification<bitNeighbor> test1;
+	test1.init(sol);
+	test1.add(sol, n);
+	test1.update(sol, n);
+	test1.clearMemory();
+	assert(!test1(sol));
+
+	moDummyIntensification<bitNeighbor> test2;
+	test2.init(sol);
+	test2.add(sol, n);
+	test2.update(sol, n);
+	test2.clearMemory();
+	assert(!test2(sol));
+
+
+	std::cout << "[t-moDummyMemory] => OK" << std::endl;
+
+	return EXIT_SUCCESS;
+}
+

branches/newMo/test/t-moRandomWalkExplorer.cpp

@@ -0,0 +1,77 @@
+/*
+<t-moRandomWalkExplorer.cpp>
+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
+*/
+
+#include <explorer/moRandomWalkExplorer.h>
+#include "moTestClass.h"
+
+#include <iostream>
+#include <cstdlib>
+#include <cassert>
+
+int main(){
+
+	std::cout << "[t-moRandomWalkExplorer] => START" << std::endl;
+
+	eoBit<eoMinimizingFitness> sol(4, true);
+	sol.fitness(4);
+	bitNeighborhood nh(4);
+	evalOneMax eval(4);
+
+	moRandomWalkExplorer<bitNeighborhood> test(nh, eval, 3);
+
+	test.initParam(sol);
+
+	test(sol);
+	assert(test.accept(sol));
+	test.move(sol);
+	assert(sol.fitness()==3);
+	test.updateParam(sol);
+	assert(test.isContinue(sol));
+
+
+	test(sol);
+	assert(test.accept(sol));
+	test.move(sol);
+	assert(sol.fitness()==4);
+	test.updateParam(sol);
+	assert(test.isContinue(sol));
+
+	test(sol);
+	assert(test.accept(sol));
+	test.move(sol);
+	assert(sol.fitness()==3);
+	assert(!sol[0]);
+	test.updateParam(sol);
+	assert(!test.isContinue(sol));
+
+	std::cout << "[t-moRandomWalkExplorer] => OK" << std::endl;
+
+	return EXIT_SUCCESS;
+}
+