sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

used new helper functions at some points in the code

tempestpy_adaptions
TimQu 8 years ago
parent
8a7609fb83
commit
4413afb542
9 changed files with 33 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
  2. 16
      src/storm/modelchecker/parametric/SparseMdpParameterLiftingModelChecker.cpp
  3. 6
      src/storm/models/sparse/MarkovAutomaton.cpp
  4. 7
      src/storm/storage/SparseMatrix.cpp
  5. 2
      src/storm/storage/SparseMatrix.h
  6. 4
      src/storm/storage/geometry/nativepolytopeconversion/QuickHull.cpp
  7. 11
      src/storm/transformer/GoalStateMerger.cpp
  8. 4
      src/storm/transformer/SparseParametricModelSimplifier.cpp
  9. 13
      src/storm/utility/vector.h

2
src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
View File

@ -102,7 +102,7 @@ namespace storm {
storm::storage::BitVector probabilisticStates = ~this->model.getMarkovianStates();
result.states = createMS ? this->model.getMarkovianStates() : probabilisticStates;
result.choices = this->model.getTransitionMatrix().getRowIndicesOfRowGroups(result.states);
result.choices = this->model.getTransitionMatrix().getRowFilter(result.states);
STORM_LOG_ASSERT(!createMS || result.states.getNumberOfSetBits() == result.choices.getNumberOfSetBits(), "row groups for Markovian states should consist of exactly one row");
//We need to add diagonal entries for selfloops on Markovian states.

16
src/storm/modelchecker/parametric/SparseMdpParameterLiftingModelChecker.cpp
View File

@ -69,7 +69,7 @@ namespace storm {
// Create the vector of one-step probabilities to go to target states.
std::vector<typename SparseModelType::ValueType> b = this->parametricModel.getTransitionMatrix().getConstrainedRowSumVector(storm::storage::BitVector(this->parametricModel.getTransitionMatrix().getRowCount(), true), psiStates);
parameterLifter = std::make_unique<storm::transformer::ParameterLifter<typename SparseModelType::ValueType, ConstantType>>(this->parametricModel.getTransitionMatrix(), b, this->parametricModel.getTransitionMatrix().getRowIndicesOfRowGroups(maybeStates), maybeStates);
parameterLifter = std::make_unique<storm::transformer::ParameterLifter<typename SparseModelType::ValueType, ConstantType>>(this->parametricModel.getTransitionMatrix(), b, this->parametricModel.getTransitionMatrix().getRowFilter(maybeStates), maybeStates);
computePlayer1Matrix();
applyPreviousResultAsHint = false;
@ -104,7 +104,7 @@ namespace storm {
// Create the vector of one-step probabilities to go to target states.
std::vector<typename SparseModelType::ValueType> b = this->parametricModel.getTransitionMatrix().getConstrainedRowSumVector(storm::storage::BitVector(this->parametricModel.getTransitionMatrix().getRowCount(), true), statesWithProbability01.second);
parameterLifter = std::make_unique<storm::transformer::ParameterLifter<typename SparseModelType::ValueType, ConstantType>>(this->parametricModel.getTransitionMatrix(), b, this->parametricModel.getTransitionMatrix().getRowIndicesOfRowGroups(maybeStates), maybeStates);
parameterLifter = std::make_unique<storm::transformer::ParameterLifter<typename SparseModelType::ValueType, ConstantType>>(this->parametricModel.getTransitionMatrix(), b, this->parametricModel.getTransitionMatrix().getRowFilter(maybeStates), maybeStates);
computePlayer1Matrix();
// Check whether there is an EC consisting of maybestates
@ -146,16 +146,8 @@ namespace storm {
std::vector<typename SparseModelType::ValueType> b = rewardModel.getTotalRewardVector(this->parametricModel.getTransitionMatrix());
// We need to handle choices that lead to an infinity state.
// As a maybeState does not have reward infinity, such a choice will never be picked. Hence, we can unselect the corresponding rows
storm::storage::BitVector selectedRows = this->parametricModel.getTransitionMatrix().getRowIndicesOfRowGroups(maybeStates);
for (uint_fast64_t row : selectedRows) {
for (auto const& element : this->parametricModel.getTransitionMatrix().getRow(row)) {
if (infinityStates.get(element.getColumn())) {
selectedRows.set(row, false);
break;
}
}
}
// As a maybeState does not have reward infinity, a choice leading to an infinity state will never be picked. Hence, we can unselect the corresponding rows
storm::storage::BitVector selectedRows = this->parametricModel.getTransitionMatrix().getRowFilter(maybeStates, ~infinityStates);
parameterLifter = std::make_unique<storm::transformer::ParameterLifter<typename SparseModelType::ValueType, ConstantType>>(this->parametricModel.getTransitionMatrix(), b, selectedRows, maybeStates);
computePlayer1Matrix();

6
src/storm/models/sparse/MarkovAutomaton.cpp
View File

@ -140,14 +140,14 @@ namespace storm {
this->getTransitionMatrix() = this->getTransitionMatrix().restrictRows(keptChoices);
for(auto& rewModel : this->getRewardModels()) {
if(rewModel.second.hasStateActionRewards()) {
rewModel.second.getStateActionRewardVector() = storm::utility::vector::filterVector(rewModel.second.getStateActionRewardVector(), keptChoices);
storm::utility::vector::filterVectorInPlace(rewModel.second.getStateActionRewardVector(), keptChoices);
}
if(rewModel.second.hasTransitionRewards()) {
rewModel.second.getTransitionRewardMatrix() = rewModel.second.getTransitionRewardMatrix().restrictRows(keptChoices);
}
}
if(this->hasChoiceLabeling()) {
this->getOptionalChoiceLabeling() = storm::utility::vector::filterVector(this->getOptionalChoiceLabeling().get(), keptChoices);
storm::utility::vector::filterVectorInPlace(this->getOptionalChoiceLabeling().get(), keptChoices);
}
// Mark the automaton as closed.
@ -329,7 +329,7 @@ namespace storm {
storm::models::sparse::StateLabeling stateLabeling = this->getStateLabeling().getSubLabeling(keepStates);
boost::optional<std::vector<LabelSet>> optionalChoiceLabeling = this->getOptionalChoiceLabeling();
if (optionalChoiceLabeling) {
optionalChoiceLabeling = storm::utility::vector::filterVector(optionalChoiceLabeling.get(), keepStates);
storm::utility::vector::filterVectorInPlace(optionalChoiceLabeling.get(), keepStates);
}
//TODO update reward models according to kept states
STORM_LOG_WARN_COND(this->getRewardModels().empty(), "Conversion of MA to CTMC does not preserve rewards.");

7
src/storm/storage/SparseMatrix.cpp
View File

@ -555,10 +555,11 @@ namespace storm {
}
template<typename ValueType>
storm::storage::BitVector SparseMatrix<ValueType>::getRowIndicesOfRowGroups(storm::storage::BitVector const& groups) const {
storm::storage::BitVector SparseMatrix<ValueType>::getRowFilter(storm::storage::BitVector const& groupConstraint) const {
storm::storage::BitVector res(this->getRowCount(), false);
for(auto group : groups) {
for(uint_fast64_t row = this->getRowGroupIndices()[group]; row < this->getRowGroupIndices()[group+1]; ++row) {
for(auto group : groupConstraint) {
uint_fast64_t const endOfGroup = this->getRowGroupIndices()[group + 1];
for(uint_fast64_t row = this->getRowGroupIndices()[group]; row < endOfGroup; ++row) {
res.set(row, true);
}
}

2
src/storm/storage/SparseMatrix.h
View File

@ -569,7 +569,7 @@ namespace storm {
* @param groups the selected row groups
* @return a bit vector that is true at position i iff the row group of row i is selected.
*/
storm::storage::BitVector getRowIndicesOfRowGroups(storm::storage::BitVector const& groups) const;
storm::storage::BitVector getRowFilter(storm::storage::BitVector const& groupConstraint) const;
/*!
* Returns the indices of all rows that

4
src/storm/storage/geometry/nativepolytopeconversion/QuickHull.cpp
View File

@ -173,7 +173,7 @@ namespace storm {
}
}
}
points = storm::utility::vector::filterVector(points, keptPoints);
storm::utility::vector::filterVectorInPlace(points, keptPoints);
if (generateRelevantVerticesAndVertexSets) {
storm::storage::BitVector keptVertices(relevantVertices.size(), true);
@ -185,7 +185,7 @@ namespace storm {
}
}
}
relevantVertices = storm::utility::vector::filterVector(relevantVertices, keptVertices);
storm::utility::vector::filterVectorInPlace(relevantVertices, keptVertices);
STORM_LOG_WARN("Can not retrieve vertex sets for degenerated polytope (not implemented)");
vertexSets.clear();

11
src/storm/transformer/GoalStateMerger.cpp
View File

@ -46,11 +46,12 @@ namespace storm {
// Get the reward models
std::unordered_map<std::string, typename SparseModelType::RewardModelType> rewardModels;
for (auto rewardModelName : selectedRewardModels) {
auto origTotalRewards = originalModel.getRewardModel(rewardModelName).getTotalRewardVector(originalModel.getTransitionMatrix());
auto transitionsOfMaybeStates = originalModel.getTransitionMatrix().getRowIndicesOfRowGroups(maybeStates);
auto resTotalRewards = storm::utility::vector::filterVector(origTotalRewards, transitionsOfMaybeStates);
resTotalRewards.resize(transitionMatrix.getRowCount(), storm::utility::zero<typename SparseModelType::RewardModelType::ValueType>());
rewardModels.insert(std::make_pair(rewardModelName, typename SparseModelType::RewardModelType(boost::none, resTotalRewards)));
auto totalRewards = originalModel.getRewardModel(rewardModelName).getTotalRewardVector(originalModel.getTransitionMatrix());
auto choicesOfMaybeStates = originalModel.getTransitionMatrix().getRowFilter(maybeStates);
storm::utility::vector::filterVectorInPlace(totalRewards, choicesOfMaybeStates);
// add zero reward for the sink and goal states (if they exists)
totalRewards.resize(transitionMatrix.getRowCount(), storm::utility::zero<typename SparseModelType::RewardModelType::ValueType>());
rewardModels.insert(std::make_pair(rewardModelName, typename SparseModelType::RewardModelType(boost::none, totalRewards)));
}
// modify the given target and sink states

4
src/storm/transformer/SparseParametricModelSimplifier.cpp
View File

@ -138,13 +138,13 @@ namespace storm {
stateEliminator.eliminateState(state, true);
}
selectedStates.complement();
auto keptRows = sparseMatrix.getRowIndicesOfRowGroups(selectedStates);
auto keptRows = sparseMatrix.getRowFilter(selectedStates);
storm::storage::SparseMatrix<typename SparseModelType::ValueType> newTransitionMatrix = flexibleMatrix.createSparseMatrix(keptRows, selectedStates);
// obtain the reward model for the resulting system
std::unordered_map<std::string, typename SparseModelType::RewardModelType> rewardModels;
if(rewardModelName) {
actionRewards = storm::utility::vector::filterVector(actionRewards, keptRows);
storm::utility::vector::filterVectorInPlace(actionRewards, keptRows);
rewardModels.insert(std::make_pair(*rewardModelName, typename SparseModelType::RewardModelType(boost::none, std::move(actionRewards))));
}

13
src/storm/utility/vector.h
View File

@ -863,8 +863,15 @@ namespace storm {
void filterVectorInPlace(std::vector<Type>& v, storm::storage::BitVector const& filter) {
STORM_LOG_ASSERT(v.size() == filter.size(), "The filter size does not match the size of the input vector");
auto vIt = v.begin();
for(auto index : filter) {
*vIt = std::move(v[index]);
auto filterIt = filter.begin();
// get the first position where the filter has a 0.
// Note that we do not have to modify the entries of v on all positions before
for (uint_fast64_t i = 0; i == *filterIt && filterIt != filter.end(); ++i) {
++filterIt;
++vIt;
}
for (; filterIt != filter.end(); ++filterIt) {
*vIt = std::move(v[*filterIt]);
++vIt;
}
v.resize(vIt - v.begin());
@ -875,7 +882,7 @@ namespace storm {
bool hasNegativeEntry(std::vector<T> const& v){
return std::any_of(v.begin(), v.end(), [](T value){return value < storm::utility::zero<T>();});
}
template<typename T>
bool hasPositiveEntry(std::vector<T> const& v){
return std::any_of(v.begin(), v.end(), [](T value){return value > storm::utility::zero<T>();});

Write Preview
Loading…
Cancel
Save