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

Fixed incorrectly determined parent types and added unit test.

Browse Source
This commit is contained in:
Patrick Lühne 2017-06-18 01:05:00 +02:00
parent bfb382de52
commit 195cffbf88
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 72 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp
View File

@ -44,9 +44,9 @@ void parseAndAddPrimitiveTypeDeclarations(Context &context, ast::Domain &domain)
auto &tokenizer = context.tokenizer; auto &tokenizer = context.tokenizer;
tokenizer.skipWhiteSpace(); tokenizer.skipWhiteSpace();
// Index on the first element of the current inheritance list const auto position = tokenizer.position();
size_t inheritanceIndex = 0;
// First pass: collect all primitive types
while (tokenizer.currentCharacter() != ')') while (tokenizer.currentCharacter() != ')')
{ {
parseAndAddUntypedPrimitiveTypeDeclaration(context, domain); parseAndAddUntypedPrimitiveTypeDeclaration(context, domain);
@ -56,18 +56,43 @@ void parseAndAddPrimitiveTypeDeclarations(Context &context, ast::Domain &domain)
if (!tokenizer.testAndSkip<char>('-')) if (!tokenizer.testAndSkip<char>('-'))
continue; continue;
// Skip parent type information for now
tokenizer.getIdentifier();
}
tokenizer.seek(position);
// Second pass: link parent types correctly
// Index on the first element of the current inheritance list
size_t inheritanceIndex = 0;
size_t i = 0;
while (tokenizer.currentCharacter() != ')')
{
// Skip type declaration
tokenizer.getIdentifier();
tokenizer.skipWhiteSpace();
if (!tokenizer.testAndSkip<char>('-'))
{
i++;
continue;
}
// If existing, parse and store parent type // If existing, parse and store parent type
auto parentType = parsePrimitiveType(context, domain); auto parentType = parsePrimitiveType(context, domain);
auto &types = domain.types; auto &types = domain.types;
for (size_t i = inheritanceIndex; i < types.size(); i++) for (size_t j = inheritanceIndex; j <= i; j++)
types[i]->parentTypes.emplace_back(ast::deepCopy(parentType)); types[j]->parentTypes.emplace_back(ast::deepCopy(parentType));
// All types up to now are labeled with their parent types // All types up to now are labeled with their parent types
inheritanceIndex = types.size(); inheritanceIndex = i + 1;
tokenizer.skipWhiteSpace(); tokenizer.skipWhiteSpace();
i++;
} }
} }

42
lib/pddlparse/tests/TestOfficialPDDLInstances.cpp
View File

@ -236,4 +236,46 @@ TEST_CASE("[PDDL parser] The official PDDL instances are parsed correctly", "[PD
CHECK(constants[13]->name == "smooth"); CHECK(constants[13]->name == "smooth");
CHECK(constants[13]->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration->name == "surface"); CHECK(constants[13]->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration->name == "surface");
} }
SECTION("type inheritance in logistics domain")
{
context.mode = pddl::Mode::Compatibility;
const auto domainFile = pddlInstanceBasePath / "ipc-2000" / "domains" / "logistics-strips-typed" / "domain.pddl";
context.tokenizer.read(domainFile);
auto description = pddl::parseDescription(context);
const auto &types = description.domain->types;
REQUIRE(types.size() == 10);
CHECK(types[0]->name == "truck");
REQUIRE(types[0]->parentTypes.size() == 1);
CHECK(types[0]->parentTypes[0]->declaration->name == "vehicle");
CHECK(types[1]->name == "airplane");
REQUIRE(types[1]->parentTypes.size() == 1);
CHECK(types[1]->parentTypes[0]->declaration->name == "vehicle");
CHECK(types[2]->name == "package");
REQUIRE(types[2]->parentTypes.size() == 1);
CHECK(types[2]->parentTypes[0]->declaration->name == "physobj");
CHECK(types[3]->name == "vehicle");
REQUIRE(types[3]->parentTypes.size() == 1);
CHECK(types[3]->parentTypes[0]->declaration->name == "physobj");
CHECK(types[4]->name == "airport");
REQUIRE(types[4]->parentTypes.size() == 1);
CHECK(types[4]->parentTypes[0]->declaration->name == "place");
CHECK(types[5]->name == "location");
REQUIRE(types[5]->parentTypes.size() == 1);
CHECK(types[5]->parentTypes[0]->declaration->name == "place");
CHECK(types[6]->name == "city");
REQUIRE(types[6]->parentTypes.size() == 1);
CHECK(types[6]->parentTypes[0]->declaration->name == "object");
CHECK(types[7]->name == "place");
REQUIRE(types[7]->parentTypes.size() == 1);
CHECK(types[7]->parentTypes[0]->declaration->name == "object");
CHECK(types[8]->name == "physobj");
REQUIRE(types[8]->parentTypes.size() == 1);
CHECK(types[8]->parentTypes[0]->declaration->name == "object");
CHECK(types[9]->name == "object");
REQUIRE(types[9]->parentTypes.empty());
}
} }