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