From 5f7696a3428b81c5d68e26c7fe6e0e8cfc7a6141 Mon Sep 17 00:00:00 2001 From: jhumeau Date: Tue, 22 Jun 2010 09:58:43 +0000 Subject: [PATCH] =?UTF-8?q?test=20modifi=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1862 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-moeo/src/algo/moeoPLS1.h | 1 + .../test/t-moeoDMLSGenUpdater.cpp | 17 +++++++++-------- .../test/t-moeoEpsilonHyperboxArchive.cpp | 5 ++++- trunk/paradiseo-moeo/test/t-moeoPLS1.cpp | 17 +++++++++-------- trunk/paradiseo-moeo/test/t-moeoPLS2.cpp | 17 +++++++++-------- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/trunk/paradiseo-moeo/src/algo/moeoPLS1.h b/trunk/paradiseo-moeo/src/algo/moeoPLS1.h index 98ae98a49..04558ecf0 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoPLS1.h +++ b/trunk/paradiseo-moeo/src/algo/moeoPLS1.h @@ -80,6 +80,7 @@ public: *(new moeoExhaustiveNeighborhoodExplorer(_neighborhood, _incrEval)), *(new moeoNumberUnvisitedSelect(1)) ){} + }; diff --git a/trunk/paradiseo-moeo/test/t-moeoDMLSGenUpdater.cpp b/trunk/paradiseo-moeo/test/t-moeoDMLSGenUpdater.cpp index 53d980318..7bc53ed09 100644 --- a/trunk/paradiseo-moeo/test/t-moeoDMLSGenUpdater.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoDMLSGenUpdater.cpp @@ -60,14 +60,15 @@ int main(){ eoGenContinue genCont(2); //Create a solution - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); + s.resize(8); + s[0]=true; + s[1]=true; + s[2]=true; + s[3]=true; + s[4]=true; + s[5]=true; + s[6]=true; + s[7]=true; //Set its objective Vector o[0]=8; diff --git a/trunk/paradiseo-moeo/test/t-moeoEpsilonHyperboxArchive.cpp b/trunk/paradiseo-moeo/test/t-moeoEpsilonHyperboxArchive.cpp index 0b90fbfa3..071f278a4 100644 --- a/trunk/paradiseo-moeo/test/t-moeoEpsilonHyperboxArchive.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoEpsilonHyperboxArchive.cpp @@ -4,6 +4,7 @@ * (C) OPAC Team, LIFL, 2002-2007 * * 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, @@ -67,6 +68,8 @@ typedef MOEO < ObjectiveVector, double, double > Solution; int main() { + //!!!!!!!!!!!!VRAI TEST A FAIRE!!!!!!!!!!!!!! + std::cout << "[moeoEpsilonHyperboxArchive]\t=>\t"; std::cout << std::endl; @@ -83,7 +86,7 @@ int main() unsigned int o3=50; unsigned int o4=50; - double tmp; + for(int i=0; i< pop.size()/2; i++){ // tmp=rng.uniform()*100; diff --git a/trunk/paradiseo-moeo/test/t-moeoPLS1.cpp b/trunk/paradiseo-moeo/test/t-moeoPLS1.cpp index 9f525a4f9..4d6b1adb2 100644 --- a/trunk/paradiseo-moeo/test/t-moeoPLS1.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoPLS1.cpp @@ -55,14 +55,15 @@ int main(){ eoPop src; //Create a solution - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); + s.resize(8); + s[0]=true; + s[1]=true; + s[2]=true; + s[3]=true; + s[4]=true; + s[5]=true; + s[6]=true; + s[7]=true; //Set its objective Vector o[0]=8; diff --git a/trunk/paradiseo-moeo/test/t-moeoPLS2.cpp b/trunk/paradiseo-moeo/test/t-moeoPLS2.cpp index 3f4cc076e..1f343ae8f 100644 --- a/trunk/paradiseo-moeo/test/t-moeoPLS2.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoPLS2.cpp @@ -55,14 +55,15 @@ int main(){ eoPop src; //Create a solution - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); - s.push_back(true); + s.resize(8); + s[0]=true; + s[1]=true; + s[2]=true; + s[3]=true; + s[4]=true; + s[5]=true; + s[6]=true; + s[7]=true; //Set its objective Vector o[0]=8;