From d85d4c22b9ee84fb9ed7824c36851ca568e19e0b Mon Sep 17 00:00:00 2001 From: jhumeau Date: Thu, 29 Apr 2010 09:58:59 +0000 Subject: [PATCH] =?UTF-8?q?fonctions=20d'eval=20deplac=C3=A9es?= 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@1759 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/install.cmake | 2 ++ .../src/explorer/moeoExhaustiveNeighborhoodExplorer.h | 5 ++--- trunk/{paradiseo-mo/src => }/problems/eval/oneMaxFullEval.h | 0 trunk/{paradiseo-mo/src => }/problems/eval/queenFullEval.h | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename trunk/{paradiseo-mo/src => }/problems/eval/oneMaxFullEval.h (100%) rename trunk/{paradiseo-mo/src => }/problems/eval/queenFullEval.h (100%) diff --git a/trunk/install.cmake b/trunk/install.cmake index 21a7c043f..dc7021434 100644 --- a/trunk/install.cmake +++ b/trunk/install.cmake @@ -114,6 +114,8 @@ SET(OLDMO_BIN_DIR "${CMAKE_BINARY_DIR}/../../paradiseo-old-mo/build" CACHE PATH SET(MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/../paradiseo-moeo" CACHE PATH "ParadisMOEO-MOEO source directory" FORCE) SET(MOEO_BIN_DIR "${CMAKE_BINARY_DIR}/../../paradiseo-moeo/build" CACHE PATH "ParadisMOEO-MOEO binary directory" FORCE) + +SET(PROBLEMS_SRC_DIR "${CMAKE_SOURCE_DIR}/../problems" CACHE PATH "Problems dependant source directory" FORCE) ###################################################################################### ###################################################################################### diff --git a/trunk/paradiseo-moeo/src/explorer/moeoExhaustiveNeighborhoodExplorer.h b/trunk/paradiseo-moeo/src/explorer/moeoExhaustiveNeighborhoodExplorer.h index e4e3e6e31..968c396c4 100644 --- a/trunk/paradiseo-moeo/src/explorer/moeoExhaustiveNeighborhoodExplorer.h +++ b/trunk/paradiseo-moeo/src/explorer/moeoExhaustiveNeighborhoodExplorer.h @@ -61,9 +61,8 @@ public: /** * Ctor - * @param _moveInit the move initializer - * @param _nextMove allow to do or not a move - * @param _incrEval a (generally) efficient evaluation fonction + * @param _neighborhood a neighborhood + * @param _eval neighbor evaluation funtion */ moeoExhaustiveNeighborhoodExplorer( moNeighborhood& _neighborhood, diff --git a/trunk/paradiseo-mo/src/problems/eval/oneMaxFullEval.h b/trunk/problems/eval/oneMaxFullEval.h similarity index 100% rename from trunk/paradiseo-mo/src/problems/eval/oneMaxFullEval.h rename to trunk/problems/eval/oneMaxFullEval.h diff --git a/trunk/paradiseo-mo/src/problems/eval/queenFullEval.h b/trunk/problems/eval/queenFullEval.h similarity index 100% rename from trunk/paradiseo-mo/src/problems/eval/queenFullEval.h rename to trunk/problems/eval/queenFullEval.h