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
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;
ExpressionPointer normalized();
virtual ExpressionPointer simplified();
virtual ExpressionPointer reduced();
virtual ExpressionPointer negationNormalized();
ExpressionPointer negated();

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

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

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

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