Test for PLS1 and PLS2 added

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

contribution/branches/MOLS/test/CMakeLists.txt

@@ -8,6 +8,8 @@ SET (TEST_LIST
 		t-moeoUnifiedDominanceBasedLS
 		t-moeoDMLSGenUpdater
 		t-moeoDMLSMonOp
+		t-moeoPLS1
+		t-moeoPLS2
 	)
 
 FOREACH (test ${TEST_LIST})

contribution/branches/MOLS/test/t-moeoPLS1.cpp

@@ -1,5 +1,5 @@
 /*
-* <t-moeoRecursiveFirstImprovingNeighborhoodExplorer.cpp>
+* <t-moeoPLS1.cpp>
 * Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
 * (C) OPAC Team, LIFL, 2002-2008
 *
@@ -35,74 +35,49 @@
 *
 */
 //-----------------------------------------------------------------------------
-// t-moeoFirstImprovingNeighborhoodExplorer.cpp
+// t-moeoPLS1.cpp
 //-----------------------------------------------------------------------------
 
 #include <eo>
-#include <mo>
 #include <moeo>
 #include <assert.h>
+#include <set>
 #include <iostream>
-#include <moeoRecursiveFirstImprovingNeighborhoodExplorer.h>
+#include <moeoExhaustiveUnvisitedSelect.h>
 #include <moeoTestClass.h>
+#include <moeoPLS1.h>
+#include <eoTenTimeContinue.h>
+#include <moeoExhaustiveNeighborhoodExplorer.h>
 //-----------------------------------------------------------------------------
 
-
-
 //-----------------------------------------------------------------------------
 
 int main()
 {
-    std::cout << "[moeoRecursiveFirstImprovingNeighborhoodExplorer] => ";
+    std::cout << "[moeoPLS1] => ";
+
+    testEval eval;
+    testMoveInit init;
+	testMoveNext next;
+	testMoveIncrEval2 incr;
+
+	moeoUnboundedArchive <Solution>  arch;
+	eoCtrlCContinue <Solution> cont;
+	moeoPLS1 <testMove> algo(cont, eval, arch, init, next, incr);
 
     // objective vectors
-    ObjectiveVector obj0;
-    obj0[0]=10;
-    obj0[1]=10;
-    eoPop < Solution > src;
-    eoPop < Solution > dest;
-    std::vector < unsigned int > select;
-    src.resize(1);
-    src[0].objectiveVector(obj0);
-    src[0].flag(0);
-    dest.resize(0);
-    select.resize(1);
-    select[0]=0;
+    eoPop < Solution > pop;
+    pop.resize(2);
+    pop[0].flag(0);
+    pop[1].flag(0);
 
-    testMoveInit init;
-    testMoveNext next;
-    testMoveIncrEval4 incr;
-    testMoveIncrEval3 incr2;
+	algo(pop);
 
-    moeoRecursiveFirstImprovingNeighborhoodExplorer < testMove > explorer(init, next, incr);
-
-    explorer(src, select, dest);
-
-    /*assert(dest.size()==3);
-    assert(src[0].flag()==0);
-    for(int i=0 ; i< 3 ; i++)
-    	assert(dest[i].flag()==0);
-    assert(dest[0].objectiveVector()[0]==11);
-    assert(dest[0].objectiveVector()[1]==9);
-    assert(dest[1].objectiveVector()[0]==9);
-    assert(dest[1].objectiveVector()[1]==11);
-    assert(dest[2].objectiveVector()[0]==9);
-    assert(dest[2].objectiveVector()[1]==9);*/
-
-    moeoRecursiveFirstImprovingNeighborhoodExplorer < testMove > explorer2(init, next, incr2);
-    dest.resize(0);
-    explorer2(src, select, dest);
-    /*assert(dest.size()==5);
-    assert(src[0].flag()==1);
-    for(int i=0 ; i< 5 ; i++){
-    	assert(dest[i].flag()==0);
-		assert(dest[i].objectiveVector()[0]==9);
-		assert(dest[i].objectiveVector()[1]==11);
-    }*/
+	assert(arch.size()==1);
+	assert(arch[0].flag()==1);
 
     std::cout << "OK" << std::endl;
     return EXIT_SUCCESS;
-
 }
 
 //-----------------------------------------------------------------------------

contribution/branches/MOLS/test/t-moeoPLS2.cpp

@@ -0,0 +1,83 @@
+/*
+* <t-moeoPLS2.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* 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
+*
+*/
+//-----------------------------------------------------------------------------
+// t-moeoPLS2.cpp
+//-----------------------------------------------------------------------------
+
+#include <eo>
+#include <moeo>
+#include <assert.h>
+#include <set>
+#include <iostream>
+#include <moeoExhaustiveUnvisitedSelect.h>
+#include <moeoTestClass.h>
+#include <moeoPLS2.h>
+#include <eoTenTimeContinue.h>
+#include <moeoExhaustiveNeighborhoodExplorer.h>
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+
+int main()
+{
+    std::cout << "[moeoPLS2] => ";
+
+    testEval eval;
+    testMoveInit init;
+	testMoveNext next;
+	testMoveIncrEval2 incr;
+
+	moeoUnboundedArchive <Solution>  arch;
+	eoCtrlCContinue <Solution> cont;
+	moeoPLS2 <testMove> algo(cont, eval, arch, init, next, incr);
+
+    // objective vectors
+    eoPop < Solution > pop;
+    pop.resize(2);
+    pop[0].flag(0);
+    pop[1].flag(0);
+
+	algo(pop);
+
+	assert(arch.size()==1);
+	assert(arch[0].flag()==1);
+
+    std::cout << "OK" << std::endl;
+    return EXIT_SUCCESS;
+}
+
+//-----------------------------------------------------------------------------