diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea314db2..6bdaa29a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,7 @@ else(CLANG)
endif()
add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=${CLANG_STDLIB} -Wall -pedantic -Wno-unused-variable -ftemplate-depth=1024")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=${CLANG_STDLIB} -Wall -pedantic -Wno-newline-eof -Wno-mismatched-tags -ftemplate-depth=1024")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic")
# Turn on popcnt instruction if desired (yes by default)
diff --git a/resources/3rdparty/cudd-2.5.0/CMakeLists.txt b/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
index c9f821a21..4a39bd5da 100644
--- a/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
+++ b/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
@@ -26,7 +26,7 @@ elseif(MSVC)
# required for GMM to compile, ugly error directive in their code
add_definitions(/D_SCL_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS)
else(CLANG)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-newline-eof -Wno-unneeded-internal-declaration -Wno-unused-variable -Wno-unused-const-variable")
endif()
# Since we do not target Alphas, this symbol is always set
diff --git a/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt b/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
index 7dfb3c690..44ff45da4 100644
--- a/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
+++ b/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
@@ -75,6 +75,12 @@ if (WIN32)
add_definitions (-D_WIN32_WINNT=${_WIN32_WINNT})
endif (WIN32)
+if(CMAKE_COMPILER_IS_GNUCC)
+ # nothing to do in this case
+else(CLANG)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
+endif()
+
add_library (${log4cplus} ${log4cplus_sources})
set (log4cplus_LIBS ${CMAKE_THREAD_LIBS_INIT})
diff --git a/src/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp b/src/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
index 498370e02..0ae832563 100644
--- a/src/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
+++ b/src/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
@@ -694,7 +694,6 @@ namespace storm {
template<typename ValueType>
void SparseDtmcEliminationModelChecker<ValueType>::eliminateState(FlexibleSparseMatrix& matrix, std::vector<ValueType>& oneStepProbabilities, uint_fast64_t state, FlexibleSparseMatrix& backwardTransitions, boost::optional<std::vector<ValueType>>& stateRewards, bool removeForwardTransitions, bool constrained, storm::storage::BitVector const& predecessorConstraint) {
- auto eliminationStart = std::chrono::high_resolution_clock::now();
bool hasSelfLoop = false;
ValueType loopProbability = storm::utility::zero<ValueType>();
@@ -917,9 +916,6 @@ namespace storm {
} else {
currentStatePredecessors = std::move(newCurrentStatePredecessors);
}
-
- auto eliminationEnd = std::chrono::high_resolution_clock::now();
- auto eliminationTime = eliminationEnd - eliminationStart;
}
template<typename ValueType>
diff --git a/src/storage/BitVector.cpp b/src/storage/BitVector.cpp
index 923916793..9835c54dc 100644
--- a/src/storage/BitVector.cpp
+++ b/src/storage/BitVector.cpp
@@ -109,7 +109,6 @@ namespace storm {
std::vector<uint64_t>::const_iterator first1 = this->bucketVector.begin();
std::vector<uint64_t>::const_iterator last1 = this->bucketVector.end();
std::vector<uint64_t>::const_iterator first2 = other.bucketVector.begin();
- std::vector<uint64_t>::const_iterator last2 = other.bucketVector.end();
for (; first1 != last1; ++first1, ++first2) {
if (*first1 < *first2) {
diff --git a/src/storage/DeterministicModelBisimulationDecomposition.cpp b/src/storage/DeterministicModelBisimulationDecomposition.cpp
index c071afc20..395202ed1 100644
--- a/src/storage/DeterministicModelBisimulationDecomposition.cpp
+++ b/src/storage/DeterministicModelBisimulationDecomposition.cpp
@@ -913,7 +913,6 @@ namespace storm {
// Finally, we need to scan the ranges of states that agree on the probability.
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator begin = partition.getBegin(block);
- typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator current = begin;
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator end = partition.getEnd(block) - 1;
storm::storage::sparse::state_type currentIndex = block.getBegin();
@@ -999,7 +998,6 @@ namespace storm {
// Now we have everything in place to actually split the block by just scanning for ranges of equal label.
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator begin = partition.getBegin(block);
- typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator current = begin;
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator end = partition.getEnd(block) - 1;
storm::storage::sparse::state_type currentIndex = block.getBegin();
@@ -1093,7 +1091,6 @@ namespace storm {
// Then, we scan for the ranges of states that agree on the probability.
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator begin = partition.getStatesAndValues().begin() + block.getOriginalBegin();
- typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator current = begin;
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator end = partition.getStatesAndValues().begin() + block.getBegin() - 1;
storm::storage::sparse::state_type currentIndex = block.getOriginalBegin();
result.push_back(currentIndex);
@@ -1462,7 +1459,6 @@ namespace storm {
// Finally, we need to scan the ranges of states that agree on the probability.
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator begin = partition.getBegin(block);
- typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator current = begin;
typename std::vector<std::pair<storm::storage::sparse::state_type, ValueType>>::const_iterator end = partition.getEnd(block) - 1;
storm::storage::sparse::state_type currentIndex = block.getBegin();
diff --git a/src/storage/SparseMatrix.cpp b/src/storage/SparseMatrix.cpp
index 2cb9f995b..28d77ff74 100644
--- a/src/storage/SparseMatrix.cpp
+++ b/src/storage/SparseMatrix.cpp
@@ -677,11 +677,12 @@ namespace storm {
SparseMatrix<ValueType> SparseMatrix<ValueType>::transpose(bool joinGroups, bool keepZeros) const {
index_type rowCount = this->getColumnCount();
index_type columnCount = joinGroups ? this->getRowGroupCount() : this->getRowCount();
+ index_type entryCount;
if (keepZeros) {
- index_type entryCount = this->getEntryCount();
+ entryCount = this->getEntryCount();
} else {
this->updateNonzeroEntryCount();
- index_type entryCount = this->getNonzeroEntryCount();
+ entryCount = this->getNonzeroEntryCount();
}
std::vector<index_type> rowIndications(rowCount + 1);
@@ -914,7 +915,6 @@ namespace storm {
const_iterator ite;
std::vector<index_type>::const_iterator rowIterator = rowIndications.begin();
typename std::vector<ValueType>::const_iterator bIt = b.begin();
- typename std::vector<ValueType>::const_iterator bIte = b.end();
typename std::vector<ValueType>::iterator resultIterator = x.begin();
typename std::vector<ValueType>::iterator resultIteratorEnd = x.end();
diff --git a/src/utility/prism.cpp b/src/utility/prism.cpp
new file mode 100644
index 000000000..72c3c3258
--- /dev/null
+++ b/src/utility/prism.cpp
@@ -0,0 +1,64 @@
+#include "src/utility/prism.h"
+
+namespace storm {
+ namespace utility {
+ namespace prism {
+ std::map<storm::expressions::Variable, storm::expressions::Expression> parseConstantDefinitionString(storm::prism::Program const& program, std::string const& constantDefinitionString) {
+ std::map<storm::expressions::Variable, storm::expressions::Expression> constantDefinitions;
+ std::set<storm::expressions::Variable> definedConstants;
+
+ if (!constantDefinitionString.empty()) {
+ // Parse the string that defines the undefined constants of the model and make sure that it contains exactly
+ // one value for each undefined constant of the model.
+ std::vector<std::string> definitions;
+ boost::split(definitions, constantDefinitionString, boost::is_any_of(","));
+ for (auto& definition : definitions) {
+ boost::trim(definition);
+
+ // Check whether the token could be a legal constant definition.
+ uint_fast64_t positionOfAssignmentOperator = definition.find('=');
+ if (positionOfAssignmentOperator == std::string::npos) {
+ throw storm::exceptions::InvalidArgumentException() << "Illegal constant definition string: syntax error.";
+ }
+
+ // Now extract the variable name and the value from the string.
+ std::string constantName = definition.substr(0, positionOfAssignmentOperator);
+ boost::trim(constantName);
+ std::string value = definition.substr(positionOfAssignmentOperator + 1);
+ boost::trim(value);
+
+ // Check whether the constant is a legal undefined constant of the program and if so, of what type it is.
+ if (program.hasConstant(constantName)) {
+ // Get the actual constant and check whether it's in fact undefined.
+ auto const& constant = program.getConstant(constantName);
+ storm::expressions::Variable variable = constant.getExpressionVariable();
+ STORM_LOG_THROW(!constant.isDefined(), storm::exceptions::InvalidArgumentException, "Illegally trying to define already defined constant '" << constantName <<"'.");
+ STORM_LOG_THROW(definedConstants.find(variable) == definedConstants.end(), storm::exceptions::InvalidArgumentException, "Illegally trying to define constant '" << constantName <<"' twice.");
+ definedConstants.insert(variable);
+
+ if (constant.getType().isBooleanType()) {
+ if (value == "true") {
+ constantDefinitions[variable] = program.getManager().boolean(true);
+ } else if (value == "false") {
+ constantDefinitions[variable] = program.getManager().boolean(false);
+ } else {
+ throw storm::exceptions::InvalidArgumentException() << "Illegal value for boolean constant: " << value << ".";
+ }
+ } else if (constant.getType().isIntegerType()) {
+ int_fast64_t integerValue = std::stoi(value);
+ constantDefinitions[variable] = program.getManager().integer(integerValue);
+ } else if (constant.getType().isRationalType()) {
+ double doubleValue = std::stod(value);
+ constantDefinitions[variable] = program.getManager().rational(doubleValue);
+ }
+ } else {
+ STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Illegal constant definition string: unknown undefined constant " << constantName << ".");
+ }
+ }
+ }
+
+ return constantDefinitions;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/utility/prism.h b/src/utility/prism.h
index f88188fb5..ea6057a15 100644
--- a/src/utility/prism.h
+++ b/src/utility/prism.h
@@ -176,62 +176,8 @@ namespace storm {
std::shared_ptr<boost::container::flat_set<uint_fast64_t>> choiceLabels;
};
- static std::map<storm::expressions::Variable, storm::expressions::Expression> parseConstantDefinitionString(storm::prism::Program const& program, std::string const& constantDefinitionString) {
- std::map<storm::expressions::Variable, storm::expressions::Expression> constantDefinitions;
- std::set<storm::expressions::Variable> definedConstants;
-
- if (!constantDefinitionString.empty()) {
- // Parse the string that defines the undefined constants of the model and make sure that it contains exactly
- // one value for each undefined constant of the model.
- std::vector<std::string> definitions;
- boost::split(definitions, constantDefinitionString, boost::is_any_of(","));
- for (auto& definition : definitions) {
- boost::trim(definition);
-
- // Check whether the token could be a legal constant definition.
- uint_fast64_t positionOfAssignmentOperator = definition.find('=');
- if (positionOfAssignmentOperator == std::string::npos) {
- throw storm::exceptions::InvalidArgumentException() << "Illegal constant definition string: syntax error.";
- }
-
- // Now extract the variable name and the value from the string.
- std::string constantName = definition.substr(0, positionOfAssignmentOperator);
- boost::trim(constantName);
- std::string value = definition.substr(positionOfAssignmentOperator + 1);
- boost::trim(value);
-
- // Check whether the constant is a legal undefined constant of the program and if so, of what type it is.
- if (program.hasConstant(constantName)) {
- // Get the actual constant and check whether it's in fact undefined.
- auto const& constant = program.getConstant(constantName);
- storm::expressions::Variable variable = constant.getExpressionVariable();
- STORM_LOG_THROW(!constant.isDefined(), storm::exceptions::InvalidArgumentException, "Illegally trying to define already defined constant '" << constantName <<"'.");
- STORM_LOG_THROW(definedConstants.find(variable) == definedConstants.end(), storm::exceptions::InvalidArgumentException, "Illegally trying to define constant '" << constantName <<"' twice.");
- definedConstants.insert(variable);
-
- if (constant.getType().isBooleanType()) {
- if (value == "true") {
- constantDefinitions[variable] = program.getManager().boolean(true);
- } else if (value == "false") {
- constantDefinitions[variable] = program.getManager().boolean(false);
- } else {
- throw storm::exceptions::InvalidArgumentException() << "Illegal value for boolean constant: " << value << ".";
- }
- } else if (constant.getType().isIntegerType()) {
- int_fast64_t integerValue = std::stoi(value);
- constantDefinitions[variable] = program.getManager().integer(integerValue);
- } else if (constant.getType().isRationalType()) {
- double doubleValue = std::stod(value);
- constantDefinitions[variable] = program.getManager().rational(doubleValue);
- }
- } else {
- STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Illegal constant definition string: unknown undefined constant " << constantName << ".");
- }
- }
- }
-
- return constantDefinitions;
- }
+ std::map<storm::expressions::Variable, storm::expressions::Expression> parseConstantDefinitionString(storm::prism::Program const& program, std::string const& constantDefinitionString);
+
} // namespace prism
} // namespace utility
} // namespace storm
diff --git a/test/functional/parser/DeterministicSparseTransitionParserTest.cpp b/test/functional/parser/DeterministicSparseTransitionParserTest.cpp
index 517ff1b3b..a92987875 100644
--- a/test/functional/parser/DeterministicSparseTransitionParserTest.cpp
+++ b/test/functional/parser/DeterministicSparseTransitionParserTest.cpp
@@ -106,8 +106,8 @@ TEST(DeterministicSparseTransitionParserTest, BasicTransitionsRewardsParsing) {
storm::storage::SparseMatrix<double> rewardMatrix = storm::parser::DeterministicSparseTransitionParser::parseDeterministicTransitionRewards(STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/dtmc_general.trans.rew", transitionMatrix);
- ASSERT_EQ(8, rewardMatrix.getColumnCount());
- ASSERT_EQ(17, rewardMatrix.getEntryCount());
+ ASSERT_EQ(8ul, rewardMatrix.getColumnCount());
+ ASSERT_EQ(17ul, rewardMatrix.getEntryCount());
// Test every entry of the matrix.
storm::storage::SparseMatrix<double>::const_iterator cIter = rewardMatrix.begin(0);
@@ -197,7 +197,7 @@ TEST(DeterministicSparseTransitionParserTest, FixDeadlocks) {
storm::storage::SparseMatrix<double> transitionMatrix = storm::parser::DeterministicSparseTransitionParser::parseDeterministicTransitions(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_deadlock.tra");
ASSERT_EQ(9ul, transitionMatrix.getColumnCount());
- ASSERT_EQ(23, transitionMatrix.getEntryCount());
+ ASSERT_EQ(23ul, transitionMatrix.getEntryCount());
storm::storage::SparseMatrix<double>::const_iterator cIter = transitionMatrix.begin(7);
ASSERT_EQ(7ul, cIter->getColumn());
diff --git a/test/functional/parser/NondeterministicModelParserTest.cpp b/test/functional/parser/NondeterministicModelParserTest.cpp
index fce14033c..3ba479cc9 100644
--- a/test/functional/parser/NondeterministicModelParserTest.cpp
+++ b/test/functional/parser/NondeterministicModelParserTest.cpp
@@ -15,15 +15,15 @@ TEST(NondeterministicModelParserTest, BasicMdpParsing) {
// Parse a Mdp and check the result.
storm::models::sparse::Mdp<double> mdp(storm::parser::NondeterministicModelParser::parseMdp(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/mdp_general.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/mdp_general.lab", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/mdp_general.state.rew", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/mdp_general.trans.rew"));
- ASSERT_EQ(6, mdp.getNumberOfStates());
- ASSERT_EQ(22, mdp.getNumberOfTransitions());
- ASSERT_EQ(11, mdp.getNumberOfChoices());
+ ASSERT_EQ(6ul, mdp.getNumberOfStates());
+ ASSERT_EQ(22ul, mdp.getNumberOfTransitions());
+ ASSERT_EQ(11ul, mdp.getNumberOfChoices());
- ASSERT_EQ(2, mdp.getInitialStates().getNumberOfSetBits());
+ ASSERT_EQ(2ul, mdp.getInitialStates().getNumberOfSetBits());
ASSERT_TRUE(mdp.getInitialStates().get(0));
ASSERT_TRUE(mdp.getInitialStates().get(4));
- ASSERT_EQ(4, mdp.getStateLabeling().getNumberOfLabels());
- ASSERT_EQ(3, mdp.getLabelsOfState(0).size());
+ ASSERT_EQ(4ul, mdp.getStateLabeling().getNumberOfLabels());
+ ASSERT_EQ(3ul, mdp.getLabelsOfState(0).size());
ASSERT_TRUE(mdp.hasStateRewards());
ASSERT_EQ(0, mdp.getStateRewardVector()[0]);
@@ -35,7 +35,7 @@ TEST(NondeterministicModelParserTest, BasicMdpParsing) {
ASSERT_EQ(158.32, rewardSum);
ASSERT_TRUE(mdp.hasTransitionRewards());
- ASSERT_EQ(17, mdp.getTransitionRewardMatrix().getEntryCount());
+ ASSERT_EQ(17ul, mdp.getTransitionRewardMatrix().getEntryCount());
rewardSum = 0;
for(uint_fast64_t i = 0; i < mdp.getTransitionRewardMatrix().getRowCount(); i++) {
rewardSum += mdp.getTransitionRewardMatrix().getRowSum(i);
diff --git a/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp b/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp
index db14e78cd..3f9017d1f 100644
--- a/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp
+++ b/test/functional/parser/NondeterministicSparseTransitionParserTest.cpp
@@ -30,88 +30,88 @@ TEST(NondeterministicSparseTransitionParserTest, BasicTransitionsParsing) {
storm::storage::SparseMatrix<double> result(storm::parser::NondeterministicSparseTransitionParser::parseNondeterministicTransitions(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/mdp_general.tra"));
// Test the row mapping, i.e. at which row which state starts.
- ASSERT_EQ(6, result.getRowGroupCount());
- ASSERT_EQ(7, result.getRowGroupIndices().size());
- ASSERT_EQ(0, result.getRowGroupIndices()[0]);
- ASSERT_EQ(4, result.getRowGroupIndices()[1]);
- ASSERT_EQ(5, result.getRowGroupIndices()[2]);
- ASSERT_EQ(7, result.getRowGroupIndices()[3]);
- ASSERT_EQ(8, result.getRowGroupIndices()[4]);
- ASSERT_EQ(9, result.getRowGroupIndices()[5]);
- ASSERT_EQ(11, result.getRowGroupIndices()[6]);
+ ASSERT_EQ(6ul, result.getRowGroupCount());
+ ASSERT_EQ(7ul, result.getRowGroupIndices().size());
+ ASSERT_EQ(0ul, result.getRowGroupIndices()[0]);
+ ASSERT_EQ(4ul, result.getRowGroupIndices()[1]);
+ ASSERT_EQ(5ul, result.getRowGroupIndices()[2]);
+ ASSERT_EQ(7ul, result.getRowGroupIndices()[3]);
+ ASSERT_EQ(8ul, result.getRowGroupIndices()[4]);
+ ASSERT_EQ(9ul, result.getRowGroupIndices()[5]);
+ ASSERT_EQ(11ul, result.getRowGroupIndices()[6]);
// Test the transition matrix.
- ASSERT_EQ(6, result.getColumnCount());
- ASSERT_EQ(11, result.getRowCount());
- ASSERT_EQ(22, result.getEntryCount());
+ ASSERT_EQ(6ul, result.getColumnCount());
+ ASSERT_EQ(11ul, result.getRowCount());
+ ASSERT_EQ(22ul, result.getEntryCount());
// Test every entry of the matrix.
storm::storage::SparseMatrix<double>::const_iterator cIter = result.begin(0);
- ASSERT_EQ(0, cIter->getColumn());
+ ASSERT_EQ(0ul, cIter->getColumn());
ASSERT_EQ(0.9, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.1, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(3, cIter->getColumn());
+ ASSERT_EQ(3ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(0, cIter->getColumn());
+ ASSERT_EQ(0ul, cIter->getColumn());
ASSERT_EQ(0.1, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.9, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(0.5, cIter->getValue());
cIter++;
- ASSERT_EQ(3, cIter->getColumn());
+ ASSERT_EQ(3ul, cIter->getColumn());
ASSERT_EQ(0.5, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(0.001, cIter->getValue());
cIter++;
- ASSERT_EQ(3, cIter->getColumn());
+ ASSERT_EQ(3ul, cIter->getColumn());
ASSERT_EQ(0.999, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.7, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.3, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(0.6, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
}
@@ -121,62 +121,62 @@ TEST(NondeterministicSparseTransitionParserTest, BasicTransitionsRewardsParsing)
storm::storage::SparseMatrix<double> result(storm::parser::NondeterministicSparseTransitionParser::parseNondeterministicTransitionRewards(STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/mdp_general.trans.rew", modelInformation));
// Test the transition matrix.
- ASSERT_EQ(6, result.getColumnCount());
- ASSERT_EQ(11, result.getRowCount());
- ASSERT_EQ(17, result.getEntryCount());
+ ASSERT_EQ(6ul, result.getColumnCount());
+ ASSERT_EQ(11ul, result.getRowCount());
+ ASSERT_EQ(17ul, result.getEntryCount());
// Test every entry of the matrix.
storm::storage::SparseMatrix<double>::const_iterator cIter = result.begin(0);
- ASSERT_EQ(0, cIter->getColumn());
+ ASSERT_EQ(0ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(30, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(15.2, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(75, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(2.45, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(0, cIter->getColumn());
+ ASSERT_EQ(0ul, cIter->getColumn());
ASSERT_EQ(0.114, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(90, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(55, cIter->getValue());
cIter++;
- ASSERT_EQ(3, cIter->getColumn());
+ ASSERT_EQ(3ul, cIter->getColumn());
ASSERT_EQ(87, cIter->getValue());
cIter++;
- ASSERT_EQ(2, cIter->getColumn());
+ ASSERT_EQ(2ul, cIter->getColumn());
ASSERT_EQ(13, cIter->getValue());
cIter++;
- ASSERT_EQ(3, cIter->getColumn());
+ ASSERT_EQ(3ul, cIter->getColumn());
ASSERT_EQ(999, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.7, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.3, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.1, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(6, cIter->getValue());
}
@@ -213,36 +213,36 @@ TEST(NondeterministicSparseTransitionParserTest, FixDeadlocks) {
// Parse a transitions file with the fixDeadlocks Flag set and test if it works.
storm::storage::SparseMatrix<double> result(storm::parser::NondeterministicSparseTransitionParser::parseNondeterministicTransitions(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/mdp_deadlock.tra"));
- ASSERT_EQ(8, result.getRowGroupIndices().size());
- ASSERT_EQ(9, result.getRowGroupIndices()[5]);
- ASSERT_EQ(10, result.getRowGroupIndices()[6]);
- ASSERT_EQ(12, result.getRowGroupIndices()[7]);
+ ASSERT_EQ(8ul, result.getRowGroupIndices().size());
+ ASSERT_EQ(9ul, result.getRowGroupIndices()[5]);
+ ASSERT_EQ(10ul, result.getRowGroupIndices()[6]);
+ ASSERT_EQ(12ul, result.getRowGroupIndices()[7]);
- ASSERT_EQ(7, result.getColumnCount());
- ASSERT_EQ(12, result.getRowCount());
- ASSERT_EQ(23, result.getEntryCount());
+ ASSERT_EQ(7ul, result.getColumnCount());
+ ASSERT_EQ(12ul, result.getRowCount());
+ ASSERT_EQ(23ul, result.getEntryCount());
storm::storage::SparseMatrix<double>::const_iterator cIter = result.begin(8);
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.7, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.3, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
cIter++;
- ASSERT_EQ(1, cIter->getColumn());
+ ASSERT_EQ(1ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(4, cIter->getColumn());
+ ASSERT_EQ(4ul, cIter->getColumn());
ASSERT_EQ(0.2, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(0.6, cIter->getValue());
cIter++;
- ASSERT_EQ(5, cIter->getColumn());
+ ASSERT_EQ(5ul, cIter->getColumn());
ASSERT_EQ(1, cIter->getValue());
}
diff --git a/test/functional/parser/PrismParserTest.cpp b/test/functional/parser/PrismParserTest.cpp
index 1eded2bd7..90b4f8e5d 100644
--- a/test/functional/parser/PrismParserTest.cpp
+++ b/test/functional/parser/PrismParserTest.cpp
@@ -27,7 +27,7 @@ TEST(PrismParser, SimpleTest) {
storm::prism::Program result;
EXPECT_NO_THROW(result = storm::parser::PrismParser::parseFromString(testInput, "testfile"));
- EXPECT_EQ(1, result.getNumberOfModules());
+ EXPECT_EQ(1ul, result.getNumberOfModules());
EXPECT_EQ(storm::prism::Program::ModelType::DTMC, result.getModelType());
testInput =
diff --git a/test/functional/storage/BitVectorTest.cpp b/test/functional/storage/BitVectorTest.cpp
index 687f0bbfc..88715dff7 100644
--- a/test/functional/storage/BitVectorTest.cpp
+++ b/test/functional/storage/BitVectorTest.cpp
@@ -455,7 +455,7 @@ TEST(BitVectorTest, NumberOfSetBitsBeforeIndex) {
vector.set(i, i % 2 == 0);
}
- ASSERT_EQ(7, vector.getNumberOfSetBitsBeforeIndex(14));
+ ASSERT_EQ(7ul, vector.getNumberOfSetBitsBeforeIndex(14));
}
TEST(BitVectorTest, BeginEnd) {
@@ -478,10 +478,10 @@ TEST(BitVectorTest, NextSetIndex) {
vector.set(14);
vector.set(17);
- ASSERT_EQ(14, vector.getNextSetIndex(14));
- ASSERT_EQ(17, vector.getNextSetIndex(15));
- ASSERT_EQ(17, vector.getNextSetIndex(16));
- ASSERT_EQ(17, vector.getNextSetIndex(17));
+ ASSERT_EQ(14ul, vector.getNextSetIndex(14));
+ ASSERT_EQ(17ul, vector.getNextSetIndex(15));
+ ASSERT_EQ(17ul, vector.getNextSetIndex(16));
+ ASSERT_EQ(17ul, vector.getNextSetIndex(17));
ASSERT_EQ(vector.size(), vector.getNextSetIndex(18));
}
diff --git a/test/functional/storage/CuddDdTest.cpp b/test/functional/storage/CuddDdTest.cpp
index f8b149c2d..ea15855fa 100644
--- a/test/functional/storage/CuddDdTest.cpp
+++ b/test/functional/storage/CuddDdTest.cpp
@@ -11,27 +11,27 @@ TEST(CuddDdManager, Constants) {
storm::dd::Add<storm::dd::DdType::CUDD> zero;
ASSERT_NO_THROW(zero = manager->getAddZero());
- EXPECT_EQ(0, zero.getNonZeroCount());
- EXPECT_EQ(1, zero.getLeafCount());
- EXPECT_EQ(1, zero.getNodeCount());
+ EXPECT_EQ(0ul, zero.getNonZeroCount());
+ EXPECT_EQ(1ul, zero.getLeafCount());
+ EXPECT_EQ(1ul, zero.getNodeCount());
EXPECT_EQ(0, zero.getMin());
EXPECT_EQ(0, zero.getMax());
storm::dd::Add<storm::dd::DdType::CUDD> one;
ASSERT_NO_THROW(one = manager->getAddOne());
- EXPECT_EQ(1, one.getNonZeroCount());
- EXPECT_EQ(1, one.getLeafCount());
- EXPECT_EQ(1, one.getNodeCount());
+ EXPECT_EQ(1ul, one.getNonZeroCount());
+ EXPECT_EQ(1ul, one.getLeafCount());
+ EXPECT_EQ(1ul, one.getNodeCount());
EXPECT_EQ(1, one.getMin());
EXPECT_EQ(1, one.getMax());
storm::dd::Add<storm::dd::DdType::CUDD> two;
ASSERT_NO_THROW(two = manager->getConstant(2));
- EXPECT_EQ(1, two.getNonZeroCount());
- EXPECT_EQ(1, two.getLeafCount());
- EXPECT_EQ(1, two.getNodeCount());
+ EXPECT_EQ(1ul, two.getNonZeroCount());
+ EXPECT_EQ(1ul, two.getLeafCount());
+ EXPECT_EQ(1ul, two.getNodeCount());
EXPECT_EQ(2, two.getMin());
EXPECT_EQ(2, two.getMax());
}
@@ -39,12 +39,12 @@ TEST(CuddDdManager, Constants) {
TEST(CuddDdManager, AddGetMetaVariableTest) {
std::shared_ptr<storm::dd::DdManager<storm::dd::DdType::CUDD>> manager(new storm::dd::DdManager<storm::dd::DdType::CUDD>());
ASSERT_NO_THROW(manager->addMetaVariable("x", 1, 9));
- EXPECT_EQ(2, manager->getNumberOfMetaVariables());
+ EXPECT_EQ(2ul, manager->getNumberOfMetaVariables());
ASSERT_THROW(manager->addMetaVariable("x", 0, 3), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(manager->addMetaVariable("y", 0, 3));
- EXPECT_EQ(4, manager->getNumberOfMetaVariables());
+ EXPECT_EQ(4ul, manager->getNumberOfMetaVariables());
EXPECT_TRUE(manager->hasMetaVariable("x'"));
EXPECT_TRUE(manager->hasMetaVariable("y'"));
@@ -61,16 +61,16 @@ TEST(CuddDdManager, EncodingTest) {
ASSERT_THROW(encoding = manager->getEncoding(x.first, 0), storm::exceptions::InvalidArgumentException);
ASSERT_THROW(encoding = manager->getEncoding(x.first, 10), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(encoding = manager->getEncoding(x.first, 4));
- EXPECT_EQ(1, encoding.getNonZeroCount());
+ EXPECT_EQ(1ul, encoding.getNonZeroCount());
// As a BDD, this DD has one only leaf, because there does not exist a 0-leaf, and (consequently) one node less
// than the MTBDD.
- EXPECT_EQ(5, encoding.getNodeCount());
- EXPECT_EQ(1, encoding.getLeafCount());
+ EXPECT_EQ(5ul, encoding.getNodeCount());
+ EXPECT_EQ(1ul, encoding.getLeafCount());
// As an MTBDD, the 0-leaf is there, so the count is actually 2 and the node count is 6.
- EXPECT_EQ(6, encoding.toAdd().getNodeCount());
- EXPECT_EQ(2, encoding.toAdd().getLeafCount());
+ EXPECT_EQ(6ul, encoding.toAdd().getNodeCount());
+ EXPECT_EQ(2ul, encoding.toAdd().getLeafCount());
}
TEST(CuddDdManager, RangeTest) {
@@ -81,9 +81,9 @@ TEST(CuddDdManager, RangeTest) {
storm::dd::Bdd<storm::dd::DdType::CUDD> range;
ASSERT_NO_THROW(range = manager->getRange(x.first));
- EXPECT_EQ(9, range.getNonZeroCount());
- EXPECT_EQ(1, range.getLeafCount());
- EXPECT_EQ(5, range.getNodeCount());
+ EXPECT_EQ(9ul, range.getNonZeroCount());
+ EXPECT_EQ(1ul, range.getLeafCount());
+ EXPECT_EQ(5ul, range.getNodeCount());
}
TEST(CuddDdManager, IdentityTest) {
@@ -93,9 +93,9 @@ TEST(CuddDdManager, IdentityTest) {
storm::dd::Add<storm::dd::DdType::CUDD> identity;
ASSERT_NO_THROW(identity = manager->getIdentity(x.first));
- EXPECT_EQ(9, identity.getNonZeroCount());
- EXPECT_EQ(10, identity.getLeafCount());
- EXPECT_EQ(21, identity.getNodeCount());
+ EXPECT_EQ(9ul, identity.getNonZeroCount());
+ EXPECT_EQ(10ul, identity.getLeafCount());
+ EXPECT_EQ(21ul, identity.getNodeCount());
}
TEST(CuddDd, OperatorTest) {
@@ -143,26 +143,26 @@ TEST(CuddDd, OperatorTest) {
dd2 = manager->getConstant(5);
dd3 = dd1.equals(dd2);
- EXPECT_EQ(1, dd3.getNonZeroCount());
+ EXPECT_EQ(1ul, dd3.getNonZeroCount());
storm::dd::Add<storm::dd::DdType::CUDD> dd4 = dd1.notEquals(dd2);
EXPECT_TRUE(dd4.toBdd() == !dd3.toBdd());
dd3 = dd1.less(dd2);
- EXPECT_EQ(11, dd3.getNonZeroCount());
+ EXPECT_EQ(11ul, dd3.getNonZeroCount());
dd3 = dd1.lessOrEqual(dd2);
- EXPECT_EQ(12, dd3.getNonZeroCount());
+ EXPECT_EQ(12ul, dd3.getNonZeroCount());
dd3 = dd1.greater(dd2);
- EXPECT_EQ(4, dd3.getNonZeroCount());
+ EXPECT_EQ(4ul, dd3.getNonZeroCount());
dd3 = dd1.greaterOrEqual(dd2);
- EXPECT_EQ(5, dd3.getNonZeroCount());
+ EXPECT_EQ(5ul, dd3.getNonZeroCount());
dd3 = (manager->getEncoding(x.first, 2).toAdd()).ite(dd2, dd1);
dd4 = dd3.less(dd2);
- EXPECT_EQ(10, dd4.getNonZeroCount());
+ EXPECT_EQ(10ul, dd4.getNonZeroCount());
dd4 = dd3.minimum(dd1);
dd4 *= manager->getEncoding(x.first, 2).toAdd();
@@ -191,15 +191,15 @@ TEST(CuddDd, AbstractionTest) {
dd2 = manager->getConstant(5);
dd3 = dd1.equals(dd2);
storm::dd::Bdd<storm::dd::DdType::CUDD> dd3Bdd = dd3.toBdd();
- EXPECT_EQ(1, dd3Bdd.getNonZeroCount());
+ EXPECT_EQ(1ul, dd3Bdd.getNonZeroCount());
ASSERT_THROW(dd3Bdd = dd3Bdd.existsAbstract({x.second}), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(dd3Bdd = dd3Bdd.existsAbstract({x.first}));
- EXPECT_EQ(1, dd3Bdd.getNonZeroCount());
+ EXPECT_EQ(1ul, dd3Bdd.getNonZeroCount());
EXPECT_EQ(1, dd3Bdd.toAdd().getMax());
dd3 = dd1.equals(dd2);
dd3 *= manager->getConstant(3);
- EXPECT_EQ(1, dd3.getNonZeroCount());
+ EXPECT_EQ(1ul, dd3.getNonZeroCount());
ASSERT_THROW(dd3Bdd = dd3.toBdd().existsAbstract({x.second}), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(dd3Bdd = dd3.toBdd().existsAbstract({x.first}));
EXPECT_TRUE(dd3Bdd.isOne());
@@ -208,21 +208,21 @@ TEST(CuddDd, AbstractionTest) {
dd3 *= manager->getConstant(3);
ASSERT_THROW(dd3 = dd3.sumAbstract({x.second}), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(dd3 = dd3.sumAbstract({x.first}));
- EXPECT_EQ(1, dd3.getNonZeroCount());
+ EXPECT_EQ(1ul, dd3.getNonZeroCount());
EXPECT_EQ(3, dd3.getMax());
dd3 = dd1.equals(dd2);
dd3 *= manager->getConstant(3);
ASSERT_THROW(dd3 = dd3.minAbstract({x.second}), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(dd3 = dd3.minAbstract({x.first}));
- EXPECT_EQ(0, dd3.getNonZeroCount());
+ EXPECT_EQ(0ul, dd3.getNonZeroCount());
EXPECT_EQ(0, dd3.getMax());
dd3 = dd1.equals(dd2);
dd3 *= manager->getConstant(3);
ASSERT_THROW(dd3 = dd3.maxAbstract({x.second}), storm::exceptions::InvalidArgumentException);
ASSERT_NO_THROW(dd3 = dd3.maxAbstract({x.first}));
- EXPECT_EQ(1, dd3.getNonZeroCount());
+ EXPECT_EQ(1ul, dd3.getNonZeroCount());
EXPECT_EQ(3, dd3.getMax());
}
@@ -260,7 +260,7 @@ TEST(CuddDd, GetSetValueTest) {
storm::dd::Add<storm::dd::DdType::CUDD> dd1 = manager->getAddOne();
ASSERT_NO_THROW(dd1.setValue(x.first, 4, 2));
- EXPECT_EQ(2, dd1.getLeafCount());
+ EXPECT_EQ(2ul, dd1.getLeafCount());
std::map<storm::expressions::Variable, int_fast64_t> metaVariableToValueMap;
metaVariableToValueMap.emplace(x.first, 1);
@@ -289,7 +289,7 @@ TEST(CuddDd, ForwardIteratorTest) {
ASSERT_NO_THROW(++it);
++numberOfValuations;
}
- EXPECT_EQ(9, numberOfValuations);
+ EXPECT_EQ(9ul, numberOfValuations);
dd = manager->getRange(x.first).toAdd();
dd = dd.ite(manager->getAddOne(), manager->getAddOne());
@@ -301,7 +301,7 @@ TEST(CuddDd, ForwardIteratorTest) {
ASSERT_NO_THROW(++it);
++numberOfValuations;
}
- EXPECT_EQ(16, numberOfValuations);
+ EXPECT_EQ(16ul, numberOfValuations);
ASSERT_NO_THROW(it = dd.begin(false));
ASSERT_NO_THROW(ite = dd.end());
@@ -311,7 +311,7 @@ TEST(CuddDd, ForwardIteratorTest) {
ASSERT_NO_THROW(++it);
++numberOfValuations;
}
- EXPECT_EQ(1, numberOfValuations);
+ EXPECT_EQ(1ul, numberOfValuations);
}
TEST(CuddDd, AddOddTest) {
@@ -322,12 +322,12 @@ TEST(CuddDd, AddOddTest) {
storm::dd::Add<storm::dd::DdType::CUDD> dd = manager->getIdentity(x.first);
storm::dd::Odd<storm::dd::DdType::CUDD> odd;
ASSERT_NO_THROW(odd = storm::dd::Odd<storm::dd::DdType::CUDD>(dd));
- EXPECT_EQ(9, odd.getTotalOffset());
- EXPECT_EQ(12, odd.getNodeCount());
+ EXPECT_EQ(9ul, odd.getTotalOffset());
+ EXPECT_EQ(12ul, odd.getNodeCount());
std::vector<double> ddAsVector;
ASSERT_NO_THROW(ddAsVector = dd.toVector<double>());
- EXPECT_EQ(9, ddAsVector.size());
+ EXPECT_EQ(9ul, ddAsVector.size());
for (uint_fast64_t i = 0; i < ddAsVector.size(); ++i) {
EXPECT_TRUE(i+1 == ddAsVector[i]);
}
@@ -346,16 +346,16 @@ TEST(CuddDd, AddOddTest) {
storm::storage::SparseMatrix<double> matrix;
ASSERT_NO_THROW(matrix = dd.toMatrix({x.first}, {x.second}, rowOdd, columnOdd));
- EXPECT_EQ(9, matrix.getRowCount());
- EXPECT_EQ(9, matrix.getColumnCount());
- EXPECT_EQ(25, matrix.getNonzeroEntryCount());
+ EXPECT_EQ(9ul, matrix.getRowCount());
+ EXPECT_EQ(9ul, matrix.getColumnCount());
+ EXPECT_EQ(25ul, matrix.getNonzeroEntryCount());
dd = manager->getRange(x.first).toAdd() * manager->getRange(x.second).toAdd() * manager->getEncoding(a.first, 0).toAdd().ite(dd, dd + manager->getConstant(1));
ASSERT_NO_THROW(matrix = dd.toMatrix({a.first}, rowOdd, columnOdd));
- EXPECT_EQ(18, matrix.getRowCount());
- EXPECT_EQ(9, matrix.getRowGroupCount());
- EXPECT_EQ(9, matrix.getColumnCount());
- EXPECT_EQ(106, matrix.getNonzeroEntryCount());
+ EXPECT_EQ(18ul, matrix.getRowCount());
+ EXPECT_EQ(9ul, matrix.getRowGroupCount());
+ EXPECT_EQ(9ul, matrix.getColumnCount());
+ EXPECT_EQ(106ul, matrix.getNonzeroEntryCount());
}
TEST(CuddDd, BddOddTest) {
@@ -393,14 +393,14 @@ TEST(CuddDd, BddOddTest) {
storm::storage::SparseMatrix<double> matrix;
ASSERT_NO_THROW(matrix = dd.toMatrix({x.first}, {x.second}, rowOdd, columnOdd));
- EXPECT_EQ(9, matrix.getRowCount());
- EXPECT_EQ(9, matrix.getColumnCount());
- EXPECT_EQ(25, matrix.getNonzeroEntryCount());
+ EXPECT_EQ(9ul, matrix.getRowCount());
+ EXPECT_EQ(9ul, matrix.getColumnCount());
+ EXPECT_EQ(25ul, matrix.getNonzeroEntryCount());
dd = manager->getRange(x.first).toAdd() * manager->getRange(x.second).toAdd() * manager->getEncoding(a.first, 0).toAdd().ite(dd, dd + manager->getConstant(1));
ASSERT_NO_THROW(matrix = dd.toMatrix({a.first}, rowOdd, columnOdd));
- EXPECT_EQ(18, matrix.getRowCount());
- EXPECT_EQ(9, matrix.getRowGroupCount());
- EXPECT_EQ(9, matrix.getColumnCount());
- EXPECT_EQ(106, matrix.getNonzeroEntryCount());
+ EXPECT_EQ(18ul, matrix.getRowCount());
+ EXPECT_EQ(9ul, matrix.getRowGroupCount());
+ EXPECT_EQ(9ul, matrix.getColumnCount());
+ EXPECT_EQ(106ul, matrix.getNonzeroEntryCount());
}
\ No newline at end of file
diff --git a/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp b/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp
index fa6c274a2..d8c0433a2 100644
--- a/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp
+++ b/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp
@@ -62,7 +62,7 @@ TEST(StronglyConnectedComponentDecomposition, FullSystem2) {
storm::storage::StronglyConnectedComponentDecomposition<double> sccDecomposition;
ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition<double>(*markovAutomaton, true, false));
- ASSERT_EQ(sccDecomposition.size(), 2);
+ ASSERT_EQ(2ul, sccDecomposition.size());
// Now, because there is no ordering we have to check the contents of the MECs in a symmetrical way.
storm::storage::StateBlock const& scc1 = sccDecomposition[0];