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

Further simplified the output of the PDDL variable value facts.

Browse Source
This commit is contained in:
Patrick Lühne 2016-08-18 00:00:50 +02:00
parent 363070b579
commit 5e28dd046b
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,10 +130,7 @@ void TranslatorASP::translateTypes() const
void TranslatorASP::translatePredicates() const void TranslatorASP::translatePredicates() const
{ {
m_outputStream m_outputStream << utils::Heading2("variables");
<< utils::Heading2("variables") << std::endl
<< utils::RuleName("boolean") << "(" << utils::Boolean("true") << ")." << std::endl
<< utils::RuleName("boolean") << "(" << utils::Boolean("false") << ")." << std::endl;
const auto &predicates = m_description.domain().predicates(); const auto &predicates = m_description.domain().predicates();
@ -166,30 +163,20 @@ void TranslatorASP::translatePredicates() const
this->translateVariablesBody(predicate->arguments()); this->translateVariablesBody(predicate->arguments());
m_outputStream << "." << std::endl; m_outputStream << ".";
m_outputStream
<< utils::RuleName("contains") << "("
<< utils::Keyword("variable") << "(";
printPredicateName(predicate);
m_outputStream << "), " << utils::Keyword("value") << "(";
printPredicateName(predicate);
m_outputStream << ", " << utils::Variable("B") << "))";
this->translateVariablesBody(predicate->arguments());
// TODO: clean up
if (predicate->arguments().empty())
m_outputStream << " :- ";
else
m_outputStream << ", ";
m_outputStream << utils::RuleName("boolean") << "(" << utils::Variable("B") << ")." << std::endl;
}); });
m_outputStream
<< std::endl << std::endl
<< utils::RuleName("boolean") << "(" << utils::Boolean("true") << ")." << std::endl
<< utils::RuleName("boolean") << "(" << utils::Boolean("false") << ")." << std::endl
<< std::endl
<< utils::RuleName("contains") << "("
<< utils::Keyword("variable") << "(" << utils::Variable("X") << "), "
<< utils::Keyword("value") << "(" << utils::Variable("X") << ", " << utils::Variable("B") << ")) :- "
<< utils::RuleName("variable") << "(" << utils::Keyword("variable") << "(" << utils::Variable("X") << ")), "
<< utils::RuleName("boolean") << "(" << utils::Variable("B") << ")."
<< std::endl;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////