From 8eb0a4847f8da922caa2805b48687ae66804eda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Thu, 26 May 2016 12:59:18 +0200
Subject: [PATCH] Refactoring of TranslatorASP class.

---
 include/plasp/sas/TranslatorASP.h |   8 +++
 src/plasp/sas/TranslatorASP.cpp   | 116 ++++++++++++++++++++----------
 2 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/include/plasp/sas/TranslatorASP.h b/include/plasp/sas/TranslatorASP.h
index 83242c1..aca4772 100644
--- a/include/plasp/sas/TranslatorASP.h
+++ b/include/plasp/sas/TranslatorASP.h
@@ -24,6 +24,14 @@ class TranslatorASP
 		void translate(std::ostream &ostream) const;
 
 	private:
+		void translateRequirements(std::ostream &ostream) const;
+		void translateInitialState(std::ostream &ostream) const;
+		void translateGoal(std::ostream &ostream) const;
+		void translateVariables(std::ostream &ostream) const;
+		void translateActions(std::ostream &ostream) const;
+		void translateMutexes(std::ostream &ostream) const;
+		void translateAxiomRules(std::ostream &ostream) const;
+
 		const Description &m_description;
 };
 
diff --git a/src/plasp/sas/TranslatorASP.cpp b/src/plasp/sas/TranslatorASP.cpp
index 5f7d49c..e8f7b6f 100644
--- a/src/plasp/sas/TranslatorASP.cpp
+++ b/src/plasp/sas/TranslatorASP.cpp
@@ -23,22 +23,37 @@ TranslatorASP::TranslatorASP(const Description &description)
 
 void TranslatorASP::translate(std::ostream &ostream) const
 {
-	const auto usesActionCosts = m_description.usesActionCosts();
-	const auto usesAxiomRules = m_description.usesAxiomRules();
-	const auto usesConditionalEffects = m_description.usesConditionalEffects();
+	translateRequirements(ostream);
+	translateInitialState(ostream);
+	translateGoal(ostream);
+	translateVariables(ostream);
+	translateActions(ostream);
+	translateMutexes(ostream);
+	translateAxiomRules(ostream);
+}
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TranslatorASP::translateRequirements(std::ostream &ostream) const
+{
 	ostream << "% feature requirements" << std::endl;
 
-	if (usesActionCosts)
+	if (m_description.usesActionCosts())
 		ostream << "requiresFeature(actionCosts)." << std::endl;
 
-	if (usesAxiomRules)
+	if (m_description.usesAxiomRules())
 		ostream << "requiresFeature(axiomRules)." << std::endl;
 
-	if (usesConditionalEffects)
+	if (m_description.usesConditionalEffects())
 		ostream << "requiresFeature(conditionalEffects)." << std::endl;
 
 	ostream << std::endl;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TranslatorASP::translateInitialState(std::ostream &ostream) const
+{
 	ostream << "% initial state" << std::endl;
 
 	const auto &initialStateFacts = m_description.initialState().facts();
@@ -54,6 +69,12 @@ void TranslatorASP::translate(std::ostream &ostream) const
 		});
 
 	ostream << std::endl;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TranslatorASP::translateGoal(std::ostream &ostream) const
+{
 	ostream << "% goal" << std::endl;
 
 	const auto &goalFacts = m_description.goal().facts();
@@ -69,6 +90,12 @@ void TranslatorASP::translate(std::ostream &ostream) const
 		});
 
 	ostream << std::endl;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TranslatorASP::translateVariables(std::ostream &ostream) const
+{
 	ostream << "% variables";
 
 	const auto &variables = m_description.variables();
@@ -96,6 +123,12 @@ void TranslatorASP::translate(std::ostream &ostream) const
 		});
 
 	ostream << std::endl;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TranslatorASP::translateActions(std::ostream &ostream) const
+{
 	ostream << "% actions";
 
 	const auto &operators = m_description.operators();
@@ -159,6 +192,12 @@ void TranslatorASP::translate(std::ostream &ostream) const
 		});
 
 	ostream << std::endl;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void TranslatorASP::translateMutexes(std::ostream &ostream) const
+{
 	ostream << "% mutex groups";
 
 	const auto &mutexGroups = m_description.mutexGroups();
@@ -185,45 +224,50 @@ void TranslatorASP::translate(std::ostream &ostream) const
 					ostream << ")." << std::endl;
 				});
 		});
+}
 
-	if (usesAxiomRules)
-	{
-		ostream << std::endl;
-		ostream << "% axiom rules";
+////////////////////////////////////////////////////////////////////////////////////////////////////
 
-		const auto &axiomRules = m_description.axiomRules();
+void TranslatorASP::translateAxiomRules(std::ostream &ostream) const
+{
+	if (!m_description.usesActionCosts())
+		return;
 
-		size_t currentAxiomRuleID = 0;
+	ostream << std::endl;
+	ostream << "% axiom rules";
 
-		std::for_each(axiomRules.cbegin(), axiomRules.cend(),
-			[&](const auto &axiomRule)
-			{
-				const auto axiomRuleID = std::to_string(currentAxiomRuleID);
-				currentAxiomRuleID++;
+	const auto &axiomRules = m_description.axiomRules();
 
-				ostream << std::endl << "axiomRule(" << axiomRuleID << ")." << std::endl;
+	size_t currentAxiomRuleID = 0;
 
-				const auto &conditions = axiomRule.conditions();
+	std::for_each(axiomRules.cbegin(), axiomRules.cend(),
+		[&](const auto &axiomRule)
+		{
+			const auto axiomRuleID = std::to_string(currentAxiomRuleID);
+			currentAxiomRuleID++;
 
-				std::for_each(conditions.cbegin(), conditions.cend(),
-					[&](const auto &condition)
-					{
-						ostream << "condition(axiomRule(" << axiomRuleID << "), ";
-						condition.variable().printNameAsASPPredicate(ostream);
-						ostream << ", ";
-						condition.value().printAsASPPredicate(ostream);
-						ostream << ")." << std::endl;
-					});
+			ostream << std::endl << "axiomRule(" << axiomRuleID << ")." << std::endl;
 
-				const auto &postcondition = axiomRule.postcondition();
+			const auto &conditions = axiomRule.conditions();
 
-				ostream << "postcondition(axiomRule(axiomRule" << axiomRuleID << "), ";
-				postcondition.variable().printNameAsASPPredicate(ostream);
-				ostream << ", ";
-				postcondition.value().printAsASPPredicate(ostream);
-				ostream << ")." << std::endl;
-			});
-	}
+			std::for_each(conditions.cbegin(), conditions.cend(),
+				[&](const auto &condition)
+				{
+					ostream << "condition(axiomRule(" << axiomRuleID << "), ";
+					condition.variable().printNameAsASPPredicate(ostream);
+					ostream << ", ";
+					condition.value().printAsASPPredicate(ostream);
+					ostream << ")." << std::endl;
+				});
+
+			const auto &postcondition = axiomRule.postcondition();
+
+			ostream << "postcondition(axiomRule(axiomRule" << axiomRuleID << "), ";
+			postcondition.variable().printNameAsASPPredicate(ostream);
+			ostream << ", ";
+			postcondition.value().printAsASPPredicate(ostream);
+			ostream << ")." << std::endl;
+		});
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////