From 514dfb8ce61ed461f6c96589fe30804d611bcaa9 Mon Sep 17 00:00:00 2001
From: Stefan Pranger <stefan.pranger@student.tugraz.at>
Date: Mon, 15 Mar 2021 21:23:47 +0100
Subject: [PATCH] refactored allowedValue method

---
 src/storm/shields/AbstractShield.cpp   |  5 +++++
 src/storm/shields/AbstractShield.h     | 11 +++++------
 src/storm/shields/PostSafetyShield.cpp |  4 ++--
 src/storm/shields/PreSafetyShield.cpp  |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/storm/shields/AbstractShield.cpp b/src/storm/shields/AbstractShield.cpp
index 2722b1916..f24189bf5 100644
--- a/src/storm/shields/AbstractShield.cpp
+++ b/src/storm/shields/AbstractShield.cpp
@@ -24,6 +24,11 @@ namespace tempest {
             return rowGroupSizes;
         }
 
+        template<typename ValueType, typename IndexType>
+        bool AbstractShield<ValueType, IndexType>::allowedValue(ValueType const& max, ValueType const& v, std::shared_ptr<storm::logic::ShieldExpression const> const shieldExpression) {
+            return shieldExpression->isRelative() ? v >= shieldExpression->getValue() * max : v >= shieldExpression->getValue();
+        }
+
         template<typename ValueType, typename IndexType>
         std::string AbstractShield<ValueType, IndexType>::getClassName() const {
             return std::string(boost::core::demangled_name(BOOST_CORE_TYPEID(*this)));
diff --git a/src/storm/shields/AbstractShield.h b/src/storm/shields/AbstractShield.h
index 3dfcc2b1b..3a8706157 100644
--- a/src/storm/shields/AbstractShield.h
+++ b/src/storm/shields/AbstractShield.h
@@ -26,9 +26,13 @@ namespace tempest {
             /*!
              * TODO
              */
-            //virtual storm::storage::Scheduler<ValueType>* construct() = 0;
             std::vector<IndexType> computeRowGroupSizes();
 
+            /*!
+             * TODO
+             */
+            bool allowedValue(ValueType const& max, ValueType const& v, std::shared_ptr<storm::logic::ShieldExpression const> const shieldExpression);
+
             /*!
              * TODO
              */
@@ -46,10 +50,5 @@ namespace tempest {
 
             boost::optional<storm::storage::BitVector> coalitionStates;
         };
-
-        template<typename ValueType, typename IndexType>
-        bool allowedValue(ValueType const& max, ValueType const& v, std::shared_ptr<storm::logic::ShieldExpression const> const shieldExpression) {
-            return shieldExpression->isRelative() ? v >= shieldExpression->getValue() * max : v >= shieldExpression->getValue();
-        }
     }
 }
diff --git a/src/storm/shields/PostSafetyShield.cpp b/src/storm/shields/PostSafetyShield.cpp
index 6b5773854..26494ff29 100644
--- a/src/storm/shields/PostSafetyShield.cpp
+++ b/src/storm/shields/PostSafetyShield.cpp
@@ -22,14 +22,14 @@ namespace tempest {
                     uint rowGroupSize = this->rowGroupIndices[state + 1] - this->rowGroupIndices[state];
                     auto maxProbabilityIndex = std::max_element(choice_it, choice_it + rowGroupSize) - choice_it;
                     ValueType maxProbability = *(choice_it + maxProbabilityIndex);
-                    if(!allowedValue<ValueType, IndexType>(maxProbability, maxProbability, this->shieldingExpression)) {
+                    if(!this->allowedValue(maxProbability, maxProbability, this->shieldingExpression)) {
                         STORM_LOG_WARN("No shielding action possible with absolute comparison for state with index " << state);
                         shield.setChoice(0, storm::storage::Distribution<ValueType, IndexType>(), state);
                         continue;
                     }
                     for(uint choice = 0; choice < rowGroupSize; choice++, choice_it++) {
                         storm::storage::Distribution<ValueType, IndexType> actionDistribution;
-                        if(allowedValue<ValueType, IndexType>(maxProbability, *choice_it, this->shieldingExpression)) {
+                        if(this->allowedValue(maxProbability, *choice_it, this->shieldingExpression)) {
                             actionDistribution.addProbability(choice, 1);
                         } else {
                             actionDistribution.addProbability(maxProbabilityIndex, 1);
diff --git a/src/storm/shields/PreSafetyShield.cpp b/src/storm/shields/PreSafetyShield.cpp
index fb63387d7..694362d2d 100644
--- a/src/storm/shields/PreSafetyShield.cpp
+++ b/src/storm/shields/PreSafetyShield.cpp
@@ -22,13 +22,13 @@ namespace tempest {
                     uint rowGroupSize = this->rowGroupIndices[state + 1] - this->rowGroupIndices[state];
                     storm::storage::Distribution<ValueType, IndexType> actionDistribution;
                     ValueType maxProbability = *std::max_element(choice_it, choice_it + rowGroupSize);
-                    if(!allowedValue<ValueType, IndexType>(maxProbability, maxProbability, this->shieldingExpression)) {
+                    if(!this->allowedValue(maxProbability, maxProbability, this->shieldingExpression)) {
                         STORM_LOG_WARN("No shielding action possible with absolute comparison for state with index " << state);
                         shield.setChoice(storm::storage::Distribution<ValueType, IndexType>(), state);
                         continue;
                     }
                     for(uint choice = 0; choice < rowGroupSize; choice++, choice_it++) {
-                        if(allowedValue<ValueType, IndexType>(maxProbability, *choice_it, this->shieldingExpression)) {
+                        if(this->allowedValue(maxProbability, *choice_it, this->shieldingExpression)) {
                             actionDistribution.addProbability(choice, *choice_it);
                         }
                     }