patrick/anthem
1
0
Fork 0
Code Issues 15 Releases 21 Activity

Propagate predicate parameter domains

Browse Source 
With this change, domains detected for predicate parameters are properly
propagated to all occurences of the respective variables, enabling more
integer simplifications.
This commit is contained in:
Patrick Lühne 2018-04-19 16:57:27 +02:00
parent 862d03881a
commit 7ba48044ee
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/anthem/IntegerVariableDetection.cpp
View File

@ -237,9 +237,28 @@ struct VariableDomainInFormulaVisitor
return ast::Domain::Unknown;
}
static ast::Domain visit(ast::Predicate &, ast::VariableDeclaration &)
static ast::Domain visit(ast::Predicate &predicate, ast::VariableDeclaration &variableDeclaration)
{
// TODO: implement correctly
// TODO: check implementation for nested arguments
// Inherit the domain of the predicate’s parameters
for (size_t i = 0; i < predicate.arguments.size(); i++)
{
auto &argument = predicate.arguments[i];
if (!argument.is<ast::Variable>())
continue;
auto &variable = argument.get<ast::Variable>();
if (variable.declaration != &variableDeclaration)
continue;
auto &parameter = predicate.declaration->parameters[i];
return parameter.domain;
}
return ast::Domain::Unknown;
}
};
@ -291,11 +310,15 @@ struct DetectIntegerVariablesVisitor
operationResult = OperationResult::Changed;
for (auto &variableDeclaration : exists.variables)
if (variableDeclaration->domain == ast::Domain::Unknown
&& exists.argument.accept(VariableDomainInFormulaVisitor(), *variableDeclaration) == ast::Domain::Integer)
if (variableDeclaration->domain != ast::Domain::General)
{
auto newDomain = exists.argument.accept(VariableDomainInFormulaVisitor(), *variableDeclaration);
if (variableDeclaration->domain == newDomain)
continue;
operationResult = OperationResult::Changed;
variableDeclaration->domain = ast::Domain::Integer;
variableDeclaration->domain = newDomain;
}
return operationResult;
@ -309,11 +332,15 @@ struct DetectIntegerVariablesVisitor
operationResult = OperationResult::Changed;
for (auto &variableDeclaration : forAll.variables)
if (variableDeclaration->domain == ast::Domain::Unknown
&& forAll.argument.accept(VariableDomainInFormulaVisitor(), *variableDeclaration) == ast::Domain::Integer)
if (variableDeclaration->domain != ast::Domain::General)
{
auto newDomain = forAll.argument.accept(VariableDomainInFormulaVisitor(), *variableDeclaration);
if (variableDeclaration->domain == newDomain)
continue;
operationResult = OperationResult::Changed;
variableDeclaration->domain = ast::Domain::Integer;
variableDeclaration->domain = newDomain;
}
return operationResult;
@ -387,18 +414,42 @@ void detectIntegerVariables(std::vector<ast::Formula> &completedFormulas)
if (!biconditional.left.is<ast::Predicate>())
continue;
auto &predicate = biconditional.left.get<ast::Predicate>();
auto &definition = biconditional.right;
if (definition.accept(DetectIntegerVariablesVisitor()) == OperationResult::Changed)
operationResult = OperationResult::Changed;
for (auto &variableDeclaration : forAll.variables)
if (variableDeclaration->domain == ast::Domain::Unknown
&& definition.accept(VariableDomainInFormulaVisitor(), *variableDeclaration) == ast::Domain::Integer)
if (variableDeclaration->domain != ast::Domain::General)
{
auto newDomain = forAll.argument.accept(VariableDomainInFormulaVisitor(), *variableDeclaration);
if (variableDeclaration->domain == newDomain)
continue;
operationResult = OperationResult::Changed;
variableDeclaration->domain = ast::Domain::Integer;
variableDeclaration->domain = newDomain;
}
assert(predicate.arguments.size() == predicate.declaration->arity());
// Update parameter domains
for (size_t i = 0; i < predicate.arguments.size(); i++)
{
auto &variableArgument = predicate.arguments[i];
assert(variableArgument.is<ast::Variable>());
auto &variable = variableArgument.get<ast::Variable>();
auto &parameter = predicate.declaration->parameters[i];
if (parameter.domain == variable.declaration->domain)
continue;
operationResult = OperationResult::Changed;
parameter.domain = variable.declaration->domain;
}
}
}
}