From 380d3f18979721bcb8f925596f599b3447ad4dcf Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Tue, 5 Apr 2016 16:31:12 +0200
Subject: [PATCH] CTMC constructor with exitRates

Former-commit-id: 2f1afe1d5b9a0842f8994b4516f68fac3208f769
---
 src/builder/ExplicitDFTModelBuilder.cpp |  2 +-
 src/models/sparse/Ctmc.cpp              |  7 +++++++
 src/models/sparse/Ctmc.h                | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/builder/ExplicitDFTModelBuilder.cpp b/src/builder/ExplicitDFTModelBuilder.cpp
index fa8be6e1a..820dee6a4 100644
--- a/src/builder/ExplicitDFTModelBuilder.cpp
+++ b/src/builder/ExplicitDFTModelBuilder.cpp
@@ -120,7 +120,7 @@ namespace storm {
                         }
                     }
                 }
-                model = std::make_shared<storm::models::sparse::Ctmc<ValueType>>(std::move(rateMatrix), std::move(modelComponents.stateLabeling));
+                model = std::make_shared<storm::models::sparse::Ctmc<ValueType>>(std::move(rateMatrix), std::move(modelComponents.exitRates), std::move(modelComponents.stateLabeling));
             } else {
                 std::shared_ptr<storm::models::sparse::MarkovAutomaton<ValueType>> ma = std::make_shared<storm::models::sparse::MarkovAutomaton<ValueType>>(std::move(modelComponents.transitionMatrix), std::move(modelComponents.stateLabeling), std::move(modelComponents.markovianStates), std::move(modelComponents.exitRates), true);
                 if (ma->hasOnlyTrivialNondeterminism()) {
diff --git a/src/models/sparse/Ctmc.cpp b/src/models/sparse/Ctmc.cpp
index 62347c81b..1d07c48a9 100644
--- a/src/models/sparse/Ctmc.cpp
+++ b/src/models/sparse/Ctmc.cpp
@@ -24,6 +24,13 @@ namespace storm {
                 exitRates = createExitRateVector(this->getTransitionMatrix());
             }
             
+            template <typename ValueType, typename RewardModelType>
+            Ctmc<ValueType, RewardModelType>::Ctmc(storm::storage::SparseMatrix<ValueType> const& rateMatrix, std::vector<ValueType> const& exitRates, storm::models::sparse::StateLabeling const& stateLabeling,
+                                std::unordered_map<std::string, RewardModelType> const& rewardModels,
+                                boost::optional<std::vector<LabelSet>> const& optionalChoiceLabeling)
+            : DeterministicModel<ValueType, RewardModelType>(storm::models::ModelType::Ctmc, std::move(rateMatrix), std::move(stateLabeling), std::move(rewardModels), std::move(optionalChoiceLabeling)), exitRates(exitRates) {
+            }
+            
             template <typename ValueType, typename RewardModelType>
             std::vector<ValueType> const& Ctmc<ValueType, RewardModelType>::getExitRateVector() const {
                 return exitRates;
diff --git a/src/models/sparse/Ctmc.h b/src/models/sparse/Ctmc.h
index 716b80373..fc933ae7d 100644
--- a/src/models/sparse/Ctmc.h
+++ b/src/models/sparse/Ctmc.h
@@ -38,6 +38,20 @@ namespace storm {
                      std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
                      boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
                 
+                /*!
+                 * Constructs a model from the given data.
+                 *
+                 * @param rateMatrix The matrix representing the transitions in the model.
+                 * @param exitRates The exit rates of all states.
+                 * @param stateLabeling The labeling of the states.
+                 * @param rewardModels A mapping of reward model names to reward models.
+                 * @param optionalChoiceLabeling A vector that represents the labels associated with the choices of each state.
+                 */
+                Ctmc(storm::storage::SparseMatrix<ValueType> const& rateMatrix, std::vector<ValueType> const& exitRates, storm::models::sparse::StateLabeling const& stateLabeling,
+                     std::unordered_map<std::string, RewardModelType> const& rewardModels = std::unordered_map<std::string, RewardModelType>(),
+                     boost::optional<std::vector<LabelSet>> const& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
+
+                
                 Ctmc(Ctmc<ValueType, RewardModelType> const& ctmc) = default;
                 Ctmc& operator=(Ctmc<ValueType, RewardModelType> const& ctmc) = default;