From b2822253633602d20a366bb2b3c7bd31cb2be350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Wed, 28 Jun 2017 01:00:36 +0200 Subject: [PATCH] Moved util predicates to separate section. --- include/plasp/pddl/TranslatorASP.h | 1 + src/plasp/pddl/TranslatorASP.cpp | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/plasp/pddl/TranslatorASP.h b/include/plasp/pddl/TranslatorASP.h index 379f6f5..744650c 100644 --- a/include/plasp/pddl/TranslatorASP.h +++ b/include/plasp/pddl/TranslatorASP.h @@ -26,6 +26,7 @@ class TranslatorASP private: void translateDomain() const; + void translateUtils() const; void translateTypes() const; void translatePredicates() const; void translateDerivedPredicates() const; diff --git a/src/plasp/pddl/TranslatorASP.cpp b/src/plasp/pddl/TranslatorASP.cpp index 6e76a68..f3c9035 100644 --- a/src/plasp/pddl/TranslatorASP.cpp +++ b/src/plasp/pddl/TranslatorASP.cpp @@ -55,6 +55,10 @@ void TranslatorASP::translateDomain() const const auto &domain = m_description.domain; + // Utils + m_outputStream << std::endl; + translateUtils(); + // Types m_outputStream << std::endl; translateTypes(); @@ -89,6 +93,18 @@ void TranslatorASP::translateDomain() const //////////////////////////////////////////////////////////////////////////////////////////////////// +void TranslatorASP::translateUtils() const +{ + m_outputStream << colorlog::Heading2("utils"); + + m_outputStream + << std::endl + << colorlog::Function("boolean") << "(" << colorlog::Boolean("true") << ")." << std::endl + << colorlog::Function("boolean") << "(" << colorlog::Boolean("false") << ")." << std::endl; +} + +//////////////////////////////////////////////////////////////////////////////////////////////////// + void TranslatorASP::translateTypes() const { m_outputStream << colorlog::Heading2("types"); @@ -167,9 +183,6 @@ void TranslatorASP::translatePredicates() const m_outputStream << std::endl << std::endl - << colorlog::Function("boolean") << "(" << colorlog::Boolean("true") << ")." << std::endl - << colorlog::Function("boolean") << "(" << colorlog::Boolean("false") << ")." << std::endl - << std::endl << colorlog::Function("contains") << "(" << colorlog::Keyword("variable") << "(" << colorlog::Variable("X") << "), " << colorlog::Keyword("value") << "(" << colorlog::Variable("X") << ", " << colorlog::Variable("B") << ")) :- " @@ -205,15 +218,12 @@ void TranslatorASP::translateDerivedPredicates() const m_outputStream << std::endl << std::endl - << colorlog::Function("boolean") << "(" << colorlog::Boolean("true") << ")." << std::endl - << colorlog::Function("boolean") << "(" << colorlog::Boolean("false") << ")." << std::endl - << std::endl << colorlog::Function("contains") << "(" << colorlog::Keyword("derivedVariable") << "(" << colorlog::Variable("X") << "), " << colorlog::Keyword("value") << "(" << colorlog::Variable("X") << ", " << colorlog::Variable("B") << ")) :- " << colorlog::Function("derivedVariable") << "(" << colorlog::Keyword("derivedVariable") << "(" << colorlog::Variable("X") << ")), " << colorlog::Function("boolean") << "(" << colorlog::Variable("B") << ")." - << std::endl << std::endl; + << std::endl; for (const auto &derivedPredicate : derivedPredicates) {