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

Put PDDL translation sections into separate methods.

Browse Source
This commit is contained in:
Patrick Lühne 2016-06-12 22:39:04 +02:00
parent 49002ac52d
commit 9c2f49e4a0
2 changed files with 104 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,10 @@ class TranslatorASP
void checkSupport() const; void checkSupport() const;
void translateDomain() const; void translateDomain() const;
void translateTypes() const;
void translateConstants() const;
void translatePredicates() const;
void translateProblem() const; void translateProblem() const;
const Description &m_description; const Description &m_description;

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

@ -72,9 +72,31 @@ void TranslatorASP::translateDomain() const
if (!domain.types().empty()) if (!domain.types().empty())
{ {
m_ostream << std::endl; m_ostream << std::endl;
translateTypes();
}
// Constants
if (!domain.constants().empty())
{
m_ostream << std::endl;
translateConstants();
}
// Predicates
if (!domain.predicates().empty())
{
m_ostream << std::endl;
translatePredicates();
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void TranslatorASP::translateTypes() const
{
m_ostream << "% types"; m_ostream << "% types";
const auto &types = domain.types(); const auto &types = m_description.domain().types();
std::for_each(types.cbegin(), types.cend(), std::for_each(types.cbegin(), types.cend(),
[&](const auto &type) [&](const auto &type)
@ -91,15 +113,15 @@ void TranslatorASP::translateDomain() const
m_ostream << "inherits(type(" << type->name() << "), type(" << parentType->name() << "))." << std::endl; m_ostream << "inherits(type(" << type->name() << "), type(" << parentType->name() << "))." << std::endl;
}); });
}); });
} }
// Constants ////////////////////////////////////////////////////////////////////////////////////////////////////
if (!domain.constants().empty())
{ void TranslatorASP::translateConstants() const
m_ostream << std::endl; {
m_ostream << "% constants"; m_ostream << "% constants";
const auto &constants = domain.constants(); const auto &constants = m_description.domain().constants();
std::for_each(constants.cbegin(), constants.cend(), std::for_each(constants.cbegin(), constants.cend(),
[&](const auto &constant) [&](const auto &constant)
@ -115,15 +137,15 @@ void TranslatorASP::translateDomain() const
m_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())
{ void TranslatorASP::translatePredicates() const
m_ostream << std::endl; {
m_ostream << "% predicates"; m_ostream << "% predicates";
const auto &predicates = domain.predicates(); const auto &predicates = m_description.domain().predicates();
std::for_each(predicates.cbegin(), predicates.cend(), std::for_each(predicates.cbegin(), predicates.cend(),
[&](const auto &predicate) [&](const auto &predicate)
@ -163,7 +185,6 @@ void TranslatorASP::translateDomain() const
m_ostream << "."; m_ostream << ".";
}); });
}
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////