From cf10fe206a645ba23ea50eba4dcc60667a56fea8 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Tue, 29 Sep 2015 16:07:08 +0200
Subject: [PATCH] modifiers for standard rew model, fix with non-const overload
in model
Former-commit-id: 25348872ee167d83b685a20b6e237e3070f0f90e
---
src/models/sparse/Model.cpp | 2 +-
src/models/sparse/Model.h | 2 +-
src/models/sparse/StandardRewardModel.cpp | 15 ++++++++++++++-
src/models/sparse/StandardRewardModel.h | 6 ++++++
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/models/sparse/Model.cpp b/src/models/sparse/Model.cpp
index fe2127679..10e4ecbd8 100644
--- a/src/models/sparse/Model.cpp
+++ b/src/models/sparse/Model.cpp
@@ -90,7 +90,7 @@ namespace storm {
}
template<typename ValueType, typename RewardModelType>
- RewardModelType& Model<ValueType, RewardModelType>::getRewardModel(std::string const& rewardModelName) {
+ RewardModelType& Model<ValueType, RewardModelType>::rewardModel(std::string const& rewardModelName) {
assert(this->hasRewardModel(rewardModelName));
return this->rewardModels.find(rewardModelName)->second;
}
diff --git a/src/models/sparse/Model.h b/src/models/sparse/Model.h
index 01b1932e1..79f2ef9e4 100644
--- a/src/models/sparse/Model.h
+++ b/src/models/sparse/Model.h
@@ -268,7 +268,7 @@ namespace storm {
protected:
- RewardModelType & getRewardModel(std::string const& rewardModelName);
+ RewardModelType & rewardModel(std::string const& rewardModelName);
/*!
* Sets the transition matrix of the model.
*
diff --git a/src/models/sparse/StandardRewardModel.cpp b/src/models/sparse/StandardRewardModel.cpp
index befc06aa6..762836ebb 100644
--- a/src/models/sparse/StandardRewardModel.cpp
+++ b/src/models/sparse/StandardRewardModel.cpp
@@ -82,7 +82,15 @@ namespace storm {
assert(choiceIndex < this->optionalStateActionRewardVector.get().size());
return this->optionalStateActionRewardVector.get()[choiceIndex];
}
-
+
+ template<typename ValueType>
+ template<typename T>
+ void StandardRewardModel<ValueType>::setStateActionReward(uint_fast64_t choiceIndex, T const &newValue) {
+ assert(this->hasStateActionRewards());
+ assert(choiceIndex < this->optionalStateActionRewardVector.get().size());
+ this->optionalStateActionRewardVector.get()[choiceIndex] = newValue;
+ }
+
template<typename ValueType>
boost::optional<std::vector<ValueType>> const& StandardRewardModel<ValueType>::getOptionalStateActionRewardVector() const {
return this->optionalStateActionRewardVector;
@@ -258,6 +266,7 @@ namespace storm {
template std::vector<double> StandardRewardModel<double>::getTotalRewardVector(uint_fast64_t numberOfRows, storm::storage::SparseMatrix<double> const& transitionMatrix, storm::storage::BitVector const& filter) const;
template std::vector<double> StandardRewardModel<double>::getTotalRewardVector(storm::storage::SparseMatrix<double> const& transitionMatrix, std::vector<double> const& weights) const;
template void StandardRewardModel<double>::reduceToStateBasedRewards(storm::storage::SparseMatrix<double> const& transitionMatrix, bool reduceToStateRewards);
+ template void StandardRewardModel<double>::setStateActionReward(uint_fast64_t choiceIndex, double const & newValue);
template class StandardRewardModel<double>;
template std::ostream& operator<<<double>(std::ostream& out, StandardRewardModel<double> const& rewardModel);
@@ -265,6 +274,7 @@ namespace storm {
template std::vector<float> StandardRewardModel<float>::getTotalRewardVector(storm::storage::SparseMatrix<float> const& transitionMatrix) const;
template std::vector<float> StandardRewardModel<float>::getTotalRewardVector(storm::storage::SparseMatrix<float> const& transitionMatrix, std::vector<float> const& weights) const;
template void StandardRewardModel<float>::reduceToStateBasedRewards(storm::storage::SparseMatrix<float> const& transitionMatrix, bool reduceToStateRewards);
+ template void StandardRewardModel<float>::setStateActionReward(uint_fast64_t choiceIndex, float const & newValue);
template class StandardRewardModel<float>;
template std::ostream& operator<<<float>(std::ostream& out, StandardRewardModel<float> const& rewardModel);
@@ -273,12 +283,15 @@ namespace storm {
template std::vector<storm::RationalFunction> StandardRewardModel<storm::RationalFunction>::getTotalRewardVector(storm::storage::SparseMatrix<storm::RationalFunction> const& transitionMatrix) const;
template std::vector<storm::RationalFunction> StandardRewardModel<storm::RationalFunction>::getTotalRewardVector(storm::storage::SparseMatrix<storm::RationalFunction> const& transitionMatrix, std::vector<storm::RationalFunction> const& weights) const;
template void StandardRewardModel<storm::RationalFunction>::reduceToStateBasedRewards(storm::storage::SparseMatrix<storm::RationalFunction> const& transitionMatrix, bool reduceToStateRewards);
+ template void StandardRewardModel<storm::RationalFunction>::setStateActionReward(uint_fast64_t choiceIndex, storm::RationalFunction const & newValue);
template class StandardRewardModel<storm::RationalFunction>;
template std::ostream& operator<<<storm::RationalFunction>(std::ostream& out, StandardRewardModel<storm::RationalFunction> const& rewardModel);
template std::vector<storm::Interval> StandardRewardModel<storm::Interval>::getTotalRewardVector(uint_fast64_t numberOfRows, storm::storage::SparseMatrix<double> const& transitionMatrix, storm::storage::BitVector const& filter) const;
template std::vector<storm::Interval> StandardRewardModel<storm::Interval>::getTotalRewardVector(storm::storage::SparseMatrix<double> const& transitionMatrix) const;
template std::vector<storm::Interval> StandardRewardModel<storm::Interval>::getTotalRewardVector(storm::storage::SparseMatrix<double> const& transitionMatrix, std::vector<double> const& weights) const;
+ template void StandardRewardModel<storm::Interval>::setStateActionReward(uint_fast64_t choiceIndex, double const & newValue);
+ template void StandardRewardModel<storm::Interval>::setStateActionReward(uint_fast64_t choiceIndex, storm::Interval const & newValue);
template void StandardRewardModel<storm::Interval>::reduceToStateBasedRewards(storm::storage::SparseMatrix<double> const& transitionMatrix, bool reduceToStateRewards);
template class StandardRewardModel<storm::Interval>;
template std::ostream& operator<<<storm::Interval>(std::ostream& out, StandardRewardModel<storm::Interval> const& rewardModel);
diff --git a/src/models/sparse/StandardRewardModel.h b/src/models/sparse/StandardRewardModel.h
index 144307e7c..64b63b36e 100644
--- a/src/models/sparse/StandardRewardModel.h
+++ b/src/models/sparse/StandardRewardModel.h
@@ -112,6 +112,12 @@ namespace storm {
*/
ValueType const& getStateActionReward(uint_fast64_t choiceIndex) const;
+ /*!
+ * Sets the state-action reward for the given choice
+ */
+ template<typename T>
+ void setStateActionReward(uint_fast64_t choiceIndex, T const& newValue);
+
/*!
* Retrieves an optional value that contains the state-action reward vector if there is one.
*