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

Correctly aggregating fluent names now.

Browse Source
This commit is contained in:
Patrick Lühne 2016-05-21 03:02:12 +02:00
parent 17685b68fb
commit cac555ea42
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,17 +54,29 @@ void TranslatorASP::translate(std::ostream &ostream) const
{ {
checkSupport(); checkSupport();
std::vector<const Value *> fluents; std::vector<const std::string *> fluents;
const auto &variables = m_description.variables(); const auto &variables = m_description.variables();
std::for_each(variables.cbegin(), variables.cend(), std::for_each(variables.cbegin(), variables.cend(),
[&](const auto &variable) [&](const auto &variable)
{ {
std::for_each(variable.values.cbegin(), variable.values.cend(), const auto &values = variable.values;
std::for_each(values.cbegin(), values.cend(),
[&](const auto &value) [&](const auto &value)
{ {
fluents.push_back(&value); const auto match = std::find_if(fluents.cbegin(), fluents.cend(),
[&](const auto &fluent)
{
return value.name == *fluent;
});
// Don’t add fluents if their negated form has already been added
if (match != fluents.cend())
return;
fluents.push_back(&value.name);
}); });
}); });
@ -73,9 +85,6 @@ void TranslatorASP::translate(std::ostream &ostream) const
std::for_each(fluents.cbegin(), fluents.cend(), std::for_each(fluents.cbegin(), fluents.cend(),
[&](const auto *fluent) [&](const auto *fluent)
{ {
if (fluent->sign == Value::Sign::Negative)
return;
ostream << "fluent(" << *fluent << ")." << std::endl; ostream << "fluent(" << *fluent << ")." << std::endl;
}); });