From cebd3d252d20b49c79e1e3d453e60f69172bd974 Mon Sep 17 00:00:00 2001 From: dehnert Date: Thu, 8 Jun 2017 23:05:24 +0200 Subject: [PATCH 1/2] fixed include directory (cmake) for shipped carl --- resources/3rdparty/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 5c1324bbf..214b52e0e 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -256,7 +256,7 @@ if(USE_CARL) LOG_INSTALL ON BUILD_BYPRODUCTS ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl${DYNAMIC_EXT} ) - include(${STORM_3RDPARTY_BINARY_DIR}/carl/carlConfig.cmake) + include(${STORM_3RDPARTY_BINARY_DIR}/carl/carlExport/carlConfig.cmake) message("CARL_USE_CLN_NUMBERS: ${CARL_USE_CLN_NUMBERS}, CARL_USE_GINAC: ${CARL_USE_GINAC}") From ac566a64c36aa818c31d0adff08f724eef5fd601 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Fri, 9 Jun 2017 14:02:52 +0200 Subject: [PATCH 2/2] Removed some whitespace --- src/test/utility/VectorTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/utility/VectorTest.cpp b/src/test/utility/VectorTest.cpp index 0bf7b8b8f..d424be5ea 100644 --- a/src/test/utility/VectorTest.cpp +++ b/src/test/utility/VectorTest.cpp @@ -7,17 +7,17 @@ TEST(VectorTest, sum_if) { std::vector a = {1.0, 2.0, 4.0, 8.0, 16.0}; storm::storage::BitVector f1(5, {2,4}); storm::storage::BitVector f2(5, {3,4}); - + ASSERT_EQ(20.0, storm::utility::vector::sum_if(a, f1)); ASSERT_EQ(24.0, storm::utility::vector::sum_if(a, f2)); - + } TEST(VectorTest, max_if) { std::vector a = {1.0, 2.0, 34.0, 8.0, 16.0}; storm::storage::BitVector f1(5, {2,4}); storm::storage::BitVector f2(5, {3,4}); - + ASSERT_EQ(34.0, storm::utility::vector::max_if(a, f1)); ASSERT_EQ(16.0, storm::utility::vector::max_if(a, f2)); } @@ -27,7 +27,7 @@ TEST(VectorTest, min_if) { std::vector a = {1.0, 2.0, 34.0, 8.0, 16.0}; storm::storage::BitVector f1(5, {2,4}); storm::storage::BitVector f2(5, {3,4}); - + ASSERT_EQ(16.0, storm::utility::vector::min_if(a, f1)); ASSERT_EQ(8.0, storm::utility::vector::min_if(a, f2)); }