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

fixed formula substitution within renamed modules of a prism program

tempestpy_adaptions
TimQu 6 years ago
parent
c388d1c8fe
commit
6e2046e357
2 changed files with 91 additions and 28 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. 98
      src/storm/storage/prism/Program.cpp
  2. 21
      src/storm/storage/prism/Program.h

98
src/storm/storage/prism/Program.cpp
View File

@ -324,22 +324,77 @@ namespace storm {
}
std::map<storm::expressions::Variable, storm::expressions::Expression> Program::getConstantsSubstitution() const {
std::map<storm::expressions::Variable, storm::expressions::Expression> constantsSubstitution;
for (auto const& constant : this->getConstants()) {
if (constant.isDefined()) {
constantsSubstitution.emplace(constant.getExpressionVariable(), constant.getExpression());
return getConstantsFormulasSubstitution(true, false);
}
std::map<storm::expressions::Variable, storm::expressions::Expression> Program::getFormulasSubstitution() const {
return getConstantsFormulasSubstitution(false, true);
}
std::map<storm::expressions::Variable, storm::expressions::Expression> Program::getConstantsFormulasSubstitution(bool getConstantsSubstitution, bool getFormulasSubstitution) const {
std::map<storm::expressions::Variable, storm::expressions::Expression> result;
if (getConstantsSubstitution) {
for (auto const& constant : this->getConstants()) {
if (constant.isDefined()) {
result.emplace(constant.getExpressionVariable(), constant.getExpression().substitute(result));
}
}
}
return constantsSubstitution;
if (getFormulasSubstitution) {
for (auto const& formula : this->getFormulas()) {
result.emplace(formula.getExpressionVariable(), formula.getExpression().substitute(result));
}
}
return result;
}
std::map<storm::expressions::Variable, storm::expressions::Expression> Program::getConstantsFormulasSubstitution() const {
auto result = getConstantsSubstitution();
for (auto const& formula : this->getFormulas()) {
result.emplace(formula.getExpressionVariable(), formula.getExpression());
std::map<storm::expressions::Variable, storm::expressions::Expression> Program::getSubstitutionForRenamedModule(Module const& renamedModule, std::map<storm::expressions::Variable, storm::expressions::Expression> const& substitution) const {
auto renaming = getFinalRenamingOfModule(renamedModule);
std::map<storm::expressions::Variable, storm::expressions::Expression> renamingAsSubstitution;
for (auto const& renamingPair : renaming) {
if (getManager().hasVariable(renamingPair.first)) {
assert(getManager().hasVariable(renamingPair.second));
renamingAsSubstitution.emplace(getManager().getVariable(renamingPair.first), getManager().getVariableExpression(renamingPair.second));
}
}
return result;
std::map<storm::expressions::Variable, storm::expressions::Expression> newSubstitution;
for (auto const& substVarExpr : substitution) {
STORM_LOG_ASSERT(renamingAsSubstitution.count(substVarExpr.first) == 0, "Conflict: The substitution substitutes the renamed variable " << substVarExpr.first.getName() << ".");
newSubstitution.emplace(substVarExpr.first, substVarExpr.second.substitute(renamingAsSubstitution));
}
return newSubstitution;
}
std::map<std::string, std::string> Program::getFinalRenamingOfModule(Module const& renamedModule) const {
std::vector<Module const*> moduleStack = {&renamedModule};
while (moduleStack.back()->isRenamedFromModule()) {
moduleStack.push_back(&getModule(moduleStack.back()->getBaseModule()));
}
assert(!moduleStack.back()->isRenamedFromModule());
moduleStack.pop_back();
assert(moduleStack.empty() || moduleStack.back()->isRenamedFromModule());
std::map<std::string, std::string> currentRenaming;
while (!moduleStack.empty()) {
Module const& currentModule = *moduleStack.back();
moduleStack.pop_back();
assert(currentModule.isRenamedFromModule());
std::map<std::string, std::string> newRenaming = currentModule.getRenaming();
for (auto const& renaimingPair : newRenaming) {
auto findRes = currentRenaming.find(renaimingPair.second);
if (findRes != currentRenaming.end()) {
newRenaming[renaimingPair.second] = findRes->second;
currentRenaming.erase(findRes);
}
}
newRenaming.insert(currentRenaming.begin(), currentRenaming.end());
currentRenaming = std::move(newRenaming);
}
return currentRenaming;
}
std::size_t Program::getNumberOfConstants() const {
return this->getConstants().size();
@ -805,36 +860,20 @@ namespace storm {
Program Program::substituteConstantsFormulas(bool substituteConstants, bool substituteFormulas) const {
// We start by creating the appropriate substitution.
std::map<storm::expressions::Variable, storm::expressions::Expression> substitution;
std::map<storm::expressions::Variable, storm::expressions::Expression> substitution = getConstantsFormulasSubstitution(substituteConstants, substituteFormulas);
// Start with substituting constants. In a sane model, constant definitions do not contain formulas.
std::vector<Constant> newConstants;
newConstants.reserve(this->getNumberOfConstants());
for (auto const& oldConstant : this->getConstants()) {
// apply the substitutions gathered so far to the constant definition *before* adding it to the substitution.
newConstants.push_back(oldConstant.substitute(substitution));
// Put the corresponding expression in the substitution (if requested).
auto const& constant = newConstants.back();
if (substituteConstants && constant.isDefined()) {
substitution.emplace(constant.getExpressionVariable(), constant.getExpression().simplify());
}
}
// Secondly, handle the formulas. These might contain constants
std::vector<Formula> newFormulas;
newFormulas.reserve(this->getNumberOfFormulas());
for (auto const& oldFormula : this->getFormulas()) {
// apply the currently gathered substitutions on the formula definition *before* adding it to the substitution.
newFormulas.emplace_back(oldFormula.substitute(substitution));
// Put the corresponding expression in the substitution (if requested).
auto const& formula = newFormulas.back();
if (substituteFormulas) {
substitution.emplace(formula.getExpressionVariable(), formula.getExpression().simplify());
}
}
// Now we can substitute the constants/formulas in all expressions appearing in the program.
std::vector<BooleanVariable> newBooleanVariables;
newBooleanVariables.reserve(this->getNumberOfGlobalBooleanVariables());
for (auto const& booleanVariable : this->getGlobalBooleanVariables()) {
@ -850,6 +889,11 @@ namespace storm {
std::vector<Module> newModules;
newModules.reserve(this->getNumberOfModules());
for (auto const& module : this->getModules()) {
if (module.isRenamedFromModule()) {
// The renaming needs to be applied to the substitution as well.
auto renamedSubstitution = getSubstitutionForRenamedModule(module, substitution);
newModules.emplace_back(module.substitute(renamedSubstitution));
}
newModules.emplace_back(module.substitute(substitution));
}

21
src/storm/storage/prism/Program.h
View File

@ -138,13 +138,31 @@ namespace storm {
*/
std::map<storm::expressions::Variable, storm::expressions::Expression> getConstantsSubstitution() const;
/*!
* Retrieves a mapping of all formula variables to their defining expressions.
*
* @return A mapping from constants to their 'values'.
*/
std::map<storm::expressions::Variable, storm::expressions::Expression> getFormulasSubstitution() const;
/*!
* Retrieves a mapping of all defined constants and formula variables to their defining expressions
*
* @return A mapping from constants and formulas to their expressions.
*/
std::map<storm::expressions::Variable, storm::expressions::Expression> getConstantsFormulasSubstitution() const;
std::map<storm::expressions::Variable, storm::expressions::Expression> getConstantsFormulasSubstitution(bool getConstantsSubstitution = true, bool getFormulasSubstitution = true) const;
/*!
* Applies the renaming of a renamed module to the given substitution.
*/
std::map<storm::expressions::Variable, storm::expressions::Expression> getSubstitutionForRenamedModule(Module const& renamedModule, std::map<storm::expressions::Variable, storm::expressions::Expression> const& substitution) const;
/*!
* Gets the renaming of a module after flattening all renamings.
* Note that the base of a renamed module might again be a renamed module.
*/
std::map<std::string, std::string> getFinalRenamingOfModule(Module const& renamedModule) const;
/*!
* Retrieves all constants defined in the program.
*
@ -580,6 +598,7 @@ namespace storm {
/*!
* Substitutes all formulas appearing in the expressions of the program by their defining expressions.
*
* The resulting program still contains the function definition, but does not apply them.
* @return The resulting program that only contains expressions over variables of the program (and maybe constants).
*/
Program substituteFormulas() const;

Write Preview
Loading…
Cancel
Save