From a8689804666b363cc264f26ffea1c33609a66f4c Mon Sep 17 00:00:00 2001 From: gereon Date: Sat, 11 May 2013 18:06:05 +0200 Subject: [PATCH] Fixed code so that tests compiles. --- src/models/AbstractNondeterministicModel.h | 9 +++++++++ src/models/Mdp.h | 8 -------- test/parser/ParsePrismTest.cpp | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/models/AbstractNondeterministicModel.h b/src/models/AbstractNondeterministicModel.h index 0ca1dea37..8b9eed511 100644 --- a/src/models/AbstractNondeterministicModel.h +++ b/src/models/AbstractNondeterministicModel.h @@ -51,6 +51,15 @@ class AbstractNondeterministicModel: public AbstractModel { // Intentionally left empty. } + + /*! + * Returns the number of choices for all states of the MDP. + * @return The number of choices for all states of the MDP. + */ + uint_fast64_t getNumberOfChoices() const { + return this->getTransitionMatrix()->getRowCount(); + } + /*! * Retrieves the size of the internal representation of the model in memory. * @return the size of the internal representation of the model in memory diff --git a/src/models/Mdp.h b/src/models/Mdp.h index 87c2322d7..586de6e5e 100644 --- a/src/models/Mdp.h +++ b/src/models/Mdp.h @@ -70,14 +70,6 @@ public: ~Mdp() { // Intentionally left empty. } - - /*! - * Returns the number of choices for all states of the MDP. - * @return The number of choices for all states of the MDP. - */ - uint_fast64_t getNumberOfChoices() const { - return this->probabilityMatrix->getRowCount(); - } storm::models::ModelType getType() const { return MDP; diff --git a/test/parser/ParsePrismTest.cpp b/test/parser/ParsePrismTest.cpp index b4155edfd..a2f23844e 100644 --- a/test/parser/ParsePrismTest.cpp +++ b/test/parser/ParsePrismTest.cpp @@ -1,9 +1,10 @@ #include "gtest/gtest.h" #include "storm-config.h" #include "src/parser/PrismParser.h" -#include "src/utility/IoUtility.h" +//#include "src/utility/IoUtility.h" #include "src/ir/Program.h" #include "src/adapters/ExplicitModelAdapter.h" +#include "src/models/Dtmc.h" #include "src/models/Mdp.h" TEST(ParsePrismTest, parseCrowds5_5) {