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

contribution/branches/MOLS/src2/moeoExhaustiveUnvisitedSelect.h

@@ -41,14 +41,14 @@
 
 #include <eo>
 #include <moeo>
+#include <moeoUnvisitedSelect.h>
 
 /**
  * TODO
  */
-template < class Move >
+template < class MOEOT >
-class moeoExhaustiveUnvisitedSelect : public moeoUnvisitedSelect < Move >
+class moeoExhaustiveUnvisitedSelect : public moeoUnvisitedSelect < MOEOT >
 {
-    typedef typename Move::EOType MOEOT;
 
 public:
 

contribution/branches/MOLS/src2/moeoNumberUnvisitedSelect.h

@@ -45,10 +45,9 @@
 /**
  * TODO
  */
-template < class Move >
+template < class MOEOT >
-class moeoNumberUnvisitedSelect : public moeoUnvisitedSelect < Move >
+class moeoNumberUnvisitedSelect : public moeoUnvisitedSelect < MOEOT >
 {
-    typedef typename Move::EOType MOEOT;
 
 public:
 

contribution/branches/MOLS/src2/moeoRestartLS.h

@@ -59,7 +59,7 @@ public:
         eoEvalFunc < MOEOT > & _eval,
         eoContinue < MOEOT > & _continuator,
         moeoPopNeighborhoodExplorer < Move > & _explorer,
-        moeoUnvisitedSelect < Move > & _select,
+        moeoUnvisitedSelect < MOEOT > & _select,
         moeoArchive < MOEOT > & _globalArchive,
         std::string _fileName) :
             init(_init), eval(_eval), continuator(_continuator), ls(continuator, _eval, internalArchive, _explorer, _select), globalArchive(_globalArchive), fileName(_fileName), count(0) {}

contribution/branches/MOLS/src2/moeoUnifiedDominanceBasedLS.h

@@ -58,7 +58,7 @@ public:
         eoEvalFunc < MOEOT > & _eval,
         moeoArchive < MOEOT > & _archive,
         moeoPopNeighborhoodExplorer < Move > & _explorer,
-        moeoUnvisitedSelect < Move > & _select) :
+        moeoUnvisitedSelect < MOEOT > & _select) :
             continuator(_continuator), loopEval(_eval), popEval(loopEval), archive(_archive), explorer(_explorer), select(_select) {}
 
 
@@ -96,7 +96,7 @@ protected:
     eoPopEvalFunc < MOEOT > & popEval;
     moeoArchive < MOEOT > & archive;
     moeoPopNeighborhoodExplorer < Move > & explorer;
-    moeoUnvisitedSelect < Move > & select;
+    moeoUnvisitedSelect < MOEOT > & select;
 
 class moeoContinue : public eoUF < eoPop < MOEOT > &, bool >
     {

contribution/branches/MOLS/src2/moeoUnvisitedSelect.h

@@ -45,7 +45,7 @@
 /**
  * TODO
  */
-template < class Move >
+template < class MOEOT >
-class moeoUnvisitedSelect: public eoUF < eoPop < typename Move::EOType> &, std::vector< unsigned int > >{};
+class moeoUnvisitedSelect: public eoUF < eoPop < MOEOT > &, std::vector< unsigned int > >{};
 
 #endif /*MOEOUNVISITEDSELECT_H_*/

contribution/branches/MOLS/test/CMakeLists.txt

@@ -0,0 +1,138 @@
+######################################################################################
+### CMake basic configuration
+######################################################################################
+
+# check cmake version compatibility
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+# regular expression checking
+INCLUDE_REGULAR_EXPRESSION("^.*$" "^$")
+
+# set a language for the entire project.
+ENABLE_LANGUAGE(CXX)
+ENABLE_LANGUAGE(C)
+
+#####################################################################################
+### Include required modules & utilities
+#####################################################################################
+INCLUDE(CMakeBackwardCompatibilityCXX)
+
+INCLUDE(CheckLibraryExists)
+               
+INCLUDE(Dart OPTIONAL) 
+                           
+# Set a special flag if the environment is windows (should do the same in a config.g file)
+IF (WIN32)
+	ADD_DEFINITIONS(-D_WINDOWS=1)
+ENDIF (WIN32)
+######################################################################################
+
+       
+#####################################################################################
+### Manage the build type
+#####################################################################################
+
+# the user should choose the build type on windows environments,excepted under cygwin (default=none)
+SET(CMAKE_DEFAULT_BUILD_TYPE "Debug" CACHE STRING "Variable that stores the default CMake build type" FORCE)
+
+FIND_PROGRAM(MEMORYCHECK_COMMAND
+    NAMES purify valgrind
+    PATHS
+    "/usr/local/bin /usr/bin [HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]"
+    DOC "Path to the memory checking command, used for memory error detection.") 
+       
+IF(NOT CMAKE_BUILD_TYPE)
+     SET( CMAKE_BUILD_TYPE 
+          ${CMAKE_DEFAULT_BUILD_TYPE} CACHE STRING 
+          "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." 
+           FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)  
+  
+IF(WIN32 AND NOT CYGWIN)
+  IF(CMAKE_CXX_COMPILER MATCHES cl)
+   IF(NOT WITH_SHARED_LIBS)
+     IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
+       SET(CMAKE_CXX_FLAGS "/nologo /Gy")
+       SET(CMAKE_CXX_FLAGS_DEBUG "/W3 /MTd /Z7 /Od")
+       SET(CMAKE_CXX_FLAGS_RELEASE "/w /MT /O2 /wd4530")
+       SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
+       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od")
+       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")  
+      ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
+   ENDIF(NOT WITH_SHARED_LIBS)
+  ENDIF(CMAKE_CXX_COMPILER MATCHES cl)  
+ELSE(WIN32 AND NOT CYGWIN)
+    IF(CMAKE_COMPILER_IS_GNUCXX)
+       SET(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fprofile-arcs -ftest-coverage -Wall -Wextra -Wno-unused-parameter")                       
+       SET(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} -O2")
+       SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -O6")       
+    ENDIF(CMAKE_COMPILER_IS_GNUCXX)  
+ENDIF(WIN32 AND NOT CYGWIN)
+
+IF(CMAKE_BUILD_TYPE MATCHES Debug)
+    ADD_DEFINITIONS(-DCMAKE_VERBOSE_MAKEFILE=ON)
+ENDIF(CMAKE_BUILD_TYPE MATCHES Debug)
+
+#####################################################################################
+
+######################################################################################
+### compilation of examples?
+######################################################################################
+
+SET(ENABLE_CMAKE_EXAMPLE TRUE CACHE BOOL "Enable copy of benchs and parameters file?")
+
+#######################################################################################
+### Paths to EO, MO and MOEO must be specified above.
+#######################################################################################
+
+SET(PARADISEO_DIR "/home/humeau/Bureau/paradiseo-1.2.1" CACHE PATH "ParadisEO directory" FORCE)
+
+SET(EO_SRC_DIR "${PARADISEO_DIR}/paradiseo-eo" CACHE PATH "ParadisEO-EO source directory" FORCE)
+SET(EO_BIN_DIR "${PARADISEO_DIR}/paradiseo-eo/build" CACHE PATH "ParadisEO-EO binary directory" FORCE)
+    
+SET(MO_SRC_DIR "${PARADISEO_DIR}/paradiseo-mo" CACHE PATH "ParadisMO-MO source directory" FORCE)
+SET(MO_BIN_DIR "${PARADISEO_DIR}/paradiseo-mo/build" CACHE PATH "ParadisMO-MO binary directory" FORCE)
+
+SET(MOEO_SRC_DIR "${PARADISEO_DIR}/paradiseo-moeo" CACHE PATH "ParadisMOEO-MOEO source directory" FORCE)
+SET(MOEO_BIN_DIR "${PARADISEO_DIR}/paradiseo-moeo/build" CACHE PATH "ParadisMOEO-MOEO binary directory" FORCE)
+
+######################################################################################
+### 1) Include the sources
+######################################################################################
+
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${MOEO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(/home/humeau/workspace/MOLS/src2)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+######################################################################################
+### 2) Specify where CMake can find the libraries
+######################################################################################
+
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${MOEO_BIN_DIR}/lib)
+
+######################################################################################
+### 3) Define your targets and link the librairies
+######################################################################################
+
+SET (TEST_LIST
+		t-moeoExhaustiveUnvisitedSelect
+	)
+
+FOREACH (test ${TEST_LIST})
+	  SET ("T_${test}_SOURCES" "${test}.cpp")
+ENDFOREACH (test)
+
+	
+	FOREACH (test ${TEST_LIST})
+		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) 
+		  ADD_TEST(${test} ${test}) 
+	ENDFOREACH (test)
+	
+	# Link the librairies
+	FOREACH (test ${TEST_LIST})
+	 TARGET_LINK_LIBRARIES(${test} moeo ga es eoutils eo)
+	ENDFOREACH (test)
+
+######################################################################################
+

contribution/branches/MOLS/test/CTestConfig.cmake

@@ -0,0 +1,7 @@
+set(CTEST_PROJECT_NAME "ParadisEO")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "cdash.inria.fr")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=ParadisEO")
+set(CTEST_DROP_SITE_CDASH TRUE)

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

@@ -0,0 +1,99 @@
+/*
+* <t-moeoExhaustiveUnvisitedSelect.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-moeoExhaustiveUnvisitedSelect.cpp
+//-----------------------------------------------------------------------------
+
+#include <eo>
+#include <moeo>
+#include <assert.h>
+#include <set>
+#include <iostream>
+#include <moeoExhaustiveUnvisitedSelect.h>
+//-----------------------------------------------------------------------------
+
+class ObjectiveVectorTraits : public moeoObjectiveVectorTraits
+{
+public:
+    static bool minimizing (int i)
+    {
+        return true;
+    }
+    static bool maximizing (int i)
+    {
+        return false;
+    }
+    static unsigned int nObjectives ()
+    {
+        return 2;
+    }
+};
+
+typedef moeoRealObjectiveVector < ObjectiveVectorTraits > ObjectiveVector;
+
+typedef MOEO < ObjectiveVector, double, double > Solution;
+
+//-----------------------------------------------------------------------------
+
+int main()
+{
+    std::cout << "[moeoExhaustiveUnvisitedSelect]\n\n";
+
+    // objective vectors
+    eoPop < Solution > pop;
+    pop.resize(5);
+    pop[0].flag(1);
+    pop[1].flag(0);
+    pop[2].flag(0);
+    pop[3].flag(1);
+    pop[4].flag(0);
+
+    moeoExhaustiveUnvisitedSelect < Solution > select;
+
+    std::vector <unsigned int> res;
+
+    res=select(pop);
+    assert(res.size()==3);
+	assert(res[0]==1);
+	assert(res[1]==2);
+	assert(res[2]==4);
+
+    std::cout << "OK" << std::endl;
+    return EXIT_SUCCESS;
+}
+
+//-----------------------------------------------------------------------------