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

Made PDDL action preconditions and effects optional.

This commit is contained in:
Patrick Lühne 2016-06-12 23:51:45 +02:00
parent 46351b2fe7
commit 1c8af793c2
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/plasp/pddl/Action.h
View File

@ -27,8 +27,8 @@ class Action
const std::string &name() const;
const expressions::Variables &parameters() const;
const Expression &precondition() const;
const Expression &effect() const;
const Expression *precondition() const;
const Expression *effect() const;
private:
Action() = default;

1
include/plasp/pddl/expressions/Reference.h
View File

@ -19,6 +19,7 @@ namespace expressions
//
////////////////////////////////////////////////////////////////////////////////////////////////////
// TODO: refactor without reference wrapper
template<class Type>
class Reference: public ExpressionCRTP<Reference<Type>>
{

8
src/plasp/pddl/Action.cpp
View File

@ -70,20 +70,20 @@ const expressions::Variables &Action::parameters() const
////////////////////////////////////////////////////////////////////////////////////////////////////
const Expression &Action::precondition() const
const Expression *Action::precondition() const
{
BOOST_ASSERT(m_precondition);
return *m_precondition;
return m_precondition.get();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
const Expression &Action::effect() const
const Expression *Action::effect() const
{
BOOST_ASSERT(m_effect);
return *m_effect;
return m_effect.get();
}
////////////////////////////////////////////////////////////////////////////////////////////////////

8
tests/TestPDDLParser.cpp
View File

@ -70,7 +70,7 @@ TEST(PDDLParserTests, ParseBlocksWorldDomain)
ASSERT_EQ(pickUp.parameters()[0]->name(), "x");
ASSERT_EQ(pickUp.parameters()[0]->type(), &block);
const auto &pickUpPre = dynamic_cast<const expressions::And &>(pickUp.precondition());
const auto &pickUpPre = dynamic_cast<const expressions::And &>(*pickUp.precondition());
ASSERT_EQ(pickUpPre.arguments().size(), 3u);
const auto &pickUpPre0 = dynamic_cast<const expressions::Predicate &>(*pickUpPre.arguments()[0]);
ASSERT_EQ(pickUpPre0.name(), "clear");
@ -83,7 +83,7 @@ TEST(PDDLParserTests, ParseBlocksWorldDomain)
ASSERT_EQ(pickUpPre2.name(), "handempty");
ASSERT_EQ(pickUpPre2.arguments().size(), 0u);
const auto &pickUpEff = dynamic_cast<const expressions::And &>(pickUp.effect());
const auto &pickUpEff = dynamic_cast<const expressions::And &>(*pickUp.effect());
ASSERT_EQ(pickUpEff.arguments().size(), 4u);
const auto &pickUpEff0 = dynamic_cast<const expressions::Not &>(*pickUpEff.arguments()[0]);
const auto &pickUpEff00 = dynamic_cast<const expressions::Predicate &>(pickUpEff0.argument());
@ -227,7 +227,7 @@ TEST(PDDLParserTests, ParseStorageDomain)
ASSERT_EQ(drop.parameters()[3]->name(), "a2");
ASSERT_EQ(drop.parameters()[3]->type(), &area);
const auto &dropPre = dynamic_cast<const expressions::And &>(drop.precondition());
const auto &dropPre = dynamic_cast<const expressions::And &>(*drop.precondition());
ASSERT_EQ(dropPre.arguments().size(), 5u);
const auto &dropPre2 = dynamic_cast<const expressions::Predicate &>(*dropPre.arguments()[2]);
ASSERT_EQ(dropPre2.name(), "lifting");
@ -236,7 +236,7 @@ TEST(PDDLParserTests, ParseStorageDomain)
ASSERT_EQ(dropPre21.name(), "c");
ASSERT_EQ(dropPre21.type(), &crate);
const auto &dropEff = dynamic_cast<const expressions::And &>(drop.effect());
const auto &dropEff = dynamic_cast<const expressions::And &>(*drop.effect());
ASSERT_EQ(dropEff.arguments().size(), 5u);
const auto &dropEff2 = dynamic_cast<const expressions::Not &>(*dropEff.arguments()[2]);
const auto &dropEff20 = dynamic_cast<const expressions::Predicate &>(dropEff2.argument());