test updated

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

trunk/paradiseo-mo/test/t-moFitContinuator.cpp

@@ -32,11 +32,27 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <cassert>
 
 #include <continuator/moFitContinuator.h>
+#include "moTestClass.h"
 
 int main(){
 
 	std::cout << "[t-moFitContinuator] => START" << std::endl;
 
+	moFitContinuator<bitNeighbor> test1(3);
+	moFitContinuator<moDummyNeighborTest> test2(5);
+
+	bitVector sol1;
+	Solution sol2;
+
+	sol1.fitness(4);
+	assert(test1(sol1));
+	sol1.fitness(3);
+	assert(!test1(sol1));
+
+	sol2.fitness(3);
+	assert(test2(sol2));
+	sol2.fitness(5);
+	assert(!test2(sol2));
 
 	std::cout << "[t-moFitContinuator] => OK" << std::endl;
 

trunk/paradiseo-mo/test/t-moFullEvalContinuator.cpp

@@ -32,11 +32,36 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <cassert>
 
 #include <continuator/moFullEvalContinuator.h>
+#include <eval/oneMaxEval.h>
+#include "moTestClass.h"
 
 int main(){
 
 	std::cout << "[t-moFullEvalContinuator] => START" << std::endl;
 
+	oneMaxEval<bitVector> fullEval;
+	eoEvalFuncCounter<bitVector> evalCount(fullEval);
+	moFullEvalContinuator<bitNeighbor> test(evalCount, 3);
+
+	bitVector sol;
+	sol.push_back(1);
+
+
+	test.init(sol);
+	evalCount(sol);
+	sol.invalidate();
+	assert(test.value()==1);
+	evalCount(sol);
+	sol.invalidate();
+	assert(test.value()==2);
+	assert(test(sol));
+	evalCount(sol);
+	sol.invalidate();
+	assert(test.value()==3);
+	assert(!test(sol));
+	test.init(sol);
+	assert(test.value()==0);
+	assert(test(sol));
 
 	std::cout << "[t-moFullEvalContinuator] => OK" << std::endl;
 

trunk/paradiseo-mo/test/t-moNeighborEvalContinuator.cpp

@@ -32,11 +32,35 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <cassert>
 
 #include <continuator/moNeighborEvalContinuator.h>
+#include "moTestClass.h"
 
 int main(){
 
 	std::cout << "[t-moNeighborEvalContinuator] => START" << std::endl;
 
+	evalOneMax moEval(2);
+	moEvalCounter<bitNeighbor> evalCount(moEval);
+	moNeighborEvalContinuator<bitNeighbor> test(evalCount, 3);
+
+	bitVector sol;
+	sol.push_back(true);
+	sol.push_back(false);
+
+	bitNeighbor n;
+	sol.fitness(1);
+
+	test.init(sol);
+	evalCount(sol,n);
+	assert(test.value()==1);
+	evalCount(sol,n);
+	assert(test.value()==2);
+	assert(test(sol));
+	evalCount(sol,n);
+	assert(test.value()==3);
+	assert(!test(sol));
+	test.init(sol);
+	assert(test.value()==0);
+	assert(test(sol));
 
 	std::cout << "[t-moNeighborEvalContinuator] => OK" << std::endl;
 

trunk/paradiseo-mo/test/t-moNeighborhoodStat.cpp

@@ -35,8 +35,11 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <continuator/moNeutralDegreeNeighborStat.h>
 #include <continuator/moSecondMomentNeighborStat.h>
 #include <continuator/moSizeNeighborStat.h>
+#include <continuator/moAverageFitnessNeighborStat.h>
+#include <continuator/moStdFitnessNeighborStat.h>
 #include <comparator/moNeighborComparator.h>
 #include <comparator/moSolNeighborComparator.h>
+
 #include "moTestClass.h"
 
 #include <iostream>
@@ -147,6 +150,22 @@ int main() {
     assert(test8.className()=="moSizeNeighborStat");
     std::cout << "[t-moSizeNeighborStat] => OK" << std::endl;
 
+    //test of moAverageFitnessNeighborStat.h
+    std::cout << "[t-moAverageFitnessNeighborStat] => START" << std::endl;
+    moAverageFitnessNeighborStat<bitNeighbor> test9(test);
+    test9(sol);
+    assert(test9.value()==6.6);
+    assert(test9.className()=="moAverageFitnessNeighborStat");
+    std::cout << "[t-moAverageFitnessNeighborStat] => OK" << std::endl;
+
+    //test of moStdFitnessNeighborStat.h
+    std::cout << "[t-moStdFitnessNeighborStat] => START" << std::endl;
+    moStdFitnessNeighborStat<bitNeighbor> test10(test);
+    test10(sol);
+    assert(test10.value()> 0.966 && test10.value() < 0.967);
+    assert(test10.className()=="moStdFitnessNeighborStat");
+    std::cout << "[t-moStdFitnessNeighborStat] => OK" << std::endl;
+
     return EXIT_SUCCESS;
 }