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

Made output stream a member of the PDDL translator for convenience.

This commit is contained in:
Patrick Lühne 2016-06-12 22:31:18 +02:00
parent 046f803538
commit b70e62ff3b
3 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/plasp-app/main.cpp
View File

@ -106,8 +106,8 @@ int main(int argc, char **argv)
if (language == plasp::Language::Type::PDDL)
{
const auto description = plasp::pddl::Description::fromParser(std::move(parser));
const auto translator = plasp::pddl::TranslatorASP(description);
translator.translate(std::cout);
const auto translator = plasp::pddl::TranslatorASP(description, std::cout);
translator.translate();
}
else if (language == plasp::Language::Type::SAS)
{

9
include/plasp/pddl/TranslatorASP.h
View File

@ -19,17 +19,18 @@ namespace pddl
class TranslatorASP
{
public:
explicit TranslatorASP(const Description &description);
explicit TranslatorASP(const Description &description, std::ostream &ostream);
void translate(std::ostream &ostream) const;
void translate() const;
private:
void checkSupport() const;
void translateDomain(std::ostream &ostream) const;
void translateProblem(std::ostream &ostream) const;
void translateDomain() const;
void translateProblem() const;
const Description &m_description;
std::ostream &m_ostream;
};
////////////////////////////////////////////////////////////////////////////////////////////////////

65
src/plasp/pddl/TranslatorASP.cpp
View File

@ -14,8 +14,9 @@ namespace pddl
//
////////////////////////////////////////////////////////////////////////////////////////////////////
TranslatorASP::TranslatorASP(const Description &description)
: m_description(description)
TranslatorASP::TranslatorASP(const Description &description, std::ostream &ostream)
: m_description(description),
m_ostream(ostream)
{
}
@ -42,25 +43,25 @@ void TranslatorASP::checkSupport() const
////////////////////////////////////////////////////////////////////////////////////////////////////
void TranslatorASP::translate(std::ostream &ostream) const
void TranslatorASP::translate() const
{
checkSupport();
translateDomain(ostream);
translateDomain();
if (m_description.containsProblem())
{
ostream << std::endl;
m_ostream << std::endl;
translateProblem(ostream);
translateProblem();
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void TranslatorASP::translateDomain(std::ostream &ostream) const
void TranslatorASP::translateDomain() const
{
ostream
m_ostream
<< "%---------------------------------------" << std::endl
<< "% domain" << std::endl
<< "%---------------------------------------" << std::endl;
@ -70,24 +71,24 @@ void TranslatorASP::translateDomain(std::ostream &ostream) const
// Types
if (!domain.types().empty())
{
ostream << std::endl;
ostream << "% types";
m_ostream << std::endl;
m_ostream << "% types";
const auto &types = domain.types();
std::for_each(types.cbegin(), types.cend(),
[&](const auto &type)
{
ostream << std::endl;
m_ostream << std::endl;
ostream << "type(" << type->name() << ")." << std::endl;
m_ostream << "type(" << type->name() << ")." << std::endl;
const auto &parentTypes = type->parentTypes();
std::for_each(parentTypes.cbegin(), parentTypes.cend(),
[&](const auto &parentType)
{
ostream << "inherits(type(" << type->name() << "), type(" << parentType->name() << "))." << std::endl;
m_ostream << "inherits(type(" << type->name() << "), type(" << parentType->name() << "))." << std::endl;
});
});
}
@ -95,81 +96,81 @@ void TranslatorASP::translateDomain(std::ostream &ostream) const
// Constants
if (!domain.constants().empty())
{
ostream << std::endl;
ostream << "% constants";
m_ostream << std::endl;
m_ostream << "% constants";
const auto &constants = domain.constants();
std::for_each(constants.cbegin(), constants.cend(),
[&](const auto &constant)
{
ostream << std::endl;
m_ostream << std::endl;
ostream << "constant(" << constant->name() << ")." << std::endl;
m_ostream << "constant(" << constant->name() << ")." << std::endl;
const auto *type = constant->type();
if (type == nullptr)
return;
ostream << "hasType(constant(" << constant->name() << "), type(" << type->name() << "))." << std::endl;
m_ostream << "hasType(constant(" << constant->name() << "), type(" << type->name() << "))." << std::endl;
});
}
// Predicates
if (!domain.predicates().empty())
{
ostream << std::endl;
ostream << "% predicates";
m_ostream << std::endl;
m_ostream << "% predicates";
const auto &predicates = domain.predicates();
std::for_each(predicates.cbegin(), predicates.cend(),
[&](const auto &predicate)
{
ostream << std::endl;
m_ostream << std::endl;
ostream << "predicate(" << predicate->name();
m_ostream << "predicate(" << predicate->name();
const auto &arguments = predicate->arguments();
if (arguments.empty())
{
ostream << ").";
m_ostream << ").";
return;
}
ostream << "(";
m_ostream << "(";
for (auto i = arguments.cbegin(); i != arguments.cend(); i++)
{
if (i != arguments.cbegin())
ostream << ", ";
m_ostream << ", ";
ostream << utils::escapeASPVariable((*i)->name());
m_ostream << utils::escapeASPVariable((*i)->name());
}
ostream << ")) :- ";
m_ostream << ")) :- ";
for (auto i = arguments.cbegin(); i != arguments.cend(); i++)
{
if (i != arguments.cbegin())
ostream << ", ";
m_ostream << ", ";
const auto &type = *dynamic_cast<const expressions::PrimitiveType *>((*i)->type());
ostream << "hasType(" << utils::escapeASPVariable((*i)->name()) << ", type(" << type.name() << "))";
m_ostream << "hasType(" << utils::escapeASPVariable((*i)->name()) << ", type(" << type.name() << "))";
}
ostream << ".";
m_ostream << ".";
});
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void TranslatorASP::translateProblem(std::ostream &ostream) const
void TranslatorASP::translateProblem() const
{
ostream << std::endl
m_ostream << std::endl
<< "%---------------------------------------" << std::endl
<< "% problem" << std::endl
<< "%---------------------------------------" << std::endl;