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

Implemented parsing the signs of values.

This commit is contained in:
Patrick Lühne 2016-05-21 01:17:17 +02:00
parent e9fe6fa219
commit 15289a0c8c
3 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/plasp/sas/Value.h
View File

@ -1,6 +1,7 @@
#ifndef __SAS__VALUE_H
#define __SAS__VALUE_H
#include <iosfwd>
#include <string>
namespace plasp
@ -16,13 +17,24 @@ namespace sas
struct Value
{
enum class Sign
{
Positive,
Negative
};
static const Value Any;
Sign sign;
std::string name;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
std::ostream &operator <<(std::ostream &ostream, const Value &value);
////////////////////////////////////////////////////////////////////////////////////////////////////
}
}

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

@ -125,7 +125,7 @@ void Description::print(std::ostream &ostream) const
std::for_each(variable.values.cbegin(), variable.values.cend(),
[&](const auto &value)
{
ostream << "\t\t\t" << value.name << std::endl;
ostream << "\t\t\t" << value << std::endl;
});
ostream << "\t\taxiom layer: " << variable.axiomLayer << std::endl;
@ -142,7 +142,7 @@ void Description::print(std::ostream &ostream) const
std::for_each(mutexGroup.facts.cbegin(), mutexGroup.facts.cend(),
[&](const auto &fact)
{
ostream << "\t\t" << fact.variable.name << " = " << fact.value.name << std::endl;
ostream << "\t\t" << fact.variable.name << " = " << fact.value << std::endl;
});
});
@ -152,7 +152,7 @@ void Description::print(std::ostream &ostream) const
std::for_each(m_initialStateFacts.cbegin(), m_initialStateFacts.cend(),
[&](const auto &initialStateFact)
{
ostream << "\t" << initialStateFact.variable.name << " = " << initialStateFact.value.name << std::endl;
ostream << "\t" << initialStateFact.variable.name << " = " << initialStateFact.value << std::endl;
});
// Goal section
@ -161,7 +161,7 @@ void Description::print(std::ostream &ostream) const
std::for_each(m_goalFacts.cbegin(), m_goalFacts.cend(),
[&](const auto &goalFact)
{
ostream << "\t" << goalFact.variable.name << " = " << goalFact.value.name << std::endl;
ostream << "\t" << goalFact.variable.name << " = " << goalFact.value << std::endl;
});
// Operator section
@ -176,7 +176,7 @@ void Description::print(std::ostream &ostream) const
std::for_each(operator_.preconditions.cbegin(), operator_.preconditions.cend(),
[&](const auto &precondition)
{
std::cout << "\t\t\t" << precondition.variable.name << " = " << precondition.value.name << std::endl;
std::cout << "\t\t\t" << precondition.variable.name << " = " << precondition.value << std::endl;
});
ostream << "\t\teffects: " << operator_.effects.size() << std::endl;
@ -190,11 +190,11 @@ void Description::print(std::ostream &ostream) const
std::for_each(effect.conditions.cbegin(), effect.conditions.cend(),
[&](const auto &condition)
{
ostream << "\t\t\t\t\t" << condition.variable.name << " = " << condition.value.name << std::endl;
ostream << "\t\t\t\t\t" << condition.variable.name << " = " << condition.value << std::endl;
});
ostream << "\t\t\t\tpostcondition:" << std::endl;
ostream << "\t\t\t\t\t" << effect.postcondition.variable.name << " = " << effect.postcondition.value.name << std::endl;
ostream << "\t\t\t\t\t" << effect.postcondition.variable.name << " = " << effect.postcondition.value << std::endl;
});
ostream << "\t\tcosts: " << operator_.costs << std::endl;
@ -212,11 +212,11 @@ void Description::print(std::ostream &ostream) const
std::for_each(axiomRule.conditions.cbegin(), axiomRule.conditions.cend(),
[&](const auto &condition)
{
ostream << "\t\t\t" << condition.variable.name << " = " << condition.value.name << std::endl;
ostream << "\t\t\t" << condition.variable.name << " = " << condition.value << std::endl;
});
ostream << "\t\tpostcondition:" << std::endl;
ostream << "\t\t\t" << axiomRule.postcondition.variable.name << " = " << axiomRule.postcondition.value.name << std::endl;
ostream << "\t\t\t" << axiomRule.postcondition.variable.name << " = " << axiomRule.postcondition.value << std::endl;
});
}
@ -344,11 +344,21 @@ void Description::parseVariablesSection(std::istream &istream)
try
{
istream.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
for (size_t j = 0; j < numberOfValues; j++)
{
auto &value = variable.values[j];
const auto sasSign = parse<std::string>(istream);
if (sasSign == "Atom")
value.sign = Value::Sign::Positive;
else if (sasSign == "NegatedAtom")
value.sign = Value::Sign::Negative;
else
throw ParserException("Invalid value sign \"" + sasSign + "\"");
istream.ignore(1);
std::getline(istream, value.name);
}
}

14
src/plasp/sas/Value.cpp
View File

@ -1,5 +1,7 @@
#include <plasp/sas/Value.h>
#include <iostream>
namespace plasp
{
namespace sas
@ -11,7 +13,17 @@ namespace sas
//
////////////////////////////////////////////////////////////////////////////////////////////////////
const Value Value::Any = {"(any)"};
const Value Value::Any = {Value::Sign::Positive, "(any)"};
////////////////////////////////////////////////////////////////////////////////////////////////////
std::ostream &operator <<(std::ostream &ostream, const Value &value)
{
if (value.sign == Value::Sign::Negative)
ostream << "not ";
return (ostream << value.name);
}
////////////////////////////////////////////////////////////////////////////////////////////////////