Merge remote-tracking branch 'upstream/master'

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}")
 
 

src/test/utility/VectorTest.cpp

@@ -7,17 +7,17 @@ TEST(VectorTest, sum_if) {
     std::vector<double> 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<double> 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<double> 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));
 }