From 363070b579db1f9250a294e1889412135a2519c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Wed, 17 Aug 2016 23:31:31 +0200
Subject: [PATCH] Replaced the two rules for the values of a PDDL variable with
 a single one.

---
 src/plasp/pddl/TranslatorASP.cpp | 49 ++++++++++++++++----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/plasp/pddl/TranslatorASP.cpp b/src/plasp/pddl/TranslatorASP.cpp
index 37bad38..480f228 100644
--- a/src/plasp/pddl/TranslatorASP.cpp
+++ b/src/plasp/pddl/TranslatorASP.cpp
@@ -130,7 +130,10 @@ void TranslatorASP::translateTypes() const
 
 void TranslatorASP::translatePredicates() const
 {
-	m_outputStream << utils::Heading2("variables");
+	m_outputStream
+		<< 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();
 
@@ -149,27 +152,6 @@ void TranslatorASP::translatePredicates() const
 			m_outputStream << ")";
 		};
 
-	const auto printValueRule =
-		[&](const auto &predicate, const auto &value)
-		{
-			m_outputStream
-				<< utils::RuleName("contains") << "("
-				<< utils::Keyword("variable") << "(";
-
-			printPredicateName(predicate);
-
-			m_outputStream
-				<< "), " << utils::Keyword("value") << "(";
-
-			printPredicateName(predicate);
-
-			m_outputStream << ", " << utils::Boolean(value) << "))";
-
-			this->translateVariablesBody(predicate->arguments());
-
-			m_outputStream << "." << std::endl;
-		};
-
 	std::for_each(predicates.cbegin(), predicates.cend(),
 		[&](const auto &predicate)
 		{
@@ -186,8 +168,27 @@ void TranslatorASP::translatePredicates() const
 
 			m_outputStream << "." << std::endl;
 
-			printValueRule(predicate, "true");
-			printValueRule(predicate, "false");
+			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;
 		});
 }