Browse Source

got rid of more warnings

Former-commit-id: 514624a4b1
tempestpy_adaptions
dehnert 9 years ago
parent
commit
d7f1012509
  1. 2
      resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
  2. 4
      test/performance/storage/MaximalEndComponentDecompositionTest.cpp
  3. 24
      test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp

2
resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt

@ -76,7 +76,7 @@ if (WIN32)
endif (WIN32) endif (WIN32)
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
# nothing to do in this case
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
else(CLANG) else(CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
endif() endif()

4
test/performance/storage/MaximalEndComponentDecompositionTest.cpp

@ -11,7 +11,7 @@ TEST(MaximalEndComponentDecomposition, AsynchronousLeader) {
storm::storage::MaximalEndComponentDecomposition<double> mecDecomposition; storm::storage::MaximalEndComponentDecomposition<double> mecDecomposition;
ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition<double>(*mdp)); ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition<double>(*mdp));
ASSERT_EQ(7, mecDecomposition.size());
ASSERT_EQ(7ul, mecDecomposition.size());
mdp = nullptr; mdp = nullptr;
} }
@ -22,6 +22,6 @@ TEST(MaximalEndComponentDecomposition, Consensus) {
storm::storage::MaximalEndComponentDecomposition<double> mecDecomposition; storm::storage::MaximalEndComponentDecomposition<double> mecDecomposition;
ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition<double>(*mdp)); ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition<double>(*mdp));
ASSERT_EQ(384, mecDecomposition.size());
ASSERT_EQ(384ul, mecDecomposition.size());
mdp = nullptr; mdp = nullptr;
} }

24
test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp

@ -12,13 +12,13 @@ TEST(StronglyConnectedComponentDecomposition, Crowds) {
storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition; storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition;
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc));
ASSERT_EQ(1290297ull, sccDecomposition.size());
ASSERT_EQ(1290297ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true));
ASSERT_EQ(437690, sccDecomposition.size());
ASSERT_EQ(437690ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true, true));
ASSERT_EQ(425040, sccDecomposition.size());
ASSERT_EQ(425040ul, sccDecomposition.size());
dtmc = nullptr; dtmc = nullptr;
} }
@ -30,13 +30,13 @@ TEST(StronglyConnectedComponentDecomposition, SynchronousLeader) {
storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition; storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition;
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc));
ASSERT_EQ(2611835, sccDecomposition.size());
ASSERT_EQ(2611835ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true));
ASSERT_EQ(2, sccDecomposition.size());
ASSERT_EQ(2ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*dtmc, true, true));
ASSERT_EQ(1, sccDecomposition.size());
ASSERT_EQ(1ul, sccDecomposition.size());
dtmc = nullptr; dtmc = nullptr;
} }
@ -48,13 +48,13 @@ TEST(StronglyConnectedComponentDecomposition, AsynchronousLeader) {
storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition; storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition;
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp));
ASSERT_EQ(1461930, sccDecomposition.size());
ASSERT_EQ(1461930ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true));
ASSERT_EQ(127, sccDecomposition.size());
ASSERT_EQ(127ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true, true));
ASSERT_EQ(7, sccDecomposition.size());
ASSERT_EQ(7ul, sccDecomposition.size());
mdp = nullptr; mdp = nullptr;
} }
@ -66,13 +66,13 @@ TEST(StronglyConnectedComponentDecomposition, Consensus) {
storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition; storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition;
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp));
ASSERT_EQ(121251, sccDecomposition.size());
ASSERT_EQ(121251ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true));
ASSERT_EQ(1049, sccDecomposition.size());
ASSERT_EQ(1049ul, sccDecomposition.size());
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true, true)); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*mdp, true, true));
ASSERT_EQ(384, sccDecomposition.size());
ASSERT_EQ(384ul, sccDecomposition.size());
mdp = nullptr; mdp = nullptr;
} }
Loading…
Cancel
Save