Browse Source

Some necessary adaptions in Prctl::CumulativeReward

tempestpy_adaptions
Lanchid 12 years ago
parent
commit
67ba49d170
  1. 28
      src/formula/Prctl/CumulativeReward.h

28
src/formula/Prctl/CumulativeReward.h

@ -57,7 +57,7 @@ public:
* Empty constructor * Empty constructor
*/ */
CumulativeReward() { CumulativeReward() {
bound = 0;
// Intentionally left empty
} }
/*! /*!
@ -65,8 +65,9 @@ public:
* *
* @param bound The time bound of the reward formula * @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. // 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. * Clones the called object.
* *
@ -100,7 +85,7 @@ public:
* @returns a new CumulativeReward-object that is identical the called object. * @returns a new CumulativeReward-object that is identical the called object.
*/ */
virtual AbstractPathFormula<T>* clone() const { 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 { virtual std::vector<T> *check(const storm::modelchecker::AbstractModelChecker<T>& modelChecker, bool qualitative) const {
return modelChecker.template as<ICumulativeRewardModelChecker>()->checkCumulativeReward(*this, qualitative); return modelChecker.template as<ICumulativeRewardModelChecker>()->checkCumulativeReward(*this, qualitative);
} }
private:
T bound;
}; };
} //namespace prctl } //namespace prctl

Loading…
Cancel
Save