Browse Source

pass bitvector of coal states to helper

tempestpy_adaptions
Stefan Pranger 4 years ago
parent
commit
6559a3554a
  1. 2
      src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicGameInfiniteHorizonHelper.cpp
  2. 6
      src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicGameInfiniteHorizonHelper.h

2
src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicGameInfiniteHorizonHelper.cpp

@ -24,7 +24,7 @@ namespace storm {
namespace helper { namespace helper {
template <typename ValueType> template <typename ValueType>
SparseNondeterministicGameInfiniteHorizonHelper<ValueType>::SparseNondeterministicGameInfiniteHorizonHelper(storm::storage::SparseMatrix<ValueType> const& transitionMatrix, std::vector<std::pair<std::string, uint_fast64_t>> const& player) : SparseInfiniteHorizonHelper<ValueType, true>(transitionMatrix), player(player) {
SparseNondeterministicGameInfiniteHorizonHelper<ValueType>::SparseNondeterministicGameInfiniteHorizonHelper(storm::storage::SparseMatrix<ValueType> const& transitionMatrix, storm::storage::BitVector statesOfCoalition) : SparseInfiniteHorizonHelper<ValueType, true>(transitionMatrix), statesOfCoalition(statesOfCoalition) {
// Intentionally left empty. // Intentionally left empty.
} }

6
src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicGameInfiniteHorizonHelper.h

@ -2,6 +2,8 @@
#include "storm/modelchecker/helper/infinitehorizon/SparseInfiniteHorizonHelper.h" #include "storm/modelchecker/helper/infinitehorizon/SparseInfiniteHorizonHelper.h"
#include "storm/storage/BitVector.h"
namespace storm { namespace storm {
namespace storage { namespace storage {
@ -28,7 +30,7 @@ namespace storm {
/*! /*!
* Initializes the helper for a discrete time model with different players (i.e. SMG) * Initializes the helper for a discrete time model with different players (i.e. SMG)
*/ */
SparseNondeterministicGameInfiniteHorizonHelper(storm::storage::SparseMatrix<ValueType> const& transitionMatrix, std::vector<std::pair<std::string, uint_fast64_t>> const& player);
SparseNondeterministicGameInfiniteHorizonHelper(storm::storage::SparseMatrix<ValueType> const& transitionMatrix, storm::storage::BitVector statesOfCoalition);
/*! TODO /*! TODO
* Computes the long run average value given the provided state and action based rewards * Computes the long run average value given the provided state and action based rewards
@ -64,7 +66,7 @@ namespace storm {
std::vector<ValueType> buildAndSolveSsp(Environment const& env, std::vector<ValueType> const& mecLraValues); std::vector<ValueType> buildAndSolveSsp(Environment const& env, std::vector<ValueType> const& mecLraValues);
private: private:
std::vector<std::pair<std::string, uint_fast64_t>> player;
storm::storage::BitVector statesOfCoalition;
}; };

Loading…
Cancel
Save