From 3e716f32bdf38f9b3c270eaf83a43bc57ed7a60c Mon Sep 17 00:00:00 2001 From: jhumeau Date: Fri, 18 Jun 2010 15:11:41 +0000 Subject: [PATCH] CMake config updated git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1858 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/install.cmake | 4 +- .../paradiseo-mo/src/sampling/moStatistics.h | 18 +- trunk/paradiseo-mo/tutorial/CMakeLists.txt | 396 +++++++++++++++++- .../tutorial/Lesson1/CMakeLists.txt | 105 ++++- .../tutorial/Lesson1/firstImprHC_maxSAT.param | 14 + .../Lesson1/lesson1_combinedContinuator.param | 15 + .../Lesson1/lesson1_evalContinuator.param | 12 + .../Lesson1/lesson1_firstImprHC.param | 11 + .../Lesson1/lesson1_fitContinuator.param | 12 + .../Lesson1/lesson1_fullEvalContinuator.param | 12 + .../Lesson1/lesson1_iterContinuator.param | 12 + .../tutorial/Lesson1/lesson1_neutralHC.param | 12 + .../Lesson1/lesson1_randomBestHC.param | 11 + .../tutorial/Lesson1/lesson1_simpleHC.param | 11 + .../tutorial/Lesson2/CMakeLists.txt | 33 +- .../tutorial/Lesson2/testNeighborhood.cpp | 6 +- .../tutorial/Lesson2/testNeighborhood.param | 11 + .../tutorial/Lesson3/CMakeLists.txt | 35 +- .../Lesson3/testSimulatedAnnealing.cpp | 2 +- .../Lesson3/testSimulatedAnnealing.param | 11 + .../tutorial/Lesson4/CMakeLists.txt | 36 +- .../tutorial/Lesson4/testSimpleTS.cpp | 2 +- .../tutorial/Lesson4/testSimpleTS.param | 15 + .../tutorial/Lesson5/CMakeLists.txt | 34 +- .../paradiseo-mo/tutorial/Lesson5/testILS.cpp | 2 +- .../tutorial/Lesson5/testILS.param | 11 + .../tutorial/Lesson6/CMakeLists.txt | 113 ++++- .../tutorial/Lesson6/adaptiveWalks.param | 13 + .../tutorial/Lesson6/autocorrelation.param | 13 + .../tutorial/Lesson6/densityOfStates.param | 13 + trunk/paradiseo-mo/tutorial/Lesson6/fdc.param | 13 + .../tutorial/Lesson6/fitnessCloud.param | 13 + .../tutorial/Lesson6/neutralDegree.param | 14 + .../tutorial/Lesson6/neutralWalk.param | 14 + .../tutorial/Lesson6/sampling.param | 13 + .../Lesson6/testMetropolisHasting.param | 12 + .../Lesson6/testRandomNeutralWalk.param | 13 + .../tutorial/Lesson6/testRandomWalk.param | 12 + .../tutorial/Lesson7/CMakeLists.txt | 34 +- .../tutorial/Lesson7/hybridAlgo.cpp | 2 +- .../tutorial/Lesson7/hybridAlgo.param | 11 + trunk/paradiseo-moeo/tutorial/CMakeLists.txt | 8 +- .../tutorial/Lesson1/CMakeLists.txt | 6 +- .../tutorial/Lesson2/CMakeLists.txt | 6 +- .../tutorial/Lesson3/CMakeLists.txt | 6 +- .../tutorial/Lesson4/CMakeLists.txt | 6 +- .../paradiseo-old-mo/tutorial/CMakeLists.txt | 8 +- .../tutorial/HybridLesson/CMakeLists.txt | 6 +- .../tutorial/Lesson1/CMakeLists.txt | 6 +- .../tutorial/Lesson2/CMakeLists.txt | 6 +- .../tutorial/Lesson3/CMakeLists.txt | 6 +- .../tutorial/Lesson4/CMakeLists.txt | 6 +- .../tutorial/Lesson5/CMakeLists.txt | 6 +- 53 files changed, 1142 insertions(+), 80 deletions(-) create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/firstImprHC_maxSAT.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_combinedContinuator.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_evalContinuator.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_firstImprHC.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_fitContinuator.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_fullEvalContinuator.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_iterContinuator.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_neutralHC.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_randomBestHC.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson1/lesson1_simpleHC.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson3/testSimulatedAnnealing.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson4/testSimpleTS.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson5/testILS.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/adaptiveWalks.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/autocorrelation.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/densityOfStates.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/fdc.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/neutralDegree.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/neutralWalk.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/sampling.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/testMetropolisHasting.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/testRandomNeutralWalk.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson6/testRandomWalk.param create mode 100644 trunk/paradiseo-mo/tutorial/Lesson7/hybridAlgo.param diff --git a/trunk/install.cmake b/trunk/install.cmake index dc7021434..8113a6dd7 100644 --- a/trunk/install.cmake +++ b/trunk/install.cmake @@ -60,14 +60,14 @@ 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") + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10") 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(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10") ENDIF(NOT WITH_SHARED_LIBS) ENDIF(CMAKE_CXX_COMPILER MATCHES cl) ELSE(WIN32 AND NOT CYGWIN) diff --git a/trunk/paradiseo-mo/src/sampling/moStatistics.h b/trunk/paradiseo-mo/src/sampling/moStatistics.h index 43ec8932f..960a39ffb 100644 --- a/trunk/paradiseo-mo/src/sampling/moStatistics.h +++ b/trunk/paradiseo-mo/src/sampling/moStatistics.h @@ -143,9 +143,15 @@ public: } else { unsigned int n = data.size(); - double cov[nbS+1]; - double m[nbS+1]; - double sig[nbS+1]; + std::vector cov; + cov.resize(nbS+1); + //double cov[nbS+1]; + std::vector m; + m.resize(nbS+1); + //double m[nbS+1]; + std::vector sig; + sig.resize(nbS+1); + //double sig[nbS+1]; rho.resize(nbS+1); phi.resize(nbS+1); @@ -188,7 +194,11 @@ public: s--; } - double phi2[nbS+1][nbS+1]; + std::vector< std::vector > phi2; + phi2.resize(nbS+1); + for(unsigned int i=0; i