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

Made order of sections of translated SAS more uniform with PDDL.

Browse Source
This commit is contained in:
Patrick Lühne 2016-08-13 02:29:48 +02:00
parent 8be67e7065
commit 230c6dfc15
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/plasp/sas/Description.h
View File

@ -45,6 +45,8 @@ class Description
bool usesAxiomRules() const; bool usesAxiomRules() const;
bool usesConditionalEffects() const; bool usesConditionalEffects() const;
bool hasRequirements() const;
private: private:
Description(); Description();

7
src/plasp/sas/Description.cpp
View File

@ -153,6 +153,13 @@ bool Description::usesConditionalEffects() const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
bool Description::hasRequirements() const
{
return usesActionCosts() || usesAxiomRules() || usesConditionalEffects();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void Description::parseContent(utils::Parser<> &parser) void Description::parseContent(utils::Parser<> &parser)
{ {
parseVersionSection(parser); parseVersionSection(parser);

27
src/plasp/sas/TranslatorASP.cpp
View File

@ -23,13 +23,24 @@ TranslatorASP::TranslatorASP(const Description &description, utils::LogStream &o
void TranslatorASP::translate() const void TranslatorASP::translate() const
{ {
translateRequirements(); // TODO: remove double computation of requirements
translateInitialState(); if (m_description.hasRequirements())
translateGoal(); {
translateRequirements();
m_outputStream << std::endl;
}
translateVariables(); translateVariables();
m_outputStream << std::endl;
translateActions(); translateActions();
m_outputStream << std::endl;
translateMutexes(); translateMutexes();
m_outputStream << std::endl;
translateAxiomRules(); translateAxiomRules();
m_outputStream << std::endl;
translateInitialState();
m_outputStream << std::endl;
translateGoal();
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -46,8 +57,6 @@ void TranslatorASP::translateRequirements() const
if (m_description.usesConditionalEffects()) if (m_description.usesConditionalEffects())
m_outputStream << utils::Keyword("requiresFeature") << "(conditionalEffects)." << std::endl; m_outputStream << utils::Keyword("requiresFeature") << "(conditionalEffects)." << std::endl;
m_outputStream << std::endl;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -67,8 +76,6 @@ void TranslatorASP::translateInitialState() const
fact.value().printAsASPPredicate(m_outputStream); fact.value().printAsASPPredicate(m_outputStream);
m_outputStream << ")." << std::endl; m_outputStream << ")." << std::endl;
}); });
m_outputStream << std::endl;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -88,8 +95,6 @@ void TranslatorASP::translateGoal() const
fact.value().printAsASPPredicate(m_outputStream); fact.value().printAsASPPredicate(m_outputStream);
m_outputStream << ")." << std::endl; m_outputStream << ")." << std::endl;
}); });
m_outputStream << std::endl;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -121,8 +126,6 @@ void TranslatorASP::translateVariables() const
m_outputStream << ")." << std::endl; m_outputStream << ")." << std::endl;
}); });
}); });
m_outputStream << std::endl;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -190,8 +193,6 @@ void TranslatorASP::translateActions() const
operator_.printPredicateAsASP(m_outputStream); operator_.printPredicateAsASP(m_outputStream);
m_outputStream << ", " << operator_.costs() << ")." << std::endl; m_outputStream << ", " << operator_.costs() << ")." << std::endl;
}); });
m_outputStream << std::endl;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////