diff --git a/src/adapters/CarlAdapter.h b/src/adapters/CarlAdapter.h index 99e01e575..2ed172cde 100644 --- a/src/adapters/CarlAdapter.h +++ b/src/adapters/CarlAdapter.h @@ -42,7 +42,7 @@ namespace carl { } namespace storm { - typedef mpq_class RationalNumber; + typedef cln::cl_RA RationalNumber; typedef carl::Variable Variable; typedef carl::MultivariatePolynomial RawPolynomial; typedef carl::FactorizedPolynomial Polynomial; diff --git a/src/models/sparse/StandardRewardModel.cpp b/src/models/sparse/StandardRewardModel.cpp index 1f7db2b79..4cab9bbb4 100644 --- a/src/models/sparse/StandardRewardModel.cpp +++ b/src/models/sparse/StandardRewardModel.cpp @@ -147,6 +147,7 @@ namespace storm { if (this->hasTransitionRewards()) { if (this->hasStateActionRewards()) { storm::utility::vector::addVectors(this->getStateActionRewardVector(), transitionMatrix.getPointwiseProductRowSumVector(this->getTransitionRewardMatrix()), this->getStateActionRewardVector()); + this->optionalStateActionRewardVector = boost::none; } else { this->optionalStateActionRewardVector = transitionMatrix.getPointwiseProductRowSumVector(this->getTransitionRewardMatrix()); } @@ -157,8 +158,9 @@ namespace storm { STORM_LOG_THROW(this->getStateRewardVector().size() == this->getStateActionRewardVector().size(), storm::exceptions::InvalidOperationException, "The reduction to state rewards is only possible of both the state and the state-action rewards have the same dimension."); storm::utility::vector::addVectors(this->getStateActionRewardVector(), this->getStateRewardVector(), this->getStateRewardVector()); } else { - this->optionalStateRewardVector = std::move(this->optionalStateRewardVector); + this->optionalStateRewardVector = std::move(this->optionalStateActionRewardVector); } + this->optionalStateActionRewardVector = boost::none; } }