diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index d935a003f..19a64fa06 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -71,6 +71,7 @@ ExternalProject_Get_Property(sylvan binary_dir) set(Sylvan_INCLUDE_DIR "${STORM_SYLVAN_ROOT}/src" PARENT_SCOPE) set(Sylvan_LIBRARY "${binary_dir}/src/libsylvan.a" PARENT_SCOPE) +add_dependencies(resources sylvan) ExternalProject_Add( googletest diff --git a/src/storage/BitVector.cpp b/src/storage/BitVector.cpp index 3e25e488d..5919b96a0 100644 --- a/src/storage/BitVector.cpp +++ b/src/storage/BitVector.cpp @@ -406,6 +406,7 @@ namespace storm { } uint_fast64_t BitVector::getAsInt(uint_fast64_t bitIndex, uint_fast64_t numberOfBits) const { + STORM_LOG_ASSERT(numberOfBits <= 64, "Number of bits must be <= 64."); uint64_t bucket = bitIndex >> 6; uint64_t bitIndexInBucket = bitIndex & mod64mask; @@ -445,7 +446,8 @@ namespace storm { } void BitVector::setFromInt(uint_fast64_t bitIndex, uint_fast64_t numberOfBits, uint64_t value) { - STORM_LOG_ASSERT((value >> numberOfBits) == 0, "Integer value too large to fit in the given number of bits."); + STORM_LOG_ASSERT(numberOfBits <= 64, "Number of bits must be <= 64."); + STORM_LOG_ASSERT(numberOfBits == 64 || (value >> numberOfBits) == 0, "Integer value too large to fit in the given number of bits."); uint64_t bucket = bitIndex >> 6; uint64_t bitIndexInBucket = bitIndex & mod64mask; @@ -686,4 +688,4 @@ namespace std { std::size_t hash::operator()(storm::storage::BitVector const& bitvector) const { return boost::hash_range(bitvector.buckets, bitvector.buckets + bitvector.bucketCount()); } -} \ No newline at end of file +} diff --git a/src/utility/storm.h b/src/utility/storm.h index ef2e7ac7a..d2963a0f5 100644 --- a/src/utility/storm.h +++ b/src/utility/storm.h @@ -307,7 +307,7 @@ namespace storm { // TODO: add checks. filestream << "!Parameters: "; std::set vars = result.gatherVariables(); - std::copy(vars.begin(), vars.end(), std::ostream_iterator(filestream, ", ")); + std::copy(vars.begin(), vars.end(), std::ostream_iterator(filestream, "; ")); filestream << std::endl; filestream << "!Result: " << result << std::endl; filestream << "!Well-formed Constraints: " << std::endl;