Reimplemented plasp with PDDL parsing library.
This commit is contained in:
@@ -1,20 +1,18 @@
|
||||
#ifndef __PLASP__PDDL__TRANSLATION__PREDICATE_H
|
||||
#define __PLASP__PDDL__TRANSLATION__PREDICATE_H
|
||||
|
||||
#include <pddlparse/AST.h>
|
||||
#include <pddlparse/Parse.h>
|
||||
|
||||
#include <plasp/output/Formatting.h>
|
||||
#include <plasp/pddl/expressions/Constant.h>
|
||||
#include <plasp/pddl/expressions/DerivedPredicate.h>
|
||||
#include <plasp/pddl/expressions/Predicate.h>
|
||||
#include <plasp/pddl/expressions/PredicateDeclaration.h>
|
||||
#include <plasp/pddl/expressions/Variable.h>
|
||||
|
||||
#include <plasp/pddl/translation/Primitives.h>
|
||||
#include <plasp/pddl/translation/Variables.h>
|
||||
|
||||
namespace plasp
|
||||
{
|
||||
namespace pddl
|
||||
{
|
||||
namespace translation
|
||||
{
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -22,44 +20,46 @@ namespace translation
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void translatePredicate(output::ColorStream &outputStream, const expressions::Predicate &predicate);
|
||||
void translateDerivedPredicate(output::ColorStream &outputStream, const expressions::DerivedPredicate &derivedPredicate);
|
||||
void printPredicateName(output::ColorStream &outputStream, const expressions::PredicateDeclaration &predicateDeclaration);
|
||||
void printDerivedPredicateName(output::ColorStream &outputStream, const expressions::DerivedPredicate &derivedPredicate);
|
||||
void translatePredicate(output::ColorStream &outputStream, const ::pddl::ast::Predicate &predicate);
|
||||
void translatePredicateDeclaration(output::ColorStream &outputStream, const ::pddl::ast::PredicateDeclaration &predicateDeclaration);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
inline void translatePredicate(output::ColorStream &outputStream, const expressions::Predicate &predicate)
|
||||
inline void translatePredicate(output::ColorStream &outputStream, const ::pddl::ast::Predicate &predicate)
|
||||
{
|
||||
const auto &arguments = predicate.arguments();
|
||||
const auto &arguments = predicate.arguments;
|
||||
|
||||
if (arguments.empty())
|
||||
{
|
||||
outputStream << output::String(predicate.name().c_str());
|
||||
|
||||
outputStream << *predicate.declaration;
|
||||
return;
|
||||
}
|
||||
|
||||
outputStream << "(" << output::String(predicate.name().c_str());
|
||||
outputStream << "(" << *predicate.declaration;
|
||||
|
||||
for (const auto &argument : arguments)
|
||||
{
|
||||
outputStream << ", ";
|
||||
|
||||
if (argument->is<expressions::Constant>())
|
||||
{
|
||||
const auto &constant = argument->as<expressions::Constant>();
|
||||
const auto handleConstant =
|
||||
[&](const ::pddl::ast::ConstantPointer &constant)
|
||||
{
|
||||
outputStream << output::Keyword("constant") << "(" << *constant << ")";
|
||||
};
|
||||
|
||||
outputStream << output::Keyword("constant") << "(" << output::String(constant.name().c_str()) << ")";
|
||||
}
|
||||
else if (argument->is<expressions::Variable>())
|
||||
{
|
||||
const auto &variable = argument->as<expressions::Variable>();
|
||||
const auto handleVariable =
|
||||
[&](const ::pddl::ast::VariablePointer &variable)
|
||||
{
|
||||
outputStream << *variable;
|
||||
};
|
||||
|
||||
outputStream << output::Variable(variable.name().c_str());
|
||||
}
|
||||
else
|
||||
throw output::TranslatorException("only variables and constants supported in predicates currently");
|
||||
const auto handleUnsupported =
|
||||
[&](const auto &)
|
||||
{
|
||||
throw output::TranslatorException("only variables and constants supported in predicates currently");
|
||||
};
|
||||
|
||||
argument.match(handleConstant, handleVariable, handleUnsupported);
|
||||
}
|
||||
|
||||
outputStream << ")";
|
||||
@@ -67,64 +67,41 @@ inline void translatePredicate(output::ColorStream &outputStream, const expressi
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
inline void translateDerivedPredicate(output::ColorStream &outputStream, const expressions::DerivedPredicate &derivedPredicate)
|
||||
{
|
||||
const auto ¶meters = derivedPredicate.parameters();
|
||||
const auto id = derivedPredicate.id();
|
||||
|
||||
if (parameters.empty())
|
||||
{
|
||||
outputStream << output::Number<decltype(id)>(id);
|
||||
return;
|
||||
}
|
||||
|
||||
outputStream << "(" << output::Number<decltype(id)>(id);
|
||||
|
||||
for (const auto ¶meter : parameters)
|
||||
outputStream << ", " << output::Variable(parameter->name().c_str());
|
||||
|
||||
outputStream << ")";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
inline void printPredicateName(output::ColorStream &outputStream, const expressions::PredicateDeclaration &predicateDeclaration)
|
||||
inline void translatePredicateDeclaration(output::ColorStream &outputStream, const ::pddl::ast::PredicateDeclaration &predicateDeclaration)
|
||||
{
|
||||
outputStream << output::Keyword("variable") << "(";
|
||||
|
||||
if (predicateDeclaration.parameters().empty())
|
||||
if (predicateDeclaration.parameters.empty())
|
||||
{
|
||||
outputStream << output::String(predicateDeclaration.name().c_str()) << ")";
|
||||
outputStream << predicateDeclaration << ")";
|
||||
return;
|
||||
}
|
||||
|
||||
outputStream << "(" << output::String(predicateDeclaration.name().c_str());
|
||||
translation::translateVariablesForRuleHead(outputStream, predicateDeclaration.parameters());
|
||||
outputStream << "(" << predicateDeclaration;
|
||||
translateVariablesForRuleHead(outputStream, predicateDeclaration.parameters);
|
||||
outputStream << "))";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
inline void printDerivedPredicateName(output::ColorStream &outputStream, const expressions::DerivedPredicate &derivedPredicate)
|
||||
void translatePredicateToVariable(output::ColorStream &outputStream, const ::pddl::ast::Predicate &predicate, bool isPositive = true)
|
||||
{
|
||||
outputStream << output::Keyword("derivedVariable") << "(";
|
||||
outputStream << output::Keyword("variable") << "(";
|
||||
translatePredicate(outputStream, predicate);
|
||||
outputStream << "), " << output::Keyword("value") << "(";
|
||||
translatePredicate(outputStream, predicate);
|
||||
outputStream << ", ";
|
||||
|
||||
const auto id = derivedPredicate.id();
|
||||
if (isPositive)
|
||||
outputStream << output::Boolean("true");
|
||||
else
|
||||
outputStream << output::Boolean("false");
|
||||
|
||||
if (derivedPredicate.parameters().empty())
|
||||
{
|
||||
outputStream << output::Number<decltype(id)>(id) << ")";
|
||||
return;
|
||||
}
|
||||
|
||||
outputStream << "(" << output::Number<decltype(id)>(id);
|
||||
translation::translateVariablesForRuleHead(outputStream, derivedPredicate.parameters());
|
||||
outputStream << "))";
|
||||
outputStream << ")";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user