From 6006d951931464f0a62a65e0fdc451508e3d06c7 Mon Sep 17 00:00:00 2001 From: TimQu Date: Sun, 27 Dec 2015 14:14:52 +0100 Subject: [PATCH 1/2] Fixed compile errors: Added missing include and fixed call of std::max Former-commit-id: 614689e26f679dfc01871a98ec214b9b846e8a5c --- src/storage/dd/sylvan/InternalSylvanBdd.h | 1 + src/storage/dd/sylvan/InternalSylvanDdManager.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/dd/sylvan/InternalSylvanBdd.h b/src/storage/dd/sylvan/InternalSylvanBdd.h index 5695ff2d5..b4af26770 100644 --- a/src/storage/dd/sylvan/InternalSylvanBdd.h +++ b/src/storage/dd/sylvan/InternalSylvanBdd.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "src/storage/dd/DdType.h" #include "src/storage/dd/InternalBdd.h" diff --git a/src/storage/dd/sylvan/InternalSylvanDdManager.cpp b/src/storage/dd/sylvan/InternalSylvanDdManager.cpp index ea78ac8e1..9998df121 100644 --- a/src/storage/dd/sylvan/InternalSylvanDdManager.cpp +++ b/src/storage/dd/sylvan/InternalSylvanDdManager.cpp @@ -38,7 +38,7 @@ namespace storm { // Compute the power of two that still fits within the total numbers to store. uint_fast64_t powerOfTwo = findLargestPowerOfTwoFitting(totalNodesToStore); - sylvan::Sylvan::initPackage(1ull << std::max(16ull, powerOfTwo > 24 ? powerOfTwo - 8 : 0), 1ull << (powerOfTwo - 1), 1ull << std::max(16ull, powerOfTwo > 24 ? powerOfTwo - 12 : 0), 1ull << (powerOfTwo - 1)); + sylvan::Sylvan::initPackage(1ull << std::max(16ull, powerOfTwo > 24 ? powerOfTwo - 8 : 0ull), 1ull << (powerOfTwo - 1), 1ull << std::max(16ull, powerOfTwo > 24 ? powerOfTwo - 12 : 0ull), 1ull << (powerOfTwo - 1)); sylvan::Sylvan::initBdd(1); sylvan::Sylvan::initMtbdd(); } From 73ed137587f8ef9b105a8aebc18b317f9c3cd32d Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 4 Jan 2016 10:03:56 +0100 Subject: [PATCH 2/2] support for gurobi 6.5.0 on MacOS Former-commit-id: 0e184aedca4ac509e91483f4a088a10a6cfd7229 --- resources/cmake/FindGurobi.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/cmake/FindGurobi.cmake b/resources/cmake/FindGurobi.cmake index 65330f799..7ae23b115 100644 --- a/resources/cmake/FindGurobi.cmake +++ b/resources/cmake/FindGurobi.cmake @@ -21,6 +21,7 @@ find_path(GUROBI_INCLUDE_DIR "/Library/gurobi602/mac64/include" "/Library/gurobi604/mac64/include" "/Library/gurobi605/mac64/include" + "/Library/gurobi650/mac64/include" "C:\\libs\\gurobi502\\include" "C:\\gurobi600\\win64\\include" "${GUROBI_ROOT}/include" @@ -35,7 +36,8 @@ find_library( GUROBI_LIBRARY gurobi52 gurobi55 gurobi56 - gurobi60 + gurobi60 + gurobi65 PATHS "$ENV{GUROBI_HOME}/lib" "/Library/gurobi502/mac64/lib" "/Library/gurobi602/mac64/lib" @@ -53,6 +55,7 @@ find_library( GUROBI_CXX_LIBRARY "/Library/gurobi602/mac64/lib" "/Library/gurobi604/mac64/lib" "/Library/gurobi605/mac64/lib" + "/Library/gurobi650/mac64/lib" "C:\\libs\\gurobi502\\lib" "C:\\gurobi600\\win64\\lib" "${GUROBI_ROOT}/lib"