Browse Source

started working on improved JANI model building that still allows for more relaxed rules than PRISM when it comes to writing global variables

Former-commit-id: 9b216dc98e
tempestpy_adaptions
dehnert 9 years ago
parent
commit
3d4552cbf8
  1. 1252
      src/builder/DdJaniModelBuilder.cpp
  2. 4
      src/builder/DdPrismModelBuilder.cpp

1252
src/builder/DdJaniModelBuilder.cpp
File diff suppressed because it is too large
View File

4
src/builder/DdPrismModelBuilder.cpp

@ -788,7 +788,7 @@ namespace storm {
STORM_LOG_WARN_COND(temporary.isZero() || generationInfo.program.getModelType() == storm::prism::Program::ModelType::CTMC, "Guard of a command overlaps with previous guards.");
allGuards += commandDd.guardDd;
allCommands += commandDd.guardDd * commandDd.transitionsDd;
allCommands += commandDd.transitionsDd;
}
return ActionDecisionDiagram(allGuards, allCommands, assignedGlobalVariables);
@ -873,7 +873,7 @@ namespace storm {
continue;
}
// Split the currentChoices nondeterministic choices.
// Split the nondeterministic choices.
for (uint_fast64_t k = 0; k < currentChoices; ++k) {
// Calculate the overlapping part of command guard and the remaining DD.
storm::dd::Bdd<Type> remainingGuardChoicesIntersection = guardChoicesIntersection && remainingDds[k];

Loading…
Cancel
Save