From c007c8e6998d0776901911e8ebe30eebce1505c2 Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 25 Feb 2016 15:40:29 +0100 Subject: [PATCH 1/3] add sylvan to the resources target Former-commit-id: 70e3c16f555d8a60ea6f2f6c91fcc91692175095 --- resources/3rdparty/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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 From 4a1f7468f5fd1b52a3106cebce04fc76e6783e4f Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 25 Feb 2016 18:55:48 +0100 Subject: [PATCH 2/3] param result file now has a semicolon between parameters Former-commit-id: f9896d0d043550144adc92a811dc8408d708014d --- src/utility/storm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utility/storm.h b/src/utility/storm.h index d4a042bc6..b01b03516 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; From e9b4f069728b23b73017bdd1119f9d7063b5dd53 Mon Sep 17 00:00:00 2001 From: Mavo Date: Fri, 26 Feb 2016 13:05:16 +0100 Subject: [PATCH 3/3] Better assertions in BitVector Former-commit-id: 7ee6b34ba5bced25fca9e1702e32a451e69f7d30 --- src/storage/BitVector.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/BitVector.cpp b/src/storage/BitVector.cpp index cd5f46009..ddfcb9de9 100644 --- a/src/storage/BitVector.cpp +++ b/src/storage/BitVector.cpp @@ -412,6 +412,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; @@ -451,7 +452,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; @@ -692,4 +694,4 @@ namespace std { std::size_t hash::operator()(storm::storage::BitVector const& bv) const { return boost::hash_range(bv.bucketVector.begin(), bv.bucketVector.end()); } -} \ No newline at end of file +}