patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Allowing “not” expressions without introducing derived predicates.

Browse Source
This commit is contained in:
Patrick Lühne 2017-06-27 12:39:51 +02:00
parent 5c93840f85
commit 1516561a58
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pddlparse/src/pddlparse/detail/normalization/Precondition.cpp
View File

@ -134,17 +134,6 @@ normalizedAST::Literal normalizeNested(ast::ImplyPointer<ast::Precondition> &, n
normalizedAST::Literal normalizeNested(ast::NotPointer<ast::Precondition> &not_, normalizedAST::DerivedPredicateDeclarations &derivedPredicates) normalizedAST::Literal normalizeNested(ast::NotPointer<ast::Precondition> &not_, normalizedAST::DerivedPredicateDeclarations &derivedPredicates)
{ {
// “not” expressions may be nested one time to form simple literals
if (not_->argument.is<ast::AtomicFormula>())
return std::make_unique<normalizedAST::Not<normalizedAST::AtomicFormula>>(normalize(std::move(not_->argument.get<ast::AtomicFormula>())));
std::vector<normalizedAST::VariableDeclaration *> parameters;
VariableStack variableStack;
collectFreeVariables(not_, parameters, variableStack);
auto derivedPredicate = addDerivedPredicate(parameters, derivedPredicates);
auto normalizedArgumentLiteral = not_->argument.match( auto normalizedArgumentLiteral = not_->argument.match(
[&](auto &x) -> normalizedAST::Literal [&](auto &x) -> normalizedAST::Literal
{ {
@ -157,10 +146,7 @@ normalizedAST::Literal normalizeNested(ast::NotPointer<ast::Precondition> &not_,
auto &normalizedArgument = normalizedArgumentLiteral.get<normalizedAST::AtomicFormula>(); auto &normalizedArgument = normalizedArgumentLiteral.get<normalizedAST::AtomicFormula>();
derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::Not<normalizedAST::AtomicFormula>>(std::move(normalizedArgument)); return std::make_unique<normalizedAST::Not<normalizedAST::AtomicFormula>>(std::move(normalizedArgument));
// TODO: investigate, could be a compiler bug
return std::move(derivedPredicate);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////