Merge branch 'master' into parametricSystems

Former-commit-id: 9292feb153

src/models/AbstractModel.h

@@ -313,7 +313,7 @@ class AbstractModel: public std::enable_shared_from_this<AbstractModel<T>> {
 		 * @return True if this model has a state reward model.
 		 */
 		bool hasStateRewards() const {
-			return stateRewardVector;
+			return static_cast<bool>(stateRewardVector);
 		}
 
 		/*!
@@ -321,7 +321,7 @@ class AbstractModel: public std::enable_shared_from_this<AbstractModel<T>> {
 		 * @return True if this model has a transition reward model.
 		 */
 		bool hasTransitionRewards() const {
-			return transitionRewardMatrix;
+			return static_cast<bool>(transitionRewardMatrix);
 		}
     
         /*!
@@ -329,7 +329,7 @@ class AbstractModel: public std::enable_shared_from_this<AbstractModel<T>> {
          * @return True if this model has a labeling.
          */
         bool hasChoiceLabeling() const {
-            return choiceLabeling;
+            return static_cast<bool>(choiceLabeling);
         }
 
 		/*!