From e338cbe069393d33d7e58a617bab361dcce51a6c Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 10 Aug 2015 17:50:25 +0200 Subject: [PATCH] fixed a lot of warnings in the tests Former-commit-id: b6752202acd33fdeecbf7b0f398b49fc95d1486f --- src/solver/GmmxxLinearEquationSolver.cpp | 2 + src/solver/NativeLinearEquationSolver.cpp | 1 + .../TopologicalMinMaxLinearEquationSolver.cpp | 2 - .../BinaryBooleanFunctionExpression.cpp | 12 +-- .../NativeHybridMdpPrctlModelCheckerTest.cpp | 8 +- .../AtomicPropositionLabelingParserTest.cpp | 2 +- test/functional/parser/AutoParserTest.cpp | 22 ++--- .../parser/DeterministicModelParserTest.cpp | 24 ++--- ...eterministicSparseTransitionParserTest.cpp | 90 +++++++++---------- .../parser/MarkovAutomatonParserTest.cpp | 14 +-- ...kovAutomatonSparseTransitionParserTest.cpp | 56 ++++++------ test/functional/parser/PrismParserTest.cpp | 8 +- test/functional/solver/GlpkLpSolverTest.cpp | 48 ++++------ .../storage/BitVectorHashMapTest.cpp | 14 +-- test/functional/storage/BitVectorTest.cpp | 6 +- ...sticModelBisimulationDecompositionTest.cpp | 40 ++++----- .../MaximalEndComponentDecompositionTest.cpp | 6 +- test/functional/storage/SchedulerTest.cpp | 10 +-- test/functional/storage/SparseMatrixTest.cpp | 50 +++++------ ...glyConnectedComponentDecompositionTest.cpp | 14 +-- test/functional/utility/GraphTest.cpp | 88 +++++++++--------- 21 files changed, 252 insertions(+), 265 deletions(-) diff --git a/src/solver/GmmxxLinearEquationSolver.cpp b/src/solver/GmmxxLinearEquationSolver.cpp index bd43c3e88..835d2194e 100644 --- a/src/solver/GmmxxLinearEquationSolver.cpp +++ b/src/solver/GmmxxLinearEquationSolver.cpp @@ -207,6 +207,7 @@ namespace storm { case SolutionMethod::Qmr: return "qmr"; case SolutionMethod::Gmres: return "gmres"; case SolutionMethod::Jacobi: return "jacobi"; + default: return "invalid"; } } @@ -216,6 +217,7 @@ namespace storm { case Preconditioner::Ilu: return "ilu"; case Preconditioner::Diagonal: return "diagonal"; case Preconditioner::None: return "none"; + default: return "invalid"; } } diff --git a/src/solver/NativeLinearEquationSolver.cpp b/src/solver/NativeLinearEquationSolver.cpp index 35deef1a3..ea8d4bf4d 100644 --- a/src/solver/NativeLinearEquationSolver.cpp +++ b/src/solver/NativeLinearEquationSolver.cpp @@ -158,6 +158,7 @@ namespace storm { case SolutionMethod::Jacobi: return "jacobi"; case SolutionMethod::GaussSeidel: return "gauss-seidel"; case SolutionMethod::SOR: return "sor"; + default: return "invalid"; } } diff --git a/src/solver/TopologicalMinMaxLinearEquationSolver.cpp b/src/solver/TopologicalMinMaxLinearEquationSolver.cpp index 3180f0a41..fc2725a3b 100644 --- a/src/solver/TopologicalMinMaxLinearEquationSolver.cpp +++ b/src/solver/TopologicalMinMaxLinearEquationSolver.cpp @@ -152,8 +152,6 @@ namespace storm { // Iterate over all SCCs of the MDP as specified by the topological sort. This guarantees that an SCC is only // solved after all SCCs it depends on have been solved. - int counter = 0; - for (auto sccIndexIt = optimalSccs.cbegin(); sccIndexIt != optimalSccs.cend() && converged; ++sccIndexIt) { bool const useGpu = sccIndexIt->first; storm::storage::StateBlock const& scc = sccIndexIt->second; diff --git a/src/storage/expressions/BinaryBooleanFunctionExpression.cpp b/src/storage/expressions/BinaryBooleanFunctionExpression.cpp index d5db82905..68a643329 100644 --- a/src/storage/expressions/BinaryBooleanFunctionExpression.cpp +++ b/src/storage/expressions/BinaryBooleanFunctionExpression.cpp @@ -15,13 +15,15 @@ namespace storm { } storm::expressions::OperatorType BinaryBooleanFunctionExpression::getOperator() const { + storm::expressions::OperatorType result = storm::expressions::OperatorType::And; switch (this->getOperatorType()) { - case OperatorType::And: return storm::expressions::OperatorType::And; break; - case OperatorType::Or: return storm::expressions::OperatorType::Or; break; - case OperatorType::Xor: return storm::expressions::OperatorType::Xor; break; - case OperatorType::Implies: return storm::expressions::OperatorType::Implies; break; - case OperatorType::Iff: return storm::expressions::OperatorType::Iff; break; + case OperatorType::And: result = storm::expressions::OperatorType::And; break; + case OperatorType::Or: result = storm::expressions::OperatorType::Or; break; + case OperatorType::Xor: result = storm::expressions::OperatorType::Xor; break; + case OperatorType::Implies: result = storm::expressions::OperatorType::Implies; break; + case OperatorType::Iff: result = storm::expressions::OperatorType::Iff; break; } + return result; } bool BinaryBooleanFunctionExpression::evaluateAsBool(Valuation const* valuation) const { diff --git a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp index b16504b7f..a74d9059d 100644 --- a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp @@ -24,8 +24,8 @@ TEST(NativeHybridMdpPrctlModelCheckerTest, Dice) { options.buildRewards = true; options.rewardModelName = "coinflips"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); - EXPECT_EQ(169, model->getNumberOfStates()); - EXPECT_EQ(436, model->getNumberOfTransitions()); + EXPECT_EQ(169ul, model->getNumberOfStates()); + EXPECT_EQ(436ul, model->getNumberOfTransitions()); ASSERT_EQ(model->getType(), storm::models::ModelType::Mdp); @@ -126,8 +126,8 @@ TEST(NativeHybridMdpPrctlModelCheckerTest, AsynchronousLeader) { options.buildRewards = true; options.rewardModelName = "rounds"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); - EXPECT_EQ(3172, model->getNumberOfStates()); - EXPECT_EQ(7144, model->getNumberOfTransitions()); + EXPECT_EQ(3172ul, model->getNumberOfStates()); + EXPECT_EQ(7144ul, model->getNumberOfTransitions()); ASSERT_EQ(model->getType(), storm::models::ModelType::Mdp); diff --git a/test/functional/parser/AtomicPropositionLabelingParserTest.cpp b/test/functional/parser/AtomicPropositionLabelingParserTest.cpp index d97745520..ef1e66a08 100644 --- a/test/functional/parser/AtomicPropositionLabelingParserTest.cpp +++ b/test/functional/parser/AtomicPropositionLabelingParserTest.cpp @@ -102,7 +102,7 @@ TEST(AtomicPropositionLabelingParserTest, MisspelledEndTagHeader) { TEST(AtomicPropositionLabelingParserTest, NoLabelDeclaredNoneGiven) { // No label between #DECLARATION and #END and no labels given. storm::models::sparse::StateLabeling labeling = storm::parser::AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(13, STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/labParser/noLabelsDecNoneGiven.lab"); - ASSERT_EQ(labeling.getNumberOfLabels(), 0); + ASSERT_EQ(0ul, labeling.getNumberOfLabels()); for(uint_fast64_t i = 0; i < 13; i++) { ASSERT_TRUE(labeling.getLabelsOfState(i).empty()); } diff --git a/test/functional/parser/AutoParserTest.cpp b/test/functional/parser/AutoParserTest.cpp index a00423cff..0894baef0 100644 --- a/test/functional/parser/AutoParserTest.cpp +++ b/test/functional/parser/AutoParserTest.cpp @@ -16,9 +16,9 @@ TEST(AutoParserTest, BasicParsing) { // Test if parsed correctly. ASSERT_EQ(storm::models::ModelType::Dtmc, modelPtr->getType()); - ASSERT_EQ(12, modelPtr->getNumberOfStates()); - ASSERT_EQ(26, modelPtr->getNumberOfTransitions()); - ASSERT_EQ(1, modelPtr->getInitialStates().getNumberOfSetBits()); + ASSERT_EQ(12ul, modelPtr->getNumberOfStates()); + ASSERT_EQ(26ul, modelPtr->getNumberOfTransitions()); + ASSERT_EQ(1ul, modelPtr->getInitialStates().getNumberOfSetBits()); ASSERT_TRUE(modelPtr->hasLabel("three")); ASSERT_FALSE(modelPtr->hasStateRewards()); ASSERT_FALSE(modelPtr->hasTransitionRewards()); @@ -40,27 +40,27 @@ TEST(AutoParserTest, Decision) { // Dtmc std::shared_ptr> modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/dtmc.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab"); ASSERT_EQ(storm::models::ModelType::Dtmc, modelPtr->getType()); - ASSERT_EQ(12, modelPtr->getNumberOfStates()); - ASSERT_EQ(26, modelPtr->getNumberOfTransitions()); + ASSERT_EQ(12ul, modelPtr->getNumberOfStates()); + ASSERT_EQ(26ul, modelPtr->getNumberOfTransitions()); // Ctmc modelPtr.reset(); modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/ctmc.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab"); ASSERT_EQ(storm::models::ModelType::Ctmc, modelPtr->getType()); - ASSERT_EQ(12, modelPtr->getNumberOfStates()); - ASSERT_EQ(26, modelPtr->getNumberOfTransitions()); + ASSERT_EQ(12ul, modelPtr->getNumberOfStates()); + ASSERT_EQ(26ul, modelPtr->getNumberOfTransitions()); // Mdp modelPtr.reset(); modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/mdp.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab"); ASSERT_EQ(storm::models::ModelType::Mdp, modelPtr->getType()); - ASSERT_EQ(12, modelPtr->getNumberOfStates()); - ASSERT_EQ(28, modelPtr->getNumberOfTransitions()); + ASSERT_EQ(12ul, modelPtr->getNumberOfStates()); + ASSERT_EQ(28ul, modelPtr->getNumberOfTransitions()); // MA modelPtr.reset(); modelPtr = storm::parser::AutoParser::parseModel(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/autoParser/ma.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/autoParser.lab"); ASSERT_EQ(storm::models::ModelType::MarkovAutomaton, modelPtr->getType()); - ASSERT_EQ(12, modelPtr->getNumberOfStates()); - ASSERT_EQ(27, modelPtr->getNumberOfTransitions()); + ASSERT_EQ(12ul, modelPtr->getNumberOfStates()); + ASSERT_EQ(27ul, modelPtr->getNumberOfTransitions()); } diff --git a/test/functional/parser/DeterministicModelParserTest.cpp b/test/functional/parser/DeterministicModelParserTest.cpp index 30f963326..305df7e46 100644 --- a/test/functional/parser/DeterministicModelParserTest.cpp +++ b/test/functional/parser/DeterministicModelParserTest.cpp @@ -18,14 +18,14 @@ TEST(DeterministicModelParserTest, BasicDtmcParsing) { // Parse a Dtmc and check the result. storm::models::sparse::Dtmc dtmc(storm::parser::DeterministicModelParser::parseDtmc(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_general.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/dtmc_general.lab", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/dtmc_general.state.rew", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/dtmc_general.trans.rew")); - ASSERT_EQ(8, dtmc.getNumberOfStates()); - ASSERT_EQ(16, dtmc.getNumberOfTransitions()); + ASSERT_EQ(8ul, dtmc.getNumberOfStates()); + ASSERT_EQ(16ul, dtmc.getNumberOfTransitions()); - ASSERT_EQ(2, dtmc.getInitialStates().getNumberOfSetBits()); + ASSERT_EQ(2ul, dtmc.getInitialStates().getNumberOfSetBits()); ASSERT_TRUE(dtmc.getInitialStates().get(0)); ASSERT_TRUE(dtmc.getInitialStates().get(7)); - ASSERT_EQ(5, dtmc.getStateLabeling().getNumberOfLabels()); - ASSERT_EQ(2, dtmc.getLabelsOfState(6).size()); + ASSERT_EQ(5ul, dtmc.getStateLabeling().getNumberOfLabels()); + ASSERT_EQ(2ul, dtmc.getLabelsOfState(6).size()); ASSERT_TRUE(dtmc.hasStateRewards()); ASSERT_EQ(42, dtmc.getStateRewardVector()[7]); @@ -36,7 +36,7 @@ TEST(DeterministicModelParserTest, BasicDtmcParsing) { ASSERT_EQ(263.32, rewardSum); ASSERT_TRUE(dtmc.hasTransitionRewards()); - ASSERT_EQ(17, dtmc.getTransitionRewardMatrix().getEntryCount()); + ASSERT_EQ(17ul, dtmc.getTransitionRewardMatrix().getEntryCount()); rewardSum = 0; for(uint_fast64_t i = 0; i < dtmc.getTransitionRewardMatrix().getRowCount(); i++) { rewardSum += dtmc.getTransitionRewardMatrix().getRowSum(i); @@ -50,14 +50,14 @@ TEST(DeterministicModelParserTest, BasicCtmcParsing) { // Parse a Ctmc and check the result. storm::models::sparse::Ctmc ctmc(storm::parser::DeterministicModelParser::parseCtmc(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_general.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/dtmc_general.lab", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/dtmc_general.state.rew", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/dtmc_general.trans.rew")); - ASSERT_EQ(8, ctmc.getNumberOfStates()); - ASSERT_EQ(16, ctmc.getNumberOfTransitions()); + ASSERT_EQ(8ul, ctmc.getNumberOfStates()); + ASSERT_EQ(16ul, ctmc.getNumberOfTransitions()); - ASSERT_EQ(2, ctmc.getInitialStates().getNumberOfSetBits()); + ASSERT_EQ(2ul, ctmc.getInitialStates().getNumberOfSetBits()); ASSERT_TRUE(ctmc.getInitialStates().get(0)); ASSERT_TRUE(ctmc.getInitialStates().get(7)); - ASSERT_EQ(5, ctmc.getStateLabeling().getNumberOfLabels()); - ASSERT_EQ(2, ctmc.getLabelsOfState(6).size()); + ASSERT_EQ(5ul, ctmc.getStateLabeling().getNumberOfLabels()); + ASSERT_EQ(2ul, ctmc.getLabelsOfState(6).size()); ASSERT_TRUE(ctmc.hasStateRewards()); ASSERT_EQ(42, ctmc.getStateRewardVector()[7]); @@ -68,7 +68,7 @@ TEST(DeterministicModelParserTest, BasicCtmcParsing) { ASSERT_EQ(263.32, rewardSum); ASSERT_TRUE(ctmc.hasTransitionRewards()); - ASSERT_EQ(17, ctmc.getTransitionRewardMatrix().getEntryCount()); + ASSERT_EQ(17ul, ctmc.getTransitionRewardMatrix().getEntryCount()); rewardSum = 0; for(uint_fast64_t i = 0; i < ctmc.getTransitionRewardMatrix().getRowCount(); i++) { rewardSum += ctmc.getTransitionRewardMatrix().getRowSum(i); diff --git a/test/functional/parser/DeterministicSparseTransitionParserTest.cpp b/test/functional/parser/DeterministicSparseTransitionParserTest.cpp index 90d059309..517ff1b3b 100644 --- a/test/functional/parser/DeterministicSparseTransitionParserTest.cpp +++ b/test/functional/parser/DeterministicSparseTransitionParserTest.cpp @@ -29,73 +29,73 @@ TEST(DeterministicSparseTransitionParserTest, BasicTransitionsParsing) { // Parse a deterministic transitions file and test the resulting matrix. storm::storage::SparseMatrix transitionMatrix = storm::parser::DeterministicSparseTransitionParser::parseDeterministicTransitions(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_general.tra"); - ASSERT_EQ(8, transitionMatrix.getColumnCount()); - ASSERT_EQ(21, transitionMatrix.getEntryCount()); + ASSERT_EQ(8ul, transitionMatrix.getColumnCount()); + ASSERT_EQ(21ul, transitionMatrix.getEntryCount()); // Test every entry of the matrix. storm::storage::SparseMatrix::const_iterator cIter = transitionMatrix.begin(0); - ASSERT_EQ(0, cIter->getColumn()); + ASSERT_EQ(0ul, cIter->getColumn()); ASSERT_EQ(0, cIter->getValue()); cIter++; - ASSERT_EQ(1, cIter->getColumn()); + ASSERT_EQ(1ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(1, cIter->getColumn()); + ASSERT_EQ(1ul, cIter->getColumn()); ASSERT_EQ(0, 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(0, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(0.4, cIter->getValue()); cIter++; - ASSERT_EQ(4, cIter->getColumn()); + ASSERT_EQ(4ul, cIter->getColumn()); ASSERT_EQ(0.4, cIter->getValue()); cIter++; - ASSERT_EQ(5, cIter->getColumn()); + ASSERT_EQ(5ul, cIter->getColumn()); ASSERT_EQ(0.2, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(4, cIter->getColumn()); + ASSERT_EQ(4ul, cIter->getColumn()); ASSERT_EQ(0, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(0.1, cIter->getValue()); cIter++; - ASSERT_EQ(4, cIter->getColumn()); + ASSERT_EQ(4ul, cIter->getColumn()); ASSERT_EQ(0.1, cIter->getValue()); cIter++; - ASSERT_EQ(5, cIter->getColumn()); + ASSERT_EQ(5ul, cIter->getColumn()); ASSERT_EQ(0.1, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(0.7, cIter->getValue()); cIter++; - ASSERT_EQ(0, cIter->getColumn()); + ASSERT_EQ(0ul, cIter->getColumn()); ASSERT_EQ(0.9, cIter->getValue()); cIter++; - ASSERT_EQ(5, cIter->getColumn()); + ASSERT_EQ(5ul, cIter->getColumn()); ASSERT_EQ(0, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(0.1, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(0.224653, cIter->getValue()); cIter++; - ASSERT_EQ(7, cIter->getColumn()); + ASSERT_EQ(7ul, cIter->getColumn()); ASSERT_EQ(0.775347, cIter->getValue()); } @@ -112,55 +112,55 @@ TEST(DeterministicSparseTransitionParserTest, BasicTransitionsRewardsParsing) { // Test every entry of the matrix. storm::storage::SparseMatrix::const_iterator cIter = rewardMatrix.begin(0); - ASSERT_EQ(1, cIter->getColumn()); + ASSERT_EQ(1ul, cIter->getColumn()); ASSERT_EQ(10, cIter->getValue()); cIter++; - ASSERT_EQ(2, cIter->getColumn()); + ASSERT_EQ(2ul, cIter->getColumn()); ASSERT_EQ(5, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(5.5, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(21.4, cIter->getValue()); cIter++; - ASSERT_EQ(4, cIter->getColumn()); + ASSERT_EQ(4ul, cIter->getColumn()); ASSERT_EQ(4, cIter->getValue()); cIter++; - ASSERT_EQ(5, cIter->getColumn()); + ASSERT_EQ(5ul, cIter->getColumn()); ASSERT_EQ(2, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(3, cIter->getColumn()); + ASSERT_EQ(3ul, cIter->getColumn()); ASSERT_EQ(0.1, cIter->getValue()); cIter++; - ASSERT_EQ(4, cIter->getColumn()); + ASSERT_EQ(4ul, cIter->getColumn()); ASSERT_EQ(1.1, cIter->getValue()); cIter++; - ASSERT_EQ(5, cIter->getColumn()); + ASSERT_EQ(5ul, cIter->getColumn()); ASSERT_EQ(9.5, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(6.7, cIter->getValue()); cIter++; - ASSERT_EQ(0, cIter->getColumn()); + ASSERT_EQ(0ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(5, cIter->getColumn()); + ASSERT_EQ(5ul, cIter->getColumn()); ASSERT_EQ(0, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(12, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(35.224653, cIter->getValue()); cIter++; - ASSERT_EQ(7, cIter->getColumn()); + ASSERT_EQ(7ul, cIter->getColumn()); ASSERT_EQ(9.875347, cIter->getValue()); } @@ -196,20 +196,20 @@ TEST(DeterministicSparseTransitionParserTest, FixDeadlocks) { // Parse a transitions file with the fixDeadlocks Flag set and test if it works. storm::storage::SparseMatrix transitionMatrix = storm::parser::DeterministicSparseTransitionParser::parseDeterministicTransitions(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_deadlock.tra"); - ASSERT_EQ(9, transitionMatrix.getColumnCount()); + ASSERT_EQ(9ul, transitionMatrix.getColumnCount()); ASSERT_EQ(23, transitionMatrix.getEntryCount()); storm::storage::SparseMatrix::const_iterator cIter = transitionMatrix.begin(7); - ASSERT_EQ(7, cIter->getColumn()); + ASSERT_EQ(7ul, cIter->getColumn()); ASSERT_EQ(1, cIter->getValue()); cIter++; - ASSERT_EQ(6, cIter->getColumn()); + ASSERT_EQ(6ul, cIter->getColumn()); ASSERT_EQ(0.224653, cIter->getValue()); cIter++; - ASSERT_EQ(7, cIter->getColumn()); + ASSERT_EQ(7ul, cIter->getColumn()); ASSERT_EQ(0.775347, cIter->getValue()); cIter++; - ASSERT_EQ(8, cIter->getColumn()); + ASSERT_EQ(8ul, cIter->getColumn()); ASSERT_EQ(0, cIter->getValue()); } diff --git a/test/functional/parser/MarkovAutomatonParserTest.cpp b/test/functional/parser/MarkovAutomatonParserTest.cpp index fa460ca4d..b104d43fc 100644 --- a/test/functional/parser/MarkovAutomatonParserTest.cpp +++ b/test/functional/parser/MarkovAutomatonParserTest.cpp @@ -16,9 +16,9 @@ TEST(MarkovAutomatonParserTest, BasicParsing) { storm::models::sparse::MarkovAutomaton result = storm::parser::MarkovAutomatonParser::parseMarkovAutomaton(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/ma_general.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/ma_general.lab", STORM_CPP_TESTS_BASE_PATH "/functional/parser/rew_files/ma_general.state.rew"); // Test sizes and counts. - ASSERT_EQ(6, result.getNumberOfStates()); - ASSERT_EQ(7, result.getNumberOfChoices()); - ASSERT_EQ(12, result.getNumberOfTransitions()); + ASSERT_EQ(6ul, result.getNumberOfStates()); + ASSERT_EQ(7ul, result.getNumberOfChoices()); + ASSERT_EQ(12ul, result.getNumberOfTransitions()); // Test the exit rates. These have to be 0 for all non-Markovian states. std::vector rates = result.getExitRates(); @@ -34,10 +34,10 @@ TEST(MarkovAutomatonParserTest, BasicParsing) { ASSERT_EQ(0, result.getExitRate(5)); // Test the labeling. - ASSERT_EQ(3, result.getStateLabeling().getNumberOfLabels()); - ASSERT_EQ(1, result.getInitialStates().getNumberOfSetBits()); - ASSERT_EQ(0, result.getLabelsOfState(4).size()); - ASSERT_EQ(1, result.getStateLabeling().getStates("goal").getNumberOfSetBits()); + ASSERT_EQ(3ul, result.getStateLabeling().getNumberOfLabels()); + ASSERT_EQ(1ul, result.getInitialStates().getNumberOfSetBits()); + ASSERT_EQ(0ul, result.getLabelsOfState(4).size()); + ASSERT_EQ(1ul, result.getStateLabeling().getStates("goal").getNumberOfSetBits()); // Test the state rewards. ASSERT_TRUE(result.hasStateRewards()); diff --git a/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp b/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp index 890d709d0..b8bb2e3cd 100644 --- a/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp +++ b/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp @@ -18,8 +18,8 @@ #include "src/exceptions/WrongFormatException.h" #include "src/exceptions/FileIoException.h" -#define STATE_COUNT 6 -#define CHOICE_COUNT 7 +#define STATE_COUNT 6ul +#define CHOICE_COUNT 7ul TEST(MarkovAutomatonSparseTransitionParserTest, NonExistingFile) { @@ -41,24 +41,24 @@ TEST(MarkovAutomatonSparseTransitionParserTest, BasicParsing) { // Test all sizes and counts. ASSERT_EQ(STATE_COUNT, transitionMatrix.getColumnCount()); ASSERT_EQ(CHOICE_COUNT, transitionMatrix.getRowCount()); - ASSERT_EQ(12, transitionMatrix.getEntryCount()); - ASSERT_EQ(6, transitionMatrix.getRowGroupCount()); - ASSERT_EQ(7, transitionMatrix.getRowGroupIndices().size()); + ASSERT_EQ(12ul, transitionMatrix.getEntryCount()); + ASSERT_EQ(6ul, transitionMatrix.getRowGroupCount()); + ASSERT_EQ(7ul, transitionMatrix.getRowGroupIndices().size()); ASSERT_EQ(CHOICE_COUNT, result.markovianChoices.size()); ASSERT_EQ(STATE_COUNT, result.markovianStates.size()); - ASSERT_EQ(2, result.markovianStates.getNumberOfSetBits()); + ASSERT_EQ(2ul, result.markovianStates.getNumberOfSetBits()); ASSERT_EQ(STATE_COUNT, result.exitRates.size()); // Test the general structure of the transition system (that will be an Markov automaton). // Test the mapping between states and transition matrix rows. - ASSERT_EQ(0, transitionMatrix.getRowGroupIndices()[0]); - ASSERT_EQ(1, transitionMatrix.getRowGroupIndices()[1]); - ASSERT_EQ(2, transitionMatrix.getRowGroupIndices()[2]); - ASSERT_EQ(3, transitionMatrix.getRowGroupIndices()[3]); - ASSERT_EQ(4, transitionMatrix.getRowGroupIndices()[4]); - ASSERT_EQ(6, transitionMatrix.getRowGroupIndices()[5]); - ASSERT_EQ(7, transitionMatrix.getRowGroupIndices()[6]); + ASSERT_EQ(0ul, transitionMatrix.getRowGroupIndices()[0]); + ASSERT_EQ(1ul, transitionMatrix.getRowGroupIndices()[1]); + ASSERT_EQ(2ul, transitionMatrix.getRowGroupIndices()[2]); + ASSERT_EQ(3ul, transitionMatrix.getRowGroupIndices()[3]); + ASSERT_EQ(4ul, transitionMatrix.getRowGroupIndices()[4]); + ASSERT_EQ(6ul, transitionMatrix.getRowGroupIndices()[5]); + ASSERT_EQ(7ul, transitionMatrix.getRowGroupIndices()[6]); // Test the Markovian states. ASSERT_TRUE(result.markovianStates.get(0)); @@ -119,24 +119,24 @@ TEST(MarkovAutomatonSparseTransitionParserTest, Whitespaces) { // Test all sizes and counts. ASSERT_EQ(STATE_COUNT, transitionMatrix.getColumnCount()); ASSERT_EQ(CHOICE_COUNT, transitionMatrix.getRowCount()); - ASSERT_EQ(12, transitionMatrix.getEntryCount()); - ASSERT_EQ(6, transitionMatrix.getRowGroupCount()); - ASSERT_EQ(7, transitionMatrix.getRowGroupIndices().size()); + ASSERT_EQ(12ul, transitionMatrix.getEntryCount()); + ASSERT_EQ(6ul, transitionMatrix.getRowGroupCount()); + ASSERT_EQ(7ul, transitionMatrix.getRowGroupIndices().size()); ASSERT_EQ(CHOICE_COUNT, result.markovianChoices.size()); ASSERT_EQ(STATE_COUNT, result.markovianStates.size()); - ASSERT_EQ(2, result.markovianStates.getNumberOfSetBits()); + ASSERT_EQ(2ul, result.markovianStates.getNumberOfSetBits()); ASSERT_EQ(STATE_COUNT, result.exitRates.size()); // Test the general structure of the transition system (that will be an Markov automaton). // Test the mapping between states and transition matrix rows. - ASSERT_EQ(0, transitionMatrix.getRowGroupIndices()[0]); - ASSERT_EQ(1, transitionMatrix.getRowGroupIndices()[1]); - ASSERT_EQ(2, transitionMatrix.getRowGroupIndices()[2]); - ASSERT_EQ(3, transitionMatrix.getRowGroupIndices()[3]); - ASSERT_EQ(4, transitionMatrix.getRowGroupIndices()[4]); - ASSERT_EQ(6, transitionMatrix.getRowGroupIndices()[5]); - ASSERT_EQ(7, transitionMatrix.getRowGroupIndices()[6]); + ASSERT_EQ(0ul, transitionMatrix.getRowGroupIndices()[0]); + ASSERT_EQ(1ul, transitionMatrix.getRowGroupIndices()[1]); + ASSERT_EQ(2ul, transitionMatrix.getRowGroupIndices()[2]); + ASSERT_EQ(3ul, transitionMatrix.getRowGroupIndices()[3]); + ASSERT_EQ(4ul, transitionMatrix.getRowGroupIndices()[4]); + ASSERT_EQ(6ul, transitionMatrix.getRowGroupIndices()[5]); + ASSERT_EQ(7ul, transitionMatrix.getRowGroupIndices()[6]); // Test the Markovian states. ASSERT_TRUE(result.markovianStates.get(0)); @@ -194,12 +194,12 @@ TEST(MarkovAutomatonSparseTransitionParserTest, FixDeadlocks) { // Test if the result is consistent with the parsed Markov Automaton. storm::storage::SparseMatrix resultMatrix(result.transitionMatrixBuilder.build()); ASSERT_EQ(STATE_COUNT + 1, resultMatrix.getColumnCount()); - ASSERT_EQ(13, resultMatrix.getEntryCount()); - ASSERT_EQ(7, resultMatrix.getRowGroupCount()); - ASSERT_EQ(8, resultMatrix.getRowGroupIndices().size()); + ASSERT_EQ(13ul, resultMatrix.getEntryCount()); + ASSERT_EQ(7ul, resultMatrix.getRowGroupCount()); + ASSERT_EQ(8ul, resultMatrix.getRowGroupIndices().size()); ASSERT_EQ(CHOICE_COUNT +1, result.markovianChoices.size()); ASSERT_EQ(STATE_COUNT +1, result.markovianStates.size()); - ASSERT_EQ(2, result.markovianStates.getNumberOfSetBits()); + ASSERT_EQ(2ul, result.markovianStates.getNumberOfSetBits()); ASSERT_EQ(STATE_COUNT + 1, result.exitRates.size()); } diff --git a/test/functional/parser/PrismParserTest.cpp b/test/functional/parser/PrismParserTest.cpp index e386b7682..1eded2bd7 100644 --- a/test/functional/parser/PrismParserTest.cpp +++ b/test/functional/parser/PrismParserTest.cpp @@ -43,7 +43,7 @@ TEST(PrismParser, SimpleTest) { [] x=5 -> 1: true; endmodule)"; 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::MDP, result.getModelType()); } @@ -99,9 +99,9 @@ TEST(PrismParser, ComplexTest) { storm::prism::Program result; EXPECT_NO_THROW(result = storm::parser::PrismParser::parseFromString(testInput, "testfile")); EXPECT_EQ(storm::prism::Program::ModelType::MA, result.getModelType()); - EXPECT_EQ(3, result.getNumberOfModules()); - EXPECT_EQ(2, result.getNumberOfRewardModels()); - EXPECT_EQ(1, result.getNumberOfLabels()); + EXPECT_EQ(3ul, result.getNumberOfModules()); + EXPECT_EQ(2ul, result.getNumberOfRewardModels()); + EXPECT_EQ(1ul, result.getNumberOfLabels()); } TEST(PrismParser, IllegalInputTest) { diff --git a/test/functional/solver/GlpkLpSolverTest.cpp b/test/functional/solver/GlpkLpSolverTest.cpp index fe2014471..5aeb01dc7 100644 --- a/test/functional/solver/GlpkLpSolverTest.cpp +++ b/test/functional/solver/GlpkLpSolverTest.cpp @@ -159,14 +159,10 @@ TEST(GlpkLpSolver, LPInfeasible) { ASSERT_FALSE(solver.isOptimal()); ASSERT_FALSE(solver.isUnbounded()); ASSERT_TRUE(solver.isInfeasible()); - double xValue = 0; - ASSERT_THROW(xValue = solver.getContinuousValue(x), storm::exceptions::InvalidAccessException); - double yValue = 0; - ASSERT_THROW(yValue = solver.getContinuousValue(y), storm::exceptions::InvalidAccessException); - double zValue = 0; - ASSERT_THROW(zValue = solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); - double objectiveValue = 0; - ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(x), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(y), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); } TEST(GlpkLpSolver, MILPInfeasible) { @@ -189,14 +185,10 @@ TEST(GlpkLpSolver, MILPInfeasible) { ASSERT_FALSE(solver.isOptimal()); ASSERT_FALSE(solver.isUnbounded()); ASSERT_TRUE(solver.isInfeasible()); - bool xValue = false; - ASSERT_THROW(xValue = solver.getBinaryValue(x), storm::exceptions::InvalidAccessException); - int_fast64_t yValue = 0; - ASSERT_THROW(yValue = solver.getIntegerValue(y), storm::exceptions::InvalidAccessException); - double zValue = 0; - ASSERT_THROW(zValue = solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); - double objectiveValue = 0; - ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getBinaryValue(x), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getIntegerValue(y), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); } TEST(GlpkLpSolver, LPUnbounded) { @@ -217,14 +209,10 @@ TEST(GlpkLpSolver, LPUnbounded) { ASSERT_FALSE(solver.isOptimal()); ASSERT_TRUE(solver.isUnbounded()); ASSERT_FALSE(solver.isInfeasible()); - double xValue = 0; - ASSERT_THROW(xValue = solver.getContinuousValue(x), storm::exceptions::InvalidAccessException); - double yValue = 0; - ASSERT_THROW(yValue = solver.getContinuousValue(y), storm::exceptions::InvalidAccessException); - double zValue = 0; - ASSERT_THROW(zValue = solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); - double objectiveValue = 0; - ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(x), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(y), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); } TEST(GlpkLpSolver, MILPUnbounded) { @@ -245,13 +233,9 @@ TEST(GlpkLpSolver, MILPUnbounded) { ASSERT_FALSE(solver.isOptimal()); ASSERT_TRUE(solver.isUnbounded()); ASSERT_FALSE(solver.isInfeasible()); - bool xValue = false; - ASSERT_THROW(xValue = solver.getBinaryValue(x), storm::exceptions::InvalidAccessException); - int_fast64_t yValue = 0; - ASSERT_THROW(yValue = solver.getIntegerValue(y), storm::exceptions::InvalidAccessException); - double zValue = 0; - ASSERT_THROW(zValue = solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); - double objectiveValue = 0; - ASSERT_THROW(objectiveValue = solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getBinaryValue(x), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getIntegerValue(y), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getContinuousValue(z), storm::exceptions::InvalidAccessException); + ASSERT_THROW(solver.getObjectiveValue(), storm::exceptions::InvalidAccessException); } #endif \ No newline at end of file diff --git a/test/functional/storage/BitVectorHashMapTest.cpp b/test/functional/storage/BitVectorHashMapTest.cpp index 625762b40..616941f21 100644 --- a/test/functional/storage/BitVectorHashMapTest.cpp +++ b/test/functional/storage/BitVectorHashMapTest.cpp @@ -18,7 +18,7 @@ TEST(BitVectorHashMapTest, FindOrAdd) { second.set(18); ASSERT_NO_THROW(map.findOrAdd(second, 2)); - EXPECT_EQ(1, map.findOrAdd(first, 3)); + EXPECT_EQ(1ul, map.findOrAdd(first, 3)); storm::storage::BitVector third(64); third.set(10); @@ -44,10 +44,10 @@ TEST(BitVectorHashMapTest, FindOrAdd) { ASSERT_NO_THROW(map.findOrAdd(sixth, 6)); - EXPECT_EQ(1, map.findOrAdd(first, 0)); - EXPECT_EQ(2, map.findOrAdd(second, 0)); - EXPECT_EQ(3, map.findOrAdd(third, 0)); - EXPECT_EQ(4, map.findOrAdd(fourth, 0)); - EXPECT_EQ(5, map.findOrAdd(fifth, 0)); - EXPECT_EQ(6, map.findOrAdd(sixth, 0)); + EXPECT_EQ(1ul, map.findOrAdd(first, 0)); + EXPECT_EQ(2ul, map.findOrAdd(second, 0)); + EXPECT_EQ(3ul, map.findOrAdd(third, 0)); + EXPECT_EQ(4ul, map.findOrAdd(fourth, 0)); + EXPECT_EQ(5ul, map.findOrAdd(fifth, 0)); + EXPECT_EQ(6ul, map.findOrAdd(sixth, 0)); } diff --git a/test/functional/storage/BitVectorTest.cpp b/test/functional/storage/BitVectorTest.cpp index 2e3cb8385..687f0bbfc 100644 --- a/test/functional/storage/BitVectorTest.cpp +++ b/test/functional/storage/BitVectorTest.cpp @@ -28,7 +28,7 @@ TEST(BitVectorTest, InitFromIterator) { std::vector valueVector = {0, 4, 10}; storm::storage::BitVector vector(32, valueVector.begin(), valueVector.end()); - ASSERT_EQ(32, vector.size()); + ASSERT_EQ(32ul, vector.size()); for (uint_fast64_t i = 0; i < 32; ++i) { if (i == 0 || i == 4 || i == 10) { @@ -296,8 +296,8 @@ TEST(BitVectorTest, OperatorModulo) { storm::storage::BitVector moduloResult = vector1 % vector2; - ASSERT_EQ(moduloResult.size(), 8); - ASSERT_EQ(moduloResult.getNumberOfSetBits(), 2); + ASSERT_EQ(8ul, moduloResult.size()); + ASSERT_EQ(2ul, moduloResult.getNumberOfSetBits()); for (uint_fast64_t i = 0; i < 8; ++i) { if (i == 1 || i == 3) { diff --git a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp index 51cd4f55f..23b3a6be6 100644 --- a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp +++ b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp @@ -14,8 +14,8 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { ASSERT_NO_THROW(result = bisim.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(13, result->getNumberOfStates()); - EXPECT_EQ(20, result->getNumberOfTransitions()); + EXPECT_EQ(13ul, result->getNumberOfStates()); + EXPECT_EQ(20ul, result->getNumberOfTransitions()); #ifdef WINDOWS storm::storage::DeterministicModelBisimulationDecomposition::Options options; @@ -28,8 +28,8 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { ASSERT_NO_THROW(result = bisim2.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(5, result->getNumberOfStates()); - EXPECT_EQ(8, result->getNumberOfTransitions()); + EXPECT_EQ(5ul, result->getNumberOfStates()); + EXPECT_EQ(8ul, result->getNumberOfTransitions()); options.bounded = false; options.weak = true; @@ -38,8 +38,8 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { ASSERT_NO_THROW(result = bisim3.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(5, result->getNumberOfStates()); - EXPECT_EQ(8, result->getNumberOfTransitions()); + EXPECT_EQ(5ul, result->getNumberOfStates()); + EXPECT_EQ(8ul, result->getNumberOfTransitions()); auto labelFormula = std::make_shared("one"); auto eventuallyFormula = std::make_shared(labelFormula); @@ -53,8 +53,8 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { storm::storage::DeterministicModelBisimulationDecomposition bisim4(*dtmc, options2); ASSERT_NO_THROW(result = bisim4.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(5, result->getNumberOfStates()); - EXPECT_EQ(8, result->getNumberOfTransitions()); + EXPECT_EQ(5ul, result->getNumberOfStates()); + EXPECT_EQ(8ul, result->getNumberOfTransitions()); } TEST(DeterministicModelBisimulationDecomposition, Crowds) { @@ -68,8 +68,8 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { ASSERT_NO_THROW(result = bisim.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(334, result->getNumberOfStates()); - EXPECT_EQ(546, result->getNumberOfTransitions()); + EXPECT_EQ(334ul, result->getNumberOfStates()); + EXPECT_EQ(546ul, result->getNumberOfTransitions()); #ifdef WINDOWS storm::storage::DeterministicModelBisimulationDecomposition::Options options; @@ -82,8 +82,8 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { ASSERT_NO_THROW(result = bisim2.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(65, result->getNumberOfStates()); - EXPECT_EQ(105, result->getNumberOfTransitions()); + EXPECT_EQ(65ul, result->getNumberOfStates()); + EXPECT_EQ(105ul, result->getNumberOfTransitions()); options.bounded = false; options.weak = true; @@ -92,8 +92,8 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { ASSERT_NO_THROW(result = bisim3.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(43, result->getNumberOfStates()); - EXPECT_EQ(83, result->getNumberOfTransitions()); + EXPECT_EQ(43ul, result->getNumberOfStates()); + EXPECT_EQ(83ul, result->getNumberOfTransitions()); auto labelFormula = std::make_shared("observe0Greater1"); auto eventuallyFormula = std::make_shared(labelFormula); @@ -107,8 +107,8 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { ASSERT_NO_THROW(result = bisim4.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(64, result->getNumberOfStates()); - EXPECT_EQ(104, result->getNumberOfTransitions()); + EXPECT_EQ(64ul, result->getNumberOfStates()); + EXPECT_EQ(104ul, result->getNumberOfTransitions()); auto probabilityOperatorFormula = std::make_shared(eventuallyFormula); @@ -121,8 +121,8 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { ASSERT_NO_THROW(result = bisim5.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(64, result->getNumberOfStates()); - EXPECT_EQ(104, result->getNumberOfTransitions()); + EXPECT_EQ(64ul, result->getNumberOfStates()); + EXPECT_EQ(104ul, result->getNumberOfTransitions()); auto boundedUntilFormula = std::make_shared(std::make_shared(true), labelFormula, 50); @@ -135,6 +135,6 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { ASSERT_NO_THROW(result = bisim6.getQuotient()); EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); - EXPECT_EQ(65, result->getNumberOfStates()); - EXPECT_EQ(105, result->getNumberOfTransitions()); + EXPECT_EQ(65ul, result->getNumberOfStates()); + EXPECT_EQ(105ul, result->getNumberOfTransitions()); } diff --git a/test/functional/storage/MaximalEndComponentDecompositionTest.cpp b/test/functional/storage/MaximalEndComponentDecompositionTest.cpp index c4d1d0d35..ea3b2826e 100644 --- a/test/functional/storage/MaximalEndComponentDecompositionTest.cpp +++ b/test/functional/storage/MaximalEndComponentDecompositionTest.cpp @@ -12,7 +12,7 @@ TEST(MaximalEndComponentDecomposition, FullSystem1) { storm::storage::MaximalEndComponentDecomposition mecDecomposition; ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition(*markovAutomaton)); - ASSERT_EQ(2, mecDecomposition.size()); + ASSERT_EQ(2ul, mecDecomposition.size()); // Now, because there is no ordering we have to check the contents of the MECs in a symmetrical way. storm::storage::MaximalEndComponent const& mec1 = mecDecomposition[0]; @@ -80,7 +80,7 @@ TEST(MaximalEndComponentDecomposition, FullSystem2) { storm::storage::MaximalEndComponentDecomposition mecDecomposition; ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition(*markovAutomaton)); - ASSERT_EQ(1, mecDecomposition.size()); + ASSERT_EQ(1ul, mecDecomposition.size()); // Now, because there is no ordering we have to check the contents of the MECs in a symmetrical way. storm::storage::MaximalEndComponent const& mec1 = mecDecomposition[0]; @@ -112,7 +112,7 @@ TEST(MaximalEndComponentDecomposition, Subsystem) { storm::storage::MaximalEndComponentDecomposition mecDecomposition; ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition(*markovAutomaton, subsystem)); - ASSERT_EQ(1, mecDecomposition.size()); + ASSERT_EQ(1ul, mecDecomposition.size()); storm::storage::MaximalEndComponent const& mec1 = mecDecomposition[0]; diff --git a/test/functional/storage/SchedulerTest.cpp b/test/functional/storage/SchedulerTest.cpp index df51ab2a9..4ead76dab 100644 --- a/test/functional/storage/SchedulerTest.cpp +++ b/test/functional/storage/SchedulerTest.cpp @@ -12,10 +12,10 @@ TEST(SchedulerTest, PartialScheduler) { ASSERT_NO_THROW(scheduler.setChoice(3, 4)); ASSERT_TRUE(scheduler.isChoiceDefined(0)); - ASSERT_EQ(3, scheduler.getChoice(0)); + ASSERT_EQ(3ul, scheduler.getChoice(0)); ASSERT_TRUE(scheduler.isChoiceDefined(3)); - ASSERT_EQ(4, scheduler.getChoice(3)); + ASSERT_EQ(4ul, scheduler.getChoice(3)); ASSERT_FALSE(scheduler.isChoiceDefined(1)); ASSERT_THROW(scheduler.getChoice(1), storm::exceptions::InvalidArgumentException); @@ -29,13 +29,13 @@ TEST(SchedulerTest, TotalScheduler) { ASSERT_NO_THROW(scheduler.setChoice(3, 4)); ASSERT_TRUE(scheduler.isChoiceDefined(0)); - ASSERT_EQ(3, scheduler.getChoice(0)); + ASSERT_EQ(3ul, scheduler.getChoice(0)); ASSERT_TRUE(scheduler.isChoiceDefined(3)); - ASSERT_EQ(4, scheduler.getChoice(3)); + ASSERT_EQ(4ul, scheduler.getChoice(3)); ASSERT_TRUE(scheduler.isChoiceDefined(1)); - ASSERT_EQ(0, scheduler.getChoice(1)); + ASSERT_EQ(0ul, scheduler.getChoice(1)); ASSERT_THROW(scheduler.getChoice(4), storm::exceptions::InvalidArgumentException); ASSERT_THROW(scheduler.setChoice(5, 2), storm::exceptions::InvalidArgumentException); diff --git a/test/functional/storage/SparseMatrixTest.cpp b/test/functional/storage/SparseMatrixTest.cpp index d16b5558d..6e4b9980c 100644 --- a/test/functional/storage/SparseMatrixTest.cpp +++ b/test/functional/storage/SparseMatrixTest.cpp @@ -14,9 +14,9 @@ TEST(SparseMatrixBuilder, CreationWithDimensions) { storm::storage::SparseMatrix matrix; ASSERT_NO_THROW(matrix = matrixBuilder.build()); - ASSERT_EQ(3, matrix.getRowCount()); - ASSERT_EQ(4, matrix.getColumnCount()); - ASSERT_EQ(5, matrix.getEntryCount()); + ASSERT_EQ(3ul, matrix.getRowCount()); + ASSERT_EQ(4ul, matrix.getColumnCount()); + ASSERT_EQ(5ul, matrix.getEntryCount()); } TEST(SparseMatrixBuilder, CreationWithoutNumberOfEntries) { @@ -30,9 +30,9 @@ TEST(SparseMatrixBuilder, CreationWithoutNumberOfEntries) { storm::storage::SparseMatrix matrix; ASSERT_NO_THROW(matrix = matrixBuilder.build()); - ASSERT_EQ(3, matrix.getRowCount()); - ASSERT_EQ(4, matrix.getColumnCount()); - ASSERT_EQ(5, matrix.getEntryCount()); + ASSERT_EQ(3ul, matrix.getRowCount()); + ASSERT_EQ(4ul, matrix.getColumnCount()); + ASSERT_EQ(5ul, matrix.getEntryCount()); } TEST(SparseMatrixBuilder, CreationWithNumberOfRows) { @@ -46,9 +46,9 @@ TEST(SparseMatrixBuilder, CreationWithNumberOfRows) { storm::storage::SparseMatrix matrix; ASSERT_NO_THROW(matrix = matrixBuilder.build()); - ASSERT_EQ(3, matrix.getRowCount()); - ASSERT_EQ(4, matrix.getColumnCount()); - ASSERT_EQ(5, matrix.getEntryCount()); + ASSERT_EQ(3ul, matrix.getRowCount()); + ASSERT_EQ(4ul, matrix.getColumnCount()); + ASSERT_EQ(5ul, matrix.getEntryCount()); } TEST(SparseMatrixBuilder, CreationWithoutDimensions) { @@ -62,9 +62,9 @@ TEST(SparseMatrixBuilder, CreationWithoutDimensions) { storm::storage::SparseMatrix matrix; ASSERT_NO_THROW(matrix = matrixBuilder.build()); - ASSERT_EQ(2, matrix.getRowCount()); - ASSERT_EQ(4, matrix.getColumnCount()); - ASSERT_EQ(5, matrix.getEntryCount()); + ASSERT_EQ(2ul, matrix.getRowCount()); + ASSERT_EQ(4ul, matrix.getColumnCount()); + ASSERT_EQ(5ul, matrix.getEntryCount()); } TEST(SparseMatrixBuilder, AddNextValue) { @@ -117,9 +117,9 @@ TEST(SparseMatrix, Build) { ASSERT_NO_THROW(matrixBuilder3.addNextValue(1, 3, 0.2)); storm::storage::SparseMatrix matrix3; ASSERT_NO_THROW(matrix3 = matrixBuilder3.build()); - ASSERT_EQ(2, matrix3.getRowCount()); - ASSERT_EQ(4, matrix3.getColumnCount()); - ASSERT_EQ(5, matrix3.getEntryCount()); + ASSERT_EQ(2ul, matrix3.getRowCount()); + ASSERT_EQ(4ul, matrix3.getColumnCount()); + ASSERT_EQ(5ul, matrix3.getEntryCount()); storm::storage::SparseMatrixBuilder matrixBuilder4; ASSERT_NO_THROW(matrixBuilder4.addNextValue(0, 1, 1.0)); @@ -129,9 +129,9 @@ TEST(SparseMatrix, Build) { ASSERT_NO_THROW(matrixBuilder4.addNextValue(1, 3, 0.2)); storm::storage::SparseMatrix matrix4; ASSERT_NO_THROW(matrix4 = matrixBuilder4.build(4)); - ASSERT_EQ(4, matrix4.getRowCount()); - ASSERT_EQ(4, matrix4.getColumnCount()); - ASSERT_EQ(5, matrix4.getEntryCount()); + ASSERT_EQ(4ul, matrix4.getRowCount()); + ASSERT_EQ(4ul, matrix4.getColumnCount()); + ASSERT_EQ(5ul, matrix4.getEntryCount()); storm::storage::SparseMatrixBuilder matrixBuilder5; ASSERT_NO_THROW(matrixBuilder5.addNextValue(0, 1, 1.0)); @@ -141,9 +141,9 @@ TEST(SparseMatrix, Build) { ASSERT_NO_THROW(matrixBuilder5.addNextValue(1, 3, 0.2)); storm::storage::SparseMatrix matrix5; ASSERT_NO_THROW(matrix5 = matrixBuilder5.build(0, 6)); - ASSERT_EQ(2, matrix5.getRowCount()); - ASSERT_EQ(6, matrix5.getColumnCount()); - ASSERT_EQ(5, matrix5.getEntryCount()); + ASSERT_EQ(2ul, matrix5.getRowCount()); + ASSERT_EQ(6ul, matrix5.getColumnCount()); + ASSERT_EQ(5ul, matrix5.getEntryCount()); } TEST(SparseMatrix, CreationWithMovingContents) { @@ -156,10 +156,10 @@ TEST(SparseMatrix, CreationWithMovingContents) { ASSERT_NO_THROW(storm::storage::SparseMatrix matrix(4, {0, 2, 5, 5}, columnsAndValues, {0, 1, 2, 3}, false)); storm::storage::SparseMatrix matrix(4, {0, 2, 5, 5}, columnsAndValues, {0, 1, 2, 3}, false); - ASSERT_EQ(3, matrix.getRowCount()); - ASSERT_EQ(4, matrix.getColumnCount()); - ASSERT_EQ(5, matrix.getEntryCount()); - ASSERT_EQ(3, matrix.getRowGroupCount()); + ASSERT_EQ(3ul, matrix.getRowCount()); + ASSERT_EQ(4ul, matrix.getColumnCount()); + ASSERT_EQ(5ul, matrix.getEntryCount()); + ASSERT_EQ(3ul, matrix.getRowGroupCount()); } TEST(SparseMatrix, CopyConstruct) { diff --git a/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp b/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp index b1726dbe6..fa6c274a2 100644 --- a/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp +++ b/test/functional/storage/StronglyConnectedComponentDecompositionTest.cpp @@ -26,13 +26,13 @@ TEST(StronglyConnectedComponentDecomposition, SmallSystemFromMatrix) { storm::storage::StronglyConnectedComponentDecomposition sccDecomposition; ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(matrix, allBits, false, false)); - ASSERT_EQ(4, sccDecomposition.size()); + ASSERT_EQ(4ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(matrix, allBits, true, false)); - ASSERT_EQ(3, sccDecomposition.size()); + ASSERT_EQ(3ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(matrix, allBits, true, true)); - ASSERT_EQ(1, sccDecomposition.size()); + ASSERT_EQ(1ul, sccDecomposition.size()); } TEST(StronglyConnectedComponentDecomposition, FullSystem1) { @@ -43,13 +43,13 @@ TEST(StronglyConnectedComponentDecomposition, FullSystem1) { storm::storage::StronglyConnectedComponentDecomposition sccDecomposition; ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*markovAutomaton)); - ASSERT_EQ(5, sccDecomposition.size()); + ASSERT_EQ(5ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*markovAutomaton, true)); - ASSERT_EQ(2, sccDecomposition.size()); + ASSERT_EQ(2ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*markovAutomaton, true, true)); - ASSERT_EQ(2, sccDecomposition.size()); + ASSERT_EQ(2ul, sccDecomposition.size()); markovAutomaton = nullptr; } @@ -74,7 +74,7 @@ TEST(StronglyConnectedComponentDecomposition, FullSystem2) { ASSERT_TRUE(scc2 == storm::storage::StateBlock(correctScc1.begin(), correctScc1.end()) || scc2 == storm::storage::StateBlock(correctScc2.begin(), correctScc2.end())); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*markovAutomaton, true, true)); - ASSERT_EQ(1, sccDecomposition.size()); + ASSERT_EQ(1ul, sccDecomposition.size()); markovAutomaton = nullptr; } diff --git a/test/functional/utility/GraphTest.cpp b/test/functional/utility/GraphTest.cpp index bbb927001..c1deafcd3 100644 --- a/test/functional/utility/GraphTest.cpp +++ b/test/functional/utility/GraphTest.cpp @@ -20,16 +20,16 @@ TEST(GraphTest, SymbolicProb01) { std::pair, storm::dd::Bdd> statesWithProbability01; ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01(*model->as>(), model->getReachableStates(), model->getStates("observe0Greater1"))); - EXPECT_EQ(4409, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(1316, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(4409ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(1316ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01(*model->as>(), model->getReachableStates(), model->getStates("observeIGreater1"))); - EXPECT_EQ(1091, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(4802, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(1091ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(4802ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01(*model->as>(), model->getReachableStates(), model->getStates("observeOnlyTrueSender"))); - EXPECT_EQ(5829, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(1032, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(5829ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(1032ul, statesWithProbability01.second.getNonZeroCount()); } TEST(GraphTest, SymbolicProb01MinMax) { @@ -41,12 +41,12 @@ TEST(GraphTest, SymbolicProb01MinMax) { std::pair, storm::dd::Bdd> statesWithProbability01; ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), model->getReachableStates(), model->getStates("elected"))); - EXPECT_EQ(0, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(364, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(0ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(364ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), model->getReachableStates(), model->getStates("elected"))); - EXPECT_EQ(0, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(364, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(0ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(364ul, statesWithProbability01.second.getNonZeroCount()); program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/coin2-2.nm"); model = storm::builder::DdPrismModelBuilder::translateProgram(program); @@ -54,20 +54,20 @@ TEST(GraphTest, SymbolicProb01MinMax) { ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), model->getReachableStates(), model->getStates("all_coins_equal_0"))); - EXPECT_EQ(77, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(149, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(77ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(149ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), model->getReachableStates(), model->getStates("all_coins_equal_0"))); - EXPECT_EQ(74, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(198, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(74ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(198ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), model->getReachableStates(), model->getStates("all_coins_equal_1"))); - EXPECT_EQ(94, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(33, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(94ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(33ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), model->getReachableStates(), model->getStates("all_coins_equal_1"))); - EXPECT_EQ(83, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(35, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(83ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(35ul, statesWithProbability01.second.getNonZeroCount()); program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/csma2-2.nm"); model = storm::builder::DdPrismModelBuilder::translateProgram(program); @@ -75,12 +75,12 @@ TEST(GraphTest, SymbolicProb01MinMax) { ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), model->getReachableStates(), model->getStates("collision_max_backoff"))); - EXPECT_EQ(993, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(16, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(993ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(16ul, statesWithProbability01.second.getNonZeroCount()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), model->getReachableStates(), model->getStates("collision_max_backoff"))); - EXPECT_EQ(993, statesWithProbability01.first.getNonZeroCount()); - EXPECT_EQ(16, statesWithProbability01.second.getNonZeroCount()); + EXPECT_EQ(993ul, statesWithProbability01.first.getNonZeroCount()); + EXPECT_EQ(16ul, statesWithProbability01.second.getNonZeroCount()); } TEST(GraphTest, ExplicitProb01) { @@ -92,16 +92,16 @@ TEST(GraphTest, ExplicitProb01) { std::pair statesWithProbability01; ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("observe0Greater1"))); - EXPECT_EQ(4409, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(1316, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(4409ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(1316ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("observeIGreater1"))); - EXPECT_EQ(1091, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(4802, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(1091ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(4802ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("observeOnlyTrueSender"))); - EXPECT_EQ(5829, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(1032, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(5829ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(1032ul, statesWithProbability01.second.getNumberOfSetBits()); } TEST(GraphTest, ExplicitProb01MinMax) { @@ -113,12 +113,12 @@ TEST(GraphTest, ExplicitProb01MinMax) { std::pair statesWithProbability01; ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("elected"))); - EXPECT_EQ(0, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(364, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(0ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(364ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("elected"))); - EXPECT_EQ(0, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(364, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(0ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(364ul, statesWithProbability01.second.getNumberOfSetBits()); program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/coin2-2.nm"); model = storm::builder::ExplicitPrismModelBuilder::translateProgram(program); @@ -126,20 +126,20 @@ TEST(GraphTest, ExplicitProb01MinMax) { ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("all_coins_equal_0"))); - EXPECT_EQ(77, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(149, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(77ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(149ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("all_coins_equal_0"))); - EXPECT_EQ(74, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(198, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(74ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(198ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("all_coins_equal_1"))); - EXPECT_EQ(94, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(33, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(94ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(33ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("all_coins_equal_1"))); - EXPECT_EQ(83, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(35, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(83ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(35ul, statesWithProbability01.second.getNumberOfSetBits()); program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/csma2-2.nm"); model = storm::builder::ExplicitPrismModelBuilder::translateProgram(program); @@ -147,10 +147,10 @@ TEST(GraphTest, ExplicitProb01MinMax) { ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("collision_max_backoff"))); - EXPECT_EQ(993, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(16, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(993ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(16ul, statesWithProbability01.second.getNumberOfSetBits()); ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as>(), storm::storage::BitVector(model->getNumberOfStates(), true), model->getStates("collision_max_backoff"))); - EXPECT_EQ(993, statesWithProbability01.first.getNumberOfSetBits()); - EXPECT_EQ(16, statesWithProbability01.second.getNumberOfSetBits()); + EXPECT_EQ(993ul, statesWithProbability01.first.getNumberOfSetBits()); + EXPECT_EQ(16ul, statesWithProbability01.second.getNumberOfSetBits()); } \ No newline at end of file