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

Made effect variant more concise.

Browse Source
This commit is contained in:
Patrick Lühne 2017-06-27 17:50:42 +02:00
parent 4622f31fa4
commit 0beab67bd4
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pddlparse/include/pddlparse/ASTForward.h
View File

@ -219,10 +219,9 @@ namespace detail
{ {
// TODO: add missing types // TODO: add missing types
using EffectT = Variant< using EffectT = Variant<
AtomicFormula, Literal,
AndPointer<Effect>, AndPointer<Effect>,
ForAllPointer<Effect>, ForAllPointer<Effect>,
NotPointer<Effect>,
WhenPointer<Precondition, ConditionalEffect>>; WhenPointer<Precondition, ConditionalEffect>>;
} }

2
lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp
View File

@ -72,7 +72,7 @@ std::experimental::optional<ast::Effect> parseEffectBody(Context &context, ASTCo
// Now, test supported expressions // Now, test supported expressions
std::experimental::optional<ast::Effect> effect; std::experimental::optional<ast::Effect> effect;
if ((effect = parseNot<ast::Effect>(context, astContext, variableStack, parseAtomicFormula)) if ((effect = parseNot<ast::AtomicFormula>(context, astContext, variableStack, parseAtomicFormula))
|| (effect = parseAtomicFormula(context, astContext, variableStack))) || (effect = parseAtomicFormula(context, astContext, variableStack)))
{ {
return std::move(effect.value()); return std::move(effect.value());

18
lib/pddlparse/tests/TestOfficialPDDLInstances.cpp
View File

@ -87,25 +87,25 @@ TEST_CASE("[PDDL instances] The official PDDL instances are parsed correctly", "
REQUIRE(precondition2->arguments.empty()); REQUIRE(precondition2->arguments.empty());
const auto &effectAnd = actions[3]->effect.value().get<pddl::ast::AndPointer<pddl::ast::Effect>>(); const auto &effectAnd = actions[3]->effect.value().get<pddl::ast::AndPointer<pddl::ast::Effect>>();
const auto &effect0 = effectAnd->arguments[0].get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>(); const auto &effect0 = effectAnd->arguments[0].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
// TODO: check declaration once implemented // TODO: check declaration once implemented
REQUIRE(effect0->arguments.size() == 1); REQUIRE(effect0->arguments.size() == 1);
CHECK(effect0->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x"); CHECK(effect0->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x");
CHECK(effect0->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get()); CHECK(effect0->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get());
const auto &effect1 = effectAnd->arguments[1].get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>(); const auto &effect1 = effectAnd->arguments[1].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
// TODO: check declaration once implemented // TODO: check declaration once implemented
REQUIRE(effect1->arguments.size() == 1); REQUIRE(effect1->arguments.size() == 1);
CHECK(effect1->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "y"); CHECK(effect1->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "y");
CHECK(effect1->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get()); CHECK(effect1->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get());
const auto &effectNot2 = effectAnd->arguments[2].get<pddl::ast::NotPointer<pddl::ast::Effect>>()->argument.get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>(); const auto &effectNot2 = effectAnd->arguments[2].get<pddl::ast::Literal>().get<pddl::ast::NotPointer<pddl::ast::AtomicFormula>>()->argument.get<pddl::ast::PredicatePointer>();
// TODO: check declaration once implemented // TODO: check declaration once implemented
REQUIRE(effectNot2->arguments.size() == 1); REQUIRE(effectNot2->arguments.size() == 1);
CHECK(effectNot2->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x"); CHECK(effectNot2->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x");
CHECK(effectNot2->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get()); CHECK(effectNot2->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get());
const auto &effectNot3 = effectAnd->arguments[3].get<pddl::ast::NotPointer<pddl::ast::Effect>>()->argument.get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>(); const auto &effectNot3 = effectAnd->arguments[3].get<pddl::ast::Literal>().get<pddl::ast::NotPointer<pddl::ast::AtomicFormula>>()->argument.get<pddl::ast::PredicatePointer>();
// TODO: check declaration once implemented // TODO: check declaration once implemented
REQUIRE(effectNot3->arguments.empty()); REQUIRE(effectNot3->arguments.empty());
const auto &effectNot4 = effectAnd->arguments[4].get<pddl::ast::NotPointer<pddl::ast::Effect>>()->argument.get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>(); const auto &effectNot4 = effectAnd->arguments[4].get<pddl::ast::Literal>().get<pddl::ast::NotPointer<pddl::ast::AtomicFormula>>()->argument.get<pddl::ast::PredicatePointer>();
// TODO: check declaration once implemented // TODO: check declaration once implemented
REQUIRE(effectNot4->arguments.size() == 2); REQUIRE(effectNot4->arguments.size() == 2);
CHECK(effectNot4->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x"); CHECK(effectNot4->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x");
@ -351,10 +351,10 @@ TEST_CASE("[PDDL instances] The official PDDL instances are parsed correctly", "
CHECK(actions[1]->name == "do-roll"); CHECK(actions[1]->name == "do-roll");
const auto &effectAnd = actions[1]->effect.value().get<pddl::ast::AndPointer<pddl::ast::Effect>>(); const auto &effectAnd = actions[1]->effect.value().get<pddl::ast::AndPointer<pddl::ast::Effect>>();
REQUIRE(effectAnd->arguments.size() == 10); REQUIRE(effectAnd->arguments.size() == 10);
CHECK(effectAnd->arguments[0].get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>()->arguments[0].get<pddl::ast::ConstantPointer>()->declaration->name == "roller"); CHECK(effectAnd->arguments[0].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>()->arguments[0].get<pddl::ast::ConstantPointer>()->declaration->name == "roller");
CHECK(effectAnd->arguments[1].get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>()); CHECK(effectAnd->arguments[1].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
CHECK(effectAnd->arguments[2].get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>()); CHECK(effectAnd->arguments[2].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
CHECK(effectAnd->arguments[3].get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>()); CHECK(effectAnd->arguments[3].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
const auto &effectWhen4 = effectAnd->arguments[4].get<pddl::ast::WhenPointer<pddl::ast::Precondition, pddl::ast::ConditionalEffect>>(); const auto &effectWhen4 = effectAnd->arguments[4].get<pddl::ast::WhenPointer<pddl::ast::Precondition, pddl::ast::ConditionalEffect>>();
// TODO: check name of declaration // TODO: check name of declaration
CHECK(effectWhen4->argumentLeft.get<pddl::ast::NotPointer<pddl::ast::Precondition>>()->argument.get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>()); CHECK(effectWhen4->argumentLeft.get<pddl::ast::NotPointer<pddl::ast::Precondition>>()->argument.get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());