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

Renaming to not confuse expression simplification and reduction.

Browse Source
This commit is contained in:
Patrick Lühne 2016-09-05 00:06:09 +02:00
parent dd621fcd5c
commit 79d449d0df
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/plasp/pddl/Expression.h
View File

@ -110,7 +110,7 @@ class Expression
virtual Type expressionType() const = 0; virtual Type expressionType() const = 0;
ExpressionPointer normalized(); ExpressionPointer normalized();
virtual ExpressionPointer simplified(); virtual ExpressionPointer reduced();
virtual ExpressionPointer negationNormalized(); virtual ExpressionPointer negationNormalized();
ExpressionPointer negated(); ExpressionPointer negated();

2
include/plasp/pddl/expressions/At.h
View File

@ -37,7 +37,7 @@ class At: public ExpressionCRTP<At>
void setArgument(ExpressionPointer argument); void setArgument(ExpressionPointer argument);
ExpressionPointer argument() const; ExpressionPointer argument() const;
ExpressionPointer simplified() override; ExpressionPointer reduced() override;
ExpressionPointer negationNormalized() override; ExpressionPointer negationNormalized() override;
void print(std::ostream &ostream) const override; void print(std::ostream &ostream) const override;

6
include/plasp/pddl/expressions/Binary.h
View File

@ -31,7 +31,7 @@ class Binary: public ExpressionCRTP<Derived>
void setArgument(size_t i, ExpressionPointer argument); void setArgument(size_t i, ExpressionPointer argument);
const std::array<ExpressionPointer, 2> &arguments() const; const std::array<ExpressionPointer, 2> &arguments() const;
ExpressionPointer simplified() override; ExpressionPointer reduced() override;
ExpressionPointer negationNormalized() override; ExpressionPointer negationNormalized() override;
void print(std::ostream &ostream) const override; void print(std::ostream &ostream) const override;
@ -91,13 +91,13 @@ const std::array<ExpressionPointer, 2> &Binary<Derived>::arguments() const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
template<class Derived> template<class Derived>
inline ExpressionPointer Binary<Derived>::simplified() inline ExpressionPointer Binary<Derived>::reduced()
{ {
for (size_t i = 0; i < m_arguments.size(); i++) for (size_t i = 0; i < m_arguments.size(); i++)
{ {
BOOST_ASSERT(m_arguments[i]); BOOST_ASSERT(m_arguments[i]);
m_arguments[i] = m_arguments[i]->simplified(); m_arguments[i] = m_arguments[i]->reduced();
} }
return this; return this;

2
include/plasp/pddl/expressions/Imply.h
View File

@ -24,7 +24,7 @@ class Imply: public Binary<Imply>
static const std::string Identifier; static const std::string Identifier;
public: public:
ExpressionPointer simplified() override; ExpressionPointer reduced() override;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

6
include/plasp/pddl/expressions/NAry.h
View File

@ -33,7 +33,7 @@ class NAry: public ExpressionCRTP<Derived>
Expressions &arguments(); Expressions &arguments();
const Expressions &arguments() const; const Expressions &arguments() const;
ExpressionPointer simplified() override; ExpressionPointer reduced() override;
ExpressionPointer negationNormalized() override; ExpressionPointer negationNormalized() override;
void print(std::ostream &ostream) const override; void print(std::ostream &ostream) const override;
@ -121,13 +121,13 @@ Expressions &NAry<Derived>::arguments()
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
template<class Derived> template<class Derived>
inline ExpressionPointer NAry<Derived>::simplified() inline ExpressionPointer NAry<Derived>::reduced()
{ {
for (size_t i = 0; i < m_arguments.size(); i++) for (size_t i = 0; i < m_arguments.size(); i++)
{ {
BOOST_ASSERT(m_arguments[i]); BOOST_ASSERT(m_arguments[i]);
m_arguments[i] = m_arguments[i]->simplified(); m_arguments[i] = m_arguments[i]->reduced();
} }
return this; return this;

2
include/plasp/pddl/expressions/Not.h
View File

@ -32,7 +32,7 @@ class Not: public ExpressionCRTP<Not>
void setArgument(ExpressionPointer argument); void setArgument(ExpressionPointer argument);
ExpressionPointer argument() const; ExpressionPointer argument() const;
ExpressionPointer simplified() override; ExpressionPointer reduced() override;
ExpressionPointer negationNormalized() override; ExpressionPointer negationNormalized() override;
void print(std::ostream &ostream) const override; void print(std::ostream &ostream) const override;

4
src/plasp/pddl/Expression.cpp
View File

@ -26,12 +26,12 @@ namespace pddl
ExpressionPointer Expression::normalized() ExpressionPointer Expression::normalized()
{ {
return simplified()->negationNormalized(); return reduced()->negationNormalized();
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
ExpressionPointer Expression::simplified() ExpressionPointer Expression::reduced()
{ {
return this; return this;
} }

4
src/plasp/pddl/expressions/At.cpp
View File

@ -36,9 +36,9 @@ ExpressionPointer At::argument() const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
ExpressionPointer At::simplified() ExpressionPointer At::reduced()
{ {
throw utils::TranslatorException("“at” predicates currently not supported"); throw utils::TranslatorException("reducing “at” predicates currently not supported");
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

8
src/plasp/pddl/expressions/Imply.cpp
View File

@ -21,13 +21,13 @@ const std::string Imply::Identifier = "imply";
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
ExpressionPointer Imply::simplified() ExpressionPointer Imply::reduced()
{ {
BOOST_ASSERT(m_arguments[0]); BOOST_ASSERT(m_arguments[0]);
BOOST_ASSERT(m_arguments[1]); BOOST_ASSERT(m_arguments[1]);
m_arguments[0] = m_arguments[0]->simplified(); m_arguments[0] = m_arguments[0]->reduced();
m_arguments[1] = m_arguments[1]->simplified(); m_arguments[1] = m_arguments[1]->reduced();
auto notArgument0 = NotPointer(new Not); auto notArgument0 = NotPointer(new Not);
notArgument0->setArgument(m_arguments[0]); notArgument0->setArgument(m_arguments[0]);
@ -36,7 +36,7 @@ ExpressionPointer Imply::simplified()
orExpression->addArgument(notArgument0); orExpression->addArgument(notArgument0);
orExpression->addArgument(m_arguments[1]); orExpression->addArgument(m_arguments[1]);
return orExpression->simplified(); return orExpression;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

4
src/plasp/pddl/expressions/Not.cpp
View File

@ -37,11 +37,11 @@ ExpressionPointer Not::argument() const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
ExpressionPointer Not::simplified() ExpressionPointer Not::reduced()
{ {
BOOST_ASSERT(m_argument); BOOST_ASSERT(m_argument);
m_argument = m_argument->simplified(); m_argument = m_argument->reduced();
return this; return this;
} }

4
tests/TestPDDLNormalization.cpp
View File

@ -10,7 +10,7 @@ using namespace plasp::pddl;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
TEST(PDDLNormalizationTests, Simplify) TEST(PDDLNormalizationTests, Reduced)
{ {
auto n1 = expressions::NotPointer(new expressions::Not); auto n1 = expressions::NotPointer(new expressions::Not);
auto n2 = expressions::NotPointer(new expressions::Not); auto n2 = expressions::NotPointer(new expressions::Not);
@ -31,7 +31,7 @@ TEST(PDDLNormalizationTests, Simplify)
n1->setArgument(n2); n1->setArgument(n2);
std::stringstream output; std::stringstream output;
n1->simplified()->print(output); n1->reduced()->print(output);
ASSERT_EQ(output.str(), "(not (not (and (or (or (not (a)) (b)) (c)) (d))))"); ASSERT_EQ(output.str(), "(not (not (and (or (or (not (a)) (b)) (c)) (d))))");
} }