From b4862360ba53d6a9f1c8853b00720ce5aaa8c1f3 Mon Sep 17 00:00:00 2001 From: gereon Date: Sat, 12 Jan 2013 13:38:15 +0100 Subject: [PATCH] made Ctmc and Dtmc subclasses of AbstractModel implement getType() fixed typo --- src/models/Ctmc.h | 10 +++++++--- src/models/Dtmc.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/models/Ctmc.h b/src/models/Ctmc.h index f13f00cd6..263a62fe9 100644 --- a/src/models/Ctmc.h +++ b/src/models/Ctmc.h @@ -18,7 +18,7 @@ #include "src/storage/SparseMatrix.h" #include "src/exceptions/InvalidArgumentException.h" -#include "src/models/Model.h" +#include "src/models/AbstractModel.h" namespace storm { @@ -29,7 +29,7 @@ namespace models { * labeled with atomic propositions. */ template -class Ctmc : public storm::models::Model { +class Ctmc : public storm::models::AbstractModel { public: //! Constructor @@ -58,7 +58,7 @@ public: Ctmc(const Ctmc &ctmc) : rateMatrix(ctmc.rateMatrix), stateLabeling(ctmc.stateLabeling), stateRewards(ctmc.stateRewards), transitionRewardMatrix(ctmc.transitionRewardMatrix) { - if (ctmc.backardTransitions != nullptr) { + if (ctmc.backwardTransitions != nullptr) { this->backwardTransitions = new storm::models::GraphTransitions(*ctmc.backwardTransitions); } } @@ -163,6 +163,10 @@ public: << std::endl; } + storm::models::ModelType getType() { + return CTMC; + } + private: /*! A matrix representing the transition rate function of the CTMC. */ diff --git a/src/models/Dtmc.h b/src/models/Dtmc.h index 2d7837dc5..303a77739 100644 --- a/src/models/Dtmc.h +++ b/src/models/Dtmc.h @@ -19,7 +19,7 @@ #include "src/exceptions/InvalidArgumentException.h" #include "src/utility/CommandLine.h" -#include "src/models/Model.h" +#include "src/models/AbstractModel.h" namespace storm { @@ -30,7 +30,7 @@ namespace models { * labeled with atomic propositions. */ template -class Dtmc : public storm::models::Model { +class Dtmc : public storm::models::AbstractModel { public: //! Constructor @@ -62,7 +62,7 @@ public: Dtmc(const Dtmc &dtmc) : probabilityMatrix(dtmc.probabilityMatrix), stateLabeling(dtmc.stateLabeling), stateRewards(dtmc.stateRewards), transitionRewardMatrix(dtmc.transitionRewardMatrix) { - if (dtmc.backardTransitions != nullptr) { + if (dtmc.backwardTransitions != nullptr) { this->backwardTransitions = new storm::models::GraphTransitions(*dtmc.backwardTransitions); } if (!this->checkValidityProbabilityMatrix()) { @@ -194,6 +194,10 @@ public: out << std::endl; storm::utility::printSeparationLine(out); } + + storm::models::ModelType getType() { + return DTMC; + } private: