Browse Source

moved choice values from abstract shield

main
Stefan Pranger 4 years ago
parent
commit
9ad15ffbe4
  1. 2
      src/storm/shields/AbstractShield.cpp
  2. 4
      src/storm/shields/AbstractShield.h
  3. 2
      src/storm/shields/PostSafetyShield.cpp
  4. 2
      src/storm/shields/PostSafetyShield.h
  5. 2
      src/storm/shields/PreSafetyShield.cpp
  6. 2
      src/storm/shields/PreSafetyShield.h

2
src/storm/shields/AbstractShield.cpp

@ -6,7 +6,7 @@ namespace tempest {
namespace shields { namespace shields {
template<typename ValueType, typename IndexType> template<typename ValueType, typename IndexType>
AbstractShield<ValueType, IndexType>::AbstractShield(std::vector<IndexType> const& rowGroupIndices, std::vector<ValueType> const& choiceValues, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates) : rowGroupIndices(rowGroupIndices), choiceValues(choiceValues), shieldingExpression(shieldingExpression), optimizationDirection(optimizationDirection), relevantStates(relevantStates), coalitionStates(coalitionStates) { AbstractShield<ValueType, IndexType>::AbstractShield(std::vector<IndexType> const& rowGroupIndices, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates) : rowGroupIndices(rowGroupIndices), shieldingExpression(shieldingExpression), optimizationDirection(optimizationDirection), relevantStates(relevantStates), coalitionStates(coalitionStates) {
// Intentionally left empty. // Intentionally left empty.
} }

4
src/storm/shields/AbstractShield.h

@ -55,10 +55,10 @@ namespace tempest {
std::string getClassName() const; std::string getClassName() const;
protected: protected:
AbstractShield(std::vector<IndexType> const& rowGroupIndices, std::vector<ValueType> const& choiceValues, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates); AbstractShield(std::vector<IndexType> const& rowGroupIndices, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates);
std::vector<index_type> rowGroupIndices; std::vector<index_type> rowGroupIndices;
std::vector<value_type> choiceValues; //std::vector<value_type> choiceValues;
std::shared_ptr<storm::logic::ShieldExpression const> shieldingExpression; std::shared_ptr<storm::logic::ShieldExpression const> shieldingExpression;
storm::OptimizationDirection optimizationDirection; storm::OptimizationDirection optimizationDirection;

2
src/storm/shields/PostSafetyShield.cpp

@ -6,7 +6,7 @@ namespace tempest {
namespace shields { namespace shields {
template<typename ValueType, typename IndexType> template<typename ValueType, typename IndexType>
PostSafetyShield<ValueType, IndexType>::PostSafetyShield(std::vector<IndexType> const& rowGroupIndices, std::vector<ValueType> const& choiceValues, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates) : AbstractShield<ValueType, IndexType>(rowGroupIndices, choiceValues, shieldingExpression, optimizationDirection, relevantStates, coalitionStates) { PostSafetyShield<ValueType, IndexType>::PostSafetyShield(std::vector<IndexType> const& rowGroupIndices, std::vector<ValueType> const& choiceValues, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates) : AbstractShield<ValueType, IndexType>(rowGroupIndices, shieldingExpression, optimizationDirection, relevantStates, coalitionStates), choiceValues(choiceValues) {
// Intentionally left empty. // Intentionally left empty.
} }

2
src/storm/shields/PostSafetyShield.h

@ -14,6 +14,8 @@ namespace tempest {
storm::storage::PostScheduler<ValueType> construct(); storm::storage::PostScheduler<ValueType> construct();
template<typename Compare, bool relative> template<typename Compare, bool relative>
storm::storage::PostScheduler<ValueType> constructWithCompareType(); storm::storage::PostScheduler<ValueType> constructWithCompareType();
private:
std::vector<ValueType> choiceValues;
}; };
} }
} }

2
src/storm/shields/PreSafetyShield.cpp

@ -6,7 +6,7 @@ namespace tempest {
namespace shields { namespace shields {
template<typename ValueType, typename IndexType> template<typename ValueType, typename IndexType>
PreSafetyShield<ValueType, IndexType>::PreSafetyShield(std::vector<IndexType> const& rowGroupIndices, std::vector<ValueType> const& choiceValues, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates) : AbstractShield<ValueType, IndexType>(rowGroupIndices, choiceValues, shieldingExpression, optimizationDirection, relevantStates, coalitionStates) { PreSafetyShield<ValueType, IndexType>::PreSafetyShield(std::vector<IndexType> const& rowGroupIndices, std::vector<ValueType> const& choiceValues, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, storm::OptimizationDirection optimizationDirection, storm::storage::BitVector relevantStates, boost::optional<storm::storage::BitVector> coalitionStates) : AbstractShield<ValueType, IndexType>(rowGroupIndices, shieldingExpression, optimizationDirection, relevantStates, coalitionStates), choiceValues(choiceValues) {
// Intentionally left empty. // Intentionally left empty.
} }

2
src/storm/shields/PreSafetyShield.h

@ -13,6 +13,8 @@ namespace tempest {
storm::storage::Scheduler<ValueType> construct(); storm::storage::Scheduler<ValueType> construct();
template<typename Compare, bool relative> template<typename Compare, bool relative>
storm::storage::Scheduler<ValueType> constructWithCompareType(); storm::storage::Scheduler<ValueType> constructWithCompareType();
private:
std::vector<ValueType> choiceValues;
}; };
} }
} }
|||||||
100:0
Loading…
Cancel
Save