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

fixing one bug in abstraction using decomposition, started tracking down more

tempestpy_adaptions
dehnert 7 years ago
parent
8c96548566
commit
7ef779a8a6
3 changed files with 29 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/storm/abstraction/jani/EdgeAbstractor.cpp
  2. 23
      src/storm/abstraction/prism/CommandAbstractor.cpp
  3. 6
      src/storm/abstraction/prism/PrismMenuGameAbstractor.cpp

2
src/storm/abstraction/jani/EdgeAbstractor.cpp
View File

@ -561,9 +561,9 @@ namespace storm {
} else { } else {
updateBdd &= !this->getAbstractionInformation().encodePredicateAsSuccessor(variableIndexPair.second); updateBdd &= !this->getAbstractionInformation().encodePredicateAsSuccessor(variableIndexPair.second);
} }
updateBdd &= this->getAbstractionInformation().encodeAux(destinationIndex, 0, this->getAbstractionInformation().getAuxVariableCount());
} }
updateBdd &= this->getAbstractionInformation().encodeAux(destinationIndex, 0, this->getAbstractionInformation().getAuxVariableCount());
result |= updateBdd; result |= updateBdd;
} }

23
src/storm/abstraction/prism/CommandAbstractor.cpp
View File

@ -240,6 +240,8 @@ namespace storm {
uint64_t numberOfSolutions = 0; uint64_t numberOfSolutions = 0;
uint64_t numberOfTotalSolutions = 0; uint64_t numberOfTotalSolutions = 0;
std::cout << localExpressionInformation << std::endl;
// If we need to enumerate the guard, do it only once now. // If we need to enumerate the guard, do it only once now.
if (enumerateAbstractGuard) { if (enumerateAbstractGuard) {
std::set<uint64_t> relatedGuardPredicates = localExpressionInformation.getRelatedExpressions(variablesContainedInGuard); std::set<uint64_t> relatedGuardPredicates = localExpressionInformation.getRelatedExpressions(variablesContainedInGuard);
@ -258,8 +260,10 @@ namespace storm {
return true; return true;
}); });
STORM_LOG_TRACE("Enumerated " << numberOfSolutions << " solutions for abstract guard."); STORM_LOG_TRACE("Enumerated " << numberOfSolutions << " solutions for abstract guard.");
abstractGuard.template toAdd<ValueType>().exportToDot("abstractguard" + std::to_string(command.get().getGlobalIndex()) + ".dot");
// now that we have the abstract guard, we can add it as an assertion to the solver before enumerating
// Now that we have the abstract guard, we can add it as an assertion to the solver before enumerating
// the other solutions. // the other solutions.
// Create a new backtracking point before adding the guard. // Create a new backtracking point before adding the guard.
@ -297,7 +301,9 @@ namespace storm {
std::vector<storm::expressions::Variable> transitionDecisionVariables; std::vector<storm::expressions::Variable> transitionDecisionVariables;
std::vector<std::pair<storm::expressions::Variable, uint_fast64_t>> sourceVariablesAndPredicates; std::vector<std::pair<storm::expressions::Variable, uint_fast64_t>> sourceVariablesAndPredicates;
for (auto const& element : relevantPredicatesAndVariables.first) { for (auto const& element : relevantPredicatesAndVariables.first) {
std::cout << "1-querying " << abstractionInformation.get().getPredicateByIndex(element.second) << std::endl;
if (relevantPredicates.find(element.second) != relevantPredicates.end()) { if (relevantPredicates.find(element.second) != relevantPredicates.end()) {
std::cout << "1-is relevant!" << std::endl;
transitionDecisionVariables.push_back(element.first); transitionDecisionVariables.push_back(element.first);
sourceVariablesAndPredicates.push_back(element); sourceVariablesAndPredicates.push_back(element);
} }
@ -308,10 +314,14 @@ namespace storm {
destinationVariablesAndPredicates.emplace_back(); destinationVariablesAndPredicates.emplace_back();
for (auto const& assignment : command.get().getUpdate(updateIndex).getAssignments()) { for (auto const& assignment : command.get().getUpdate(updateIndex).getAssignments()) {
uint64_t assignmentVariableBlockIndex = localExpressionInformation.getBlockIndexOfVariable(assignment.getVariable()); uint64_t assignmentVariableBlockIndex = localExpressionInformation.getBlockIndexOfVariable(assignment.getVariable());
std::set<uint64_t> const& assignmentVariableBlock = localExpressionInformation.getExpressionBlock(assignmentVariableBlockIndex);
std::cout << "assignment variable " << assignment.getVariable().getName() << " block index: " << assignmentVariableBlockIndex << std::endl;
if (block.find(assignmentVariableBlockIndex) != block.end()) { if (block.find(assignmentVariableBlockIndex) != block.end()) {
std::set<uint64_t> const& assignmentVariableBlock = localExpressionInformation.getExpressionBlock(assignmentVariableBlockIndex);
for (auto const& element : relevantPredicatesAndVariables.second[updateIndex]) { for (auto const& element : relevantPredicatesAndVariables.second[updateIndex]) {
std::cout << "2-querying " << abstractionInformation.get().getPredicateByIndex(element.second) << std::endl;
if (assignmentVariableBlock.find(element.second) != assignmentVariableBlock.end()) { if (assignmentVariableBlock.find(element.second) != assignmentVariableBlock.end()) {
std::cout << "2-is relevant!" << std::endl;
destinationVariablesAndPredicates.back().push_back(element); destinationVariablesAndPredicates.back().push_back(element);
transitionDecisionVariables.push_back(element.first); transitionDecisionVariables.push_back(element.first);
} }
@ -355,6 +365,7 @@ namespace storm {
storm::dd::Bdd<DdType> allDistributions = this->getAbstractionInformation().getDdManager().getBddZero(); storm::dd::Bdd<DdType> allDistributions = this->getAbstractionInformation().getDdManager().getBddZero();
for (auto const& distribution : sourceDistributionsPair.second) { for (auto const& distribution : sourceDistributionsPair.second) {
allDistributions |= distribution && this->getAbstractionInformation().encodePlayer2Choice(distributionIndex, usedNondeterminismVariables, usedNondeterminismVariables + numberOfVariablesNeeded); allDistributions |= distribution && this->getAbstractionInformation().encodePlayer2Choice(distributionIndex, usedNondeterminismVariables, usedNondeterminismVariables + numberOfVariablesNeeded);
distribution.template toAdd<ValueType>().exportToDot("dist" + std::to_string(distributionIndex) + ".dot");
++distributionIndex; ++distributionIndex;
STORM_LOG_ASSERT(!allDistributions.isZero(), "The BDD must not be empty."); STORM_LOG_ASSERT(!allDistributions.isZero(), "The BDD must not be empty.");
} }
@ -364,6 +375,9 @@ namespace storm {
} }
usedNondeterminismVariables += numberOfVariablesNeeded; usedNondeterminismVariables += numberOfVariablesNeeded;
// resultBdd.template toAdd<ValueType>().exportToDot("result.dot");
// exit(-1);
blockBdds.push_back(resultBdd); blockBdds.push_back(resultBdd);
++blockCounter; ++blockCounter;
} }
@ -406,6 +420,8 @@ namespace storm {
// multiply with missing identities // multiply with missing identities
resultBdd &= computeMissingIdentities(); resultBdd &= computeMissingIdentities();
resultBdd.template toAdd<ValueType>().exportToDot("decomp_idents" + std::to_string(command.get().getGlobalIndex()) + ".dot");
// cache and return result // cache and return result
resultBdd &= this->getAbstractionInformation().encodePlayer1Choice(command.get().getGlobalIndex(), this->getAbstractionInformation().getPlayer1VariableCount()); resultBdd &= this->getAbstractionInformation().encodePlayer1Choice(command.get().getGlobalIndex(), this->getAbstractionInformation().getPlayer1VariableCount());
@ -595,9 +611,10 @@ namespace storm {
} else { } else {
updateBdd &= !this->getAbstractionInformation().encodePredicateAsSuccessor(variableIndexPair.second); updateBdd &= !this->getAbstractionInformation().encodePredicateAsSuccessor(variableIndexPair.second);
} }
updateBdd &= this->getAbstractionInformation().encodeAux(updateIndex, 0, this->getAbstractionInformation().getAuxVariableCount());
} }
updateBdd &= this->getAbstractionInformation().encodeAux(updateIndex, 0, this->getAbstractionInformation().getAuxVariableCount());
result |= updateBdd; result |= updateBdd;
} }

6
src/storm/abstraction/prism/PrismMenuGameAbstractor.cpp
View File

@ -181,6 +181,12 @@ namespace storm {
initialStates.addMetaVariables(abstractionInformation.getSourcePredicateVariables()); initialStates.addMetaVariables(abstractionInformation.getSourcePredicateVariables());
storm::dd::Bdd<DdType> reachableStates = storm::utility::dd::computeReachableStates(initialStates, transitionRelation, abstractionInformation.getSourceVariables(), abstractionInformation.getSuccessorVariables()); storm::dd::Bdd<DdType> reachableStates = storm::utility::dd::computeReachableStates(initialStates, transitionRelation, abstractionInformation.getSourceVariables(), abstractionInformation.getSuccessorVariables());
transitionRelation.template toAdd<ValueType>().exportToDot("transrel.dot");
(initialStates && transitionRelation).template toAdd<ValueType>().exportToDot("transrelinit.dot");
(transitionRelation && abstractionInformation.encodePlayer1Choice(6, this->getAbstractionInformation().getPlayer1VariableCount())).template toAdd<ValueType>().exportToDot("trans6.dot");
initialStates.template toAdd<ValueType>().exportToDot("initial.dot");
relevantStatesWatch.start(); relevantStatesWatch.start();
if (this->isRestrictToRelevantStatesSet() && this->hasTargetStateExpression()) { if (this->isRestrictToRelevantStatesSet() && this->hasTargetStateExpression()) {
// Get the target state BDD. // Get the target state BDD.

Write Preview
Loading…
Cancel
Save