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

first working version (for DTMCs only) 

Former-commit-id: d3c789596e
tempestpy_adaptions
dehnert 9 years ago
parent
034cf626a0
commit
9f52d9fa97
2 changed files with 29 additions and 40 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. 67
      src/modelchecker/reachability/SparseMdpLearningModelChecker.cpp
  2. 2
      src/modelchecker/reachability/SparseMdpLearningModelChecker.h

67
src/modelchecker/reachability/SparseMdpLearningModelChecker.cpp
View File

@ -61,7 +61,6 @@ namespace storm {
lowerBoundsPerAction[rowGroupIndices[stateToRowGroupMapping[sourceStateId]] + action] = newLowerValue;
STORM_LOG_TRACE("Updating lower value of action " << action << " of state " << sourceStateId << " to " << newLowerValue << ".");
upperBoundsPerAction[rowGroupIndices[stateToRowGroupMapping[sourceStateId]] + action] = newUpperValue;
std::cout << "writing " << newUpperValue << " at index " << (rowGroupIndices[stateToRowGroupMapping[sourceStateId]] + action) << std::endl;
STORM_LOG_TRACE("Updating upper value of action " << action << " of state " << sourceStateId << " to " << newUpperValue << ".");
// Check if we need to update the values for the states.
@ -78,17 +77,10 @@ namespace storm {
template<typename ValueType>
void SparseMdpLearningModelChecker<ValueType>::updateProbabilitiesUsingStack(std::vector<std::pair<StateType, uint32_t>>& stateActionStack, std::vector<std::vector<storm::storage::MatrixEntry<StateType, ValueType>>> const& transitionMatrix, std::vector<StateType> const& rowGroupIndices, std::vector<StateType> const& stateToRowGroupMapping, std::vector<ValueType>& lowerBoundsPerAction, std::vector<ValueType>& upperBoundsPerAction, std::vector<ValueType>& lowerBoundsPerState, std::vector<ValueType>& upperBoundsPerState, StateType const& unexploredMarker) const {
std::cout << "stack:" << std::endl;
for (auto const& entry : stateActionStack) {
std::cout << entry.first << " -[" << entry.second << "]-> ";
}
std::cout << std::endl;
while (stateActionStack.size() > 1) {
stateActionStack.pop_back();
updateProbabilities(stateActionStack.back().first, stateActionStack.back().second, transitionMatrix, rowGroupIndices, stateToRowGroupMapping, lowerBoundsPerAction, upperBoundsPerAction, lowerBoundsPerState, upperBoundsPerState, unexploredMarker);
}
}
@ -102,30 +94,31 @@ namespace storm {
std::vector<uint32_t> allMaxActions;
// Determine the maximal value of any action.
// ValueType max = 0;
// for (uint32_t row = rowGroupIndices[rowGroup]; row < rowGroupIndices[rowGroup + 1]; ++row) {
// ValueType current = 0;
// for (auto const& element : transitionMatrix[row]) {
// current += element.getValue() * upperBoundsPerState[stateToRowGroupMapping[element.getColumn()]];
// }
//
// max = std::max(max, current);
// }
STORM_LOG_TRACE("Looking for action with value " << upperBoundsPerState[stateToRowGroupMapping[currentStateId]] << ".");
ValueType max = 0;
for (uint32_t row = rowGroupIndices[rowGroup]; row < rowGroupIndices[rowGroup + 1]; ++row) {
ValueType current = 0;
for (auto const& element : transitionMatrix[row]) {
current += element.getValue() * (stateToRowGroupMapping[element.getColumn()] == unexploredMarker ? storm::utility::one<ValueType>() : upperBoundsPerState[stateToRowGroupMapping[element.getColumn()]]);
}
max = std::max(max, current);
}
// STORM_LOG_TRACE("Looking for action with value " << upperBoundsPerState[stateToRowGroupMapping[currentStateId]] << ".");
STORM_LOG_TRACE("Looking for action with value " << max << ".");
for (uint32_t row = rowGroupIndices[rowGroup]; row < rowGroupIndices[rowGroup + 1]; ++row) {
ValueType current = 0;
for (auto const& element : transitionMatrix[row]) {
std::cout << "+= " << element.getValue() << " * " << (stateToRowGroupMapping[element.getColumn()] == unexploredMarker ? storm::utility::one<ValueType>() : upperBoundsPerState[stateToRowGroupMapping[element.getColumn()]]) << " (col: " << element.getColumn() << " // row (grp) " << stateToRowGroupMapping[element.getColumn()] << ")" << std::endl;
current += element.getValue() * (stateToRowGroupMapping[element.getColumn()] == unexploredMarker ? storm::utility::one<ValueType>() : upperBoundsPerState[stateToRowGroupMapping[element.getColumn()]]);
}
STORM_LOG_TRACE("Computed (upper) bound " << current << " for row " << row << ".");
// If the action is one of the maximizing ones, insert it into our list.
// TODO: should this need to be an approximate check?
if (current == upperBoundsPerState[stateToRowGroupMapping[currentStateId]]) {
// if (current == upperBoundsPerState[stateToRowGroupMapping[currentStateId]]) {
if (current == max) {
allMaxActions.push_back(row);
std::cout << "found maximizing action " << row << std::endl;
}
}
@ -146,7 +139,9 @@ namespace storm {
// Now sample according to the probabilities.
std::discrete_distribution<StateType> distribution(probabilities.begin(), probabilities.end());
return transitionMatrix[row][distribution(generator)].getColumn();
StateType offset = distribution(generator);
STORM_LOG_TRACE("Sampled " << offset << " from " << probabilities.size() << " elements.");
return transitionMatrix[row][offset].getColumn();
}
template<typename ValueType>
@ -295,12 +290,12 @@ namespace storm {
// its behavior.
if (!foundTargetState) {
// Next, we insert the behavior into our matrix structure.
matrix.resize(matrix.size() + behavior.getNumberOfChoices());
StateType startRow = matrix.size();
matrix.resize(startRow + behavior.getNumberOfChoices());
uint32_t currentAction = 0;
for (auto const& choice : behavior) {
for (auto const& entry : choice) {
std::cout << "got " << currentStateId << " (row group " << stateToRowGroupMapping[currentStateId] << ") " << " -> " << entry.first << " with prob " << entry.second << std::endl;
matrix.back().emplace_back(entry.first, entry.second);
matrix[startRow + currentAction].emplace_back(entry.first, entry.second);
}
lowerBoundsPerAction.push_back(storm::utility::zero<ValueType>());
@ -324,6 +319,9 @@ namespace storm {
// we need to determine this now.
if (matrix[rowGroupIndices[stateToRowGroupMapping[currentStateId]]].empty()) {
foundTargetState = true;
// Update the bounds along the path to the terminal state.
updateProbabilitiesUsingStack(stateActionStack, matrix, rowGroupIndices, stateToRowGroupMapping, lowerBoundsPerAction, upperBoundsPerAction, lowerBoundsPerState, upperBoundsPerState, unexploredMarker);
}
}
@ -342,20 +340,11 @@ namespace storm {
}
}
for (auto const& el : lowerBoundsPerState) {
std::cout << el << " - ";
}
std::cout << std::endl;
for (auto const& el : upperBoundsPerState) {
std::cout << el << " - ";
}
std::cout << std::endl;
STORM_LOG_TRACE("Lower bound is " << lowerBoundsPerState[0] << ".");
STORM_LOG_TRACE("Upper bound is " << upperBoundsPerState[0] << ".");
STORM_LOG_DEBUG("Discovered states: " << stateStorage.numberOfStates << " (" << unexploredStates.size() << " unexplored).");
STORM_LOG_DEBUG("Lower bound is " << lowerBoundsPerState[0] << ".");
STORM_LOG_DEBUG("Upper bound is " << upperBoundsPerState[0] << ".");
ValueType difference = upperBoundsPerState[0] - lowerBoundsPerState[0];
STORM_LOG_TRACE("Difference after iteration " << iteration << " is " << difference << ".");
STORM_LOG_DEBUG("Difference after iteration " << iteration << " is " << difference << ".");
convergenceCriterionMet = difference < 1e-6;
++iteration;

2
src/modelchecker/reachability/SparseMdpLearningModelChecker.h
View File

@ -34,7 +34,7 @@ namespace storm {
uint32_t sampleFromMaxActions(StateType currentStateId, std::vector<std::vector<storm::storage::MatrixEntry<StateType, ValueType>>> const& transitionMatrix, std::vector<StateType> const& rowGroupIndices, std::vector<StateType> const& stateToRowGroupMapping, std::vector<ValueType>& upperBounds, StateType const& unexploredMarker);
StateType sampleSuccessorFromAction(StateType currentStateId, std::vector<std::vector<storm::storage::MatrixEntry<StateType, ValueType>>> const& transitionMatrix, std::vector<StateType> const& rowGroupIndices, std::vector<StateType> const& stateToRowGroupMapping);
// The program that defines the model to check.
storm::prism::Program program;

Write Preview
Loading…
Cancel
Save