Merge branch 'future' into mdpbisim

Former-commit-id: bfc52e25d9

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<RationalNumber> RawPolynomial;
     typedef carl::FactorizedPolynomial<RawPolynomial> Polynomial;

src/models/sparse/StandardRewardModel.cpp

@@ -147,7 +147,7 @@ namespace storm {
                 if (this->hasTransitionRewards()) {
                     if (this->hasStateActionRewards()) {
                         storm::utility::vector::addVectors<ValueType>(this->getStateActionRewardVector(), transitionMatrix.getPointwiseProductRowSumVector(this->getTransitionRewardMatrix()), this->getStateActionRewardVector());
-                        optionalStateActionRewardVector = boost::none;
+                        this->optionalStateActionRewardVector = boost::none;
                     } else {
                         this->optionalStateActionRewardVector = transitionMatrix.getPointwiseProductRowSumVector(this->getTransitionRewardMatrix());
                     }
@@ -160,7 +160,7 @@ namespace storm {
                     } else {
                         this->optionalStateRewardVector = std::move(this->optionalStateActionRewardVector);
                     }
-                    optionalStateActionRewardVector = boost::none;
+                    this->optionalStateActionRewardVector = boost::none;
                 }
             }