Merge branch 'future' into python_api

Former-commit-id: 602ebed2e8

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"

src/storage/dd/sylvan/InternalSylvanBdd.h

@@ -4,6 +4,7 @@
 #include <vector>
 #include <unordered_map>
 #include <functional>
+#include <memory>
 
 #include "src/storage/dd/DdType.h"
 #include "src/storage/dd/InternalBdd.h"

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();
             }