diff --git a/CMakeLists.txt b/CMakeLists.txt index bc5ca6b65a..ceb9fdde73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,8 +193,8 @@ if (BUILD_CXX) CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11") + # elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11") endif() # Basic type diff --git a/src/mip/HighsMipWorker.cpp b/src/mip/HighsMipWorker.cpp index f48fea4a70..1be359a804 100644 --- a/src/mip/HighsMipWorker.cpp +++ b/src/mip/HighsMipWorker.cpp @@ -7,13 +7,16 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "mip/HighsMipWorker.h" -HighsMipWorker::HighsMipWorker(HighsMipSolver& mipsolver) - : mipsolver_(mipsolver)//, - // cutpool_(mipsolver.numCol(), mipsolver.options_mip_->mip_pool_age_limit, - // mipsolver.options_mip_->mip_pool_soft_limit), - // conflictPool_(5 * mipsolver.options_mip_->mip_pool_age_limit, - // mipsolver.options_mip_->mip_pool_soft_limit), - // cliquetable_(mipsolver.numCol()), - // lprelaxation_(mipsolver) -{} +HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver) + : mipsolver_(mipsolver), + cutpool_(mipsolver.numCol(), mipsolver.options_mip_->mip_pool_age_limit, + mipsolver.options_mip_->mip_pool_soft_limit), + + conflictPool_(5 * mipsolver.options_mip_->mip_pool_age_limit, + + mipsolver.options_mip_->mip_pool_soft_limit), + + cliquetable_(mipsolver.numCol()), + + lprelaxation_(mipsolver) {} diff --git a/src/mip/HighsMipWorker.h b/src/mip/HighsMipWorker.h index 3f1c495830..4a9fa59e59 100644 --- a/src/mip/HighsMipWorker.h +++ b/src/mip/HighsMipWorker.h @@ -28,7 +28,9 @@ class HighsMipWorker { HighsConflictPool conflictpool_; HighsCliqueTable cliquetable_; HighsSearch search_; + +public: + HighsMipWorker(const HighsMipSolver& mipsolver); }; -HighsMipWorker(const HighsMipSolver& mipsolver); #endif