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

Added functions for checking PDDL requirements.

Browse Source
This commit is contained in:
Patrick Lühne 2016-06-08 12:22:31 +02:00
parent 993d14d409
commit e60af33f75
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/plasp/pddl/Domain.h
View File

@ -33,6 +33,7 @@ class Domain
const Requirements &requirements() const; const Requirements &requirements() const;
bool hasRequirement(Requirement::Type requirementType) const; bool hasRequirement(Requirement::Type requirementType) const;
void checkRequirement(Requirement::Type requirementType) const;
expressions::PrimitiveTypes &types(); expressions::PrimitiveTypes &types();
const expressions::PrimitiveTypes &types() const; const expressions::PrimitiveTypes &types() const;

1
include/plasp/pddl/Problem.h
View File

@ -32,6 +32,7 @@ class Problem
const Requirements &requirements() const; const Requirements &requirements() const;
bool hasRequirement(Requirement::Type requirementType) const; bool hasRequirement(Requirement::Type requirementType) const;
void checkRequirement(Requirement::Type requirementType) const;
expressions::Constants &objects(); expressions::Constants &objects();
const expressions::Constants &objects() const; const expressions::Constants &objects() const;

4
include/plasp/pddl/Requirement.h
View File

@ -56,8 +56,8 @@ class Requirement
Type type() const; Type type() const;
void printAsPDDL(std::ostream &ostream) const; std::string toPDDL() const;
void printAsASP(std::ostream &ostream) const; std::string toASP() const;
private: private:
Type m_type; Type m_type;

10
src/plasp/pddl/Domain.cpp
View File

@ -206,6 +206,16 @@ bool Domain::hasRequirement(Requirement::Type requirementType) const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void Domain::checkRequirement(Requirement::Type requirementType) const
{
if (hasRequirement(requirementType))
return;
throw ConsistencyException("Requirement \"" + Requirement(requirementType).toPDDL() + "\" used but never declared");
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void Domain::computeDerivedRequirements() void Domain::computeDerivedRequirements()
{ {
const auto addRequirementUnique = const auto addRequirementUnique =

12
src/plasp/pddl/Problem.cpp
View File

@ -190,6 +190,18 @@ bool Problem::hasRequirement(Requirement::Type requirementType) const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void Problem::checkRequirement(Requirement::Type requirementType) const
{
m_domain.checkRequirement(requirementType);
if (hasRequirement(requirementType))
return;
throw ConsistencyException("Requirement \"" + Requirement(requirementType).toPDDL() + "\" used but never declared");
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void Problem::computeDerivedRequirements() void Problem::computeDerivedRequirements()
{ {
const auto addRequirementUnique = const auto addRequirementUnique =

8
src/plasp/pddl/Requirement.cpp
View File

@ -101,24 +101,24 @@ Requirement::Type Requirement::type() const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void Requirement::printAsPDDL(std::ostream &ostream) const std::string Requirement::toPDDL() const
{ {
const auto match = requirementTypesToPDDL.left.find(m_type); const auto match = requirementTypesToPDDL.left.find(m_type);
BOOST_ASSERT(match != requirementTypesToPDDL.left.end()); BOOST_ASSERT(match != requirementTypesToPDDL.left.end());
ostream << match->second; return match->second;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void Requirement::printAsASP(std::ostream &ostream) const std::string Requirement::toASP() const
{ {
const auto match = requirementTypesToASP.left.find(m_type); const auto match = requirementTypesToASP.left.find(m_type);
BOOST_ASSERT(match != requirementTypesToASP.left.end()); BOOST_ASSERT(match != requirementTypesToASP.left.end());
ostream << match->second; return match->second;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////