From 67ba49d17029f67c2115aceb6176cc5794b5114f Mon Sep 17 00:00:00 2001
From: Lanchid <thomas.heinemann@rwth-aachen.de>
Date: Fri, 3 May 2013 15:22:24 +0200
Subject: [PATCH] Some necessary adaptions in Prctl::CumulativeReward

---
 src/formula/Prctl/CumulativeReward.h | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/formula/Prctl/CumulativeReward.h b/src/formula/Prctl/CumulativeReward.h
index 75671f676..d008e0aa8 100644
--- a/src/formula/Prctl/CumulativeReward.h
+++ b/src/formula/Prctl/CumulativeReward.h
@@ -57,7 +57,7 @@ public:
 	 * Empty constructor
 	 */
 	CumulativeReward() {
-		bound = 0;
+		// Intentionally left empty
 	}
 
 	/*!
@@ -65,8 +65,9 @@ public:
 	 *
 	 * @param bound The time bound of the reward formula
 	 */
-	CumulativeReward(T bound) {
-		this->bound = bound;
+	CumulativeReward(T bound) :
+		storm::property::abstract::CumulativeReward<T>(bound) {
+		// Intentionally left empty
 	}
 
 	/*!
@@ -76,22 +77,6 @@ public:
 		// Intentionally left empty.
 	}
 
-	/*!
-	 * @returns the time instance for the instantaneous reward operator
-	 */
-	T getBound() const {
-		return bound;
-	}
-
-	/*!
-	 * Sets the the time instance for the instantaneous reward operator
-	 *
-	 * @param bound the new bound.
-	 */
-	void setBound(T bound) {
-		this->bound = bound;
-	}
-
 	/*!
 	 * Clones the called object.
 	 *
@@ -100,7 +85,7 @@ public:
 	 * @returns a new CumulativeReward-object that is identical the called object.
 	 */
 	virtual AbstractPathFormula<T>* clone() const {
-		return new CumulativeReward(bound);
+		return new CumulativeReward(this->getBound());
 	}
 
 
@@ -116,9 +101,6 @@ public:
 	virtual std::vector<T> *check(const storm::modelchecker::AbstractModelChecker<T>& modelChecker, bool qualitative) const {
 		return modelChecker.template as<ICumulativeRewardModelChecker>()->checkCumulativeReward(*this, qualitative);
 	}
-
-private:
-	T bound;
 };
 
 } //namespace prctl