From ea1dcef788e5bf70ec1fe2828efc58aec27b808f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Mon, 23 May 2016 00:25:13 +0200
Subject: [PATCH] Reordered ASP output.

---
 src/plasp/sas/TranslatorASP.cpp | 58 ++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/plasp/sas/TranslatorASP.cpp b/src/plasp/sas/TranslatorASP.cpp
index 884ab8b..f3ceb8e 100644
--- a/src/plasp/sas/TranslatorASP.cpp
+++ b/src/plasp/sas/TranslatorASP.cpp
@@ -88,6 +88,35 @@ void TranslatorASP::translate(std::ostream &ostream) const
 				});
 		});
 
+	ostream << "% initial state" << std::endl;
+
+	const auto &initialStateFacts = m_description.initialState().facts();
+
+	std::for_each(initialStateFacts.cbegin(), initialStateFacts.cend(),
+		[&](const auto &fact)
+		{
+			if (fact.value().sign() == Value::Sign::Negative)
+				return;
+
+			ostream << "initialState(";
+			fact.value().printAsASP(ostream);
+			ostream << ")." << std::endl;
+		});
+
+	ostream << std::endl;
+	ostream << "% goal" << std::endl;
+
+	const auto &goalFacts = m_description.goal().facts();
+
+	std::for_each(goalFacts.cbegin(), goalFacts.cend(),
+		[&](const auto &fact)
+		{
+			ostream << "goal(";
+			fact.value().printAsASPPredicateBody(ostream);
+			ostream << ")." << std::endl;
+		});
+
+	ostream << std::endl;
 	ostream << "% fluents" << std::endl;
 
 	std::for_each(fluents.cbegin(), fluents.cend(),
@@ -135,35 +164,6 @@ void TranslatorASP::translate(std::ostream &ostream) const
 			ostream << std::endl;
 		});
 
-	ostream << "% initial state" << std::endl;
-
-	const auto &initialStateFacts = m_description.initialState().facts();
-
-	std::for_each(initialStateFacts.cbegin(), initialStateFacts.cend(),
-		[&](const auto &fact)
-		{
-			if (fact.value().sign() == Value::Sign::Negative)
-				return;
-
-			ostream << "initialState(";
-			fact.value().printAsASP(ostream);
-			ostream << ")." << std::endl;
-		});
-
-	ostream << std::endl;
-	ostream << "% goal" << std::endl;
-
-	const auto &goalFacts = m_description.goal().facts();
-
-	std::for_each(goalFacts.cbegin(), goalFacts.cend(),
-		[&](const auto &fact)
-		{
-			ostream << "goal(";
-			fact.value().printAsASPPredicateBody(ostream);
-			ostream << ")." << std::endl;
-		});
-
-	ostream << std::endl;
 	ostream << "% constraints derived from SAS variables" << std::endl;
 
 	std::for_each(variables.cbegin(), variables.cend(),