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

Renamed parseVariableValue to parseValue.

This commit is contained in:
Patrick Lühne 2016-05-20 16:48:30 +02:00
parent 44e7535e64
commit 440d90a28e
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,9 +35,9 @@ class Description
void parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const; void parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const;
template<class T> template<class T>
T parseValue(std::istream &istream) const; T parse(std::istream &istream) const;
const Variable &parseVariable(std::istream &istream) const; const Variable &parseVariable(std::istream &istream) const;
const Value &parseVariableValue(std::istream &istream, const Variable &variable) const; const Value &parseValue(std::istream &istream, const Variable &variable) const;
AssignedVariable parseAssignedVariable(std::istream &istream) const; AssignedVariable parseAssignedVariable(std::istream &istream) const;
VariableTransition parseVariableTransition(std::istream &istream) const; VariableTransition parseVariableTransition(std::istream &istream) const;

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

@ -169,7 +169,7 @@ void Description::print(std::ostream &ostream) const
void Description::parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const void Description::parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const
{ {
const auto sectionIdentifier = parseValue<std::string>(istream); const auto sectionIdentifier = parse<std::string>(istream);
if (sectionIdentifier != expectedSectionIdentifier) if (sectionIdentifier != expectedSectionIdentifier)
throw ParserException("Invalid format, expected " + expectedSectionIdentifier + ", got " + sectionIdentifier); throw ParserException("Invalid format, expected " + expectedSectionIdentifier + ", got " + sectionIdentifier);
@ -178,7 +178,7 @@ void Description::parseSectionIdentifier(std::istream &istream, const std::strin
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
template<class T> template<class T>
T Description::parseValue(std::istream &istream) const T Description::parse(std::istream &istream) const
{ {
T value; T value;
@ -198,7 +198,7 @@ T Description::parseValue(std::istream &istream) const
const Variable &Description::parseVariable(std::istream &istream) const const Variable &Description::parseVariable(std::istream &istream) const
{ {
const auto variableID = parseValue<size_t>(istream); const auto variableID = parse<size_t>(istream);
if (variableID >= m_variables.size()) if (variableID >= m_variables.size())
throw ParserException("Variable index out of range (index " + std::to_string(variableID) + ")"); throw ParserException("Variable index out of range (index " + std::to_string(variableID) + ")");
@ -208,9 +208,9 @@ const Variable &Description::parseVariable(std::istream &istream) const
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
const Value &Description::parseVariableValue(std::istream &istream, const Variable &variable) const const Value &Description::parseValue(std::istream &istream, const Variable &variable) const
{ {
const auto valueID = parseValue<int>(istream); const auto valueID = parse<int>(istream);
if (valueID == -1) if (valueID == -1)
return Value::Any; return Value::Any;
@ -226,7 +226,7 @@ const Value &Description::parseVariableValue(std::istream &istream, const Variab
AssignedVariable Description::parseAssignedVariable(std::istream &istream) const AssignedVariable Description::parseAssignedVariable(std::istream &istream) const
{ {
const auto &variable = parseVariable(istream); const auto &variable = parseVariable(istream);
const auto &value = parseVariableValue(istream, variable); const auto &value = parseValue(istream, variable);
return {variable, value}; return {variable, value};
} }
@ -236,8 +236,8 @@ AssignedVariable Description::parseAssignedVariable(std::istream &istream) const
VariableTransition Description::parseVariableTransition(std::istream &istream) const VariableTransition Description::parseVariableTransition(std::istream &istream) const
{ {
const auto &variable = parseVariable(istream); const auto &variable = parseVariable(istream);
const auto &valueBefore = parseVariableValue(istream, variable); const auto &valueBefore = parseValue(istream, variable);
const auto &valueAfter = parseVariableValue(istream, variable); const auto &valueAfter = parseValue(istream, variable);
return {variable, valueBefore, valueAfter}; return {variable, valueBefore, valueAfter};
} }
@ -249,7 +249,7 @@ void Description::parseVersionSection(std::istream &istream) const
// Version section // Version section
parseSectionIdentifier(istream, "begin_version"); parseSectionIdentifier(istream, "begin_version");
const auto formatVersion = parseValue<size_t>(istream); const auto formatVersion = parse<size_t>(istream);
if (formatVersion != 3) if (formatVersion != 3)
throw ParserException("Unsupported SAS format version (" + std::to_string(formatVersion) + ")"); throw ParserException("Unsupported SAS format version (" + std::to_string(formatVersion) + ")");
@ -274,7 +274,7 @@ void Description::parseMetricSection(std::istream &istream)
void Description::parseVariablesSection(std::istream &istream) void Description::parseVariablesSection(std::istream &istream)
{ {
const auto numberOfVariables = parseValue<size_t>(istream); const auto numberOfVariables = parse<size_t>(istream);
m_variables.resize(numberOfVariables); m_variables.resize(numberOfVariables);
for (size_t i = 0; i < numberOfVariables; i++) for (size_t i = 0; i < numberOfVariables; i++)
@ -283,10 +283,10 @@ void Description::parseVariablesSection(std::istream &istream)
parseSectionIdentifier(istream, "begin_variable"); parseSectionIdentifier(istream, "begin_variable");
variable.name = parseValue<std::string>(istream); variable.name = parse<std::string>(istream);
variable.axiomLayer = parseValue<int>(istream); variable.axiomLayer = parse<int>(istream);
const auto numberOfValues = parseValue<size_t>(istream); const auto numberOfValues = parse<size_t>(istream);
variable.values.resize(numberOfValues); variable.values.resize(numberOfValues);
istream.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); istream.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
@ -305,7 +305,7 @@ void Description::parseVariablesSection(std::istream &istream)
void Description::parseMutexSection(std::istream &istream) void Description::parseMutexSection(std::istream &istream)
{ {
const auto numberOfMutexGroups = parseValue<size_t>(istream); const auto numberOfMutexGroups = parse<size_t>(istream);
m_mutexGroups.resize(numberOfMutexGroups); m_mutexGroups.resize(numberOfMutexGroups);
for (size_t i = 0; i < numberOfMutexGroups; i++) for (size_t i = 0; i < numberOfMutexGroups; i++)
@ -314,7 +314,7 @@ void Description::parseMutexSection(std::istream &istream)
auto &mutexGroup = m_mutexGroups[i]; auto &mutexGroup = m_mutexGroups[i];
const auto numberOfFacts = parseValue<size_t>(istream); const auto numberOfFacts = parse<size_t>(istream);
mutexGroup.facts.reserve(numberOfFacts); mutexGroup.facts.reserve(numberOfFacts);
for (size_t j = 0; j < numberOfFacts; j++) for (size_t j = 0; j < numberOfFacts; j++)
@ -338,7 +338,7 @@ void Description::parseInitialStateSection(std::istream &istream)
for (size_t i = 0; i < m_variables.size(); i++) for (size_t i = 0; i < m_variables.size(); i++)
{ {
const auto &variable = m_variables[i]; const auto &variable = m_variables[i];
const auto &value = parseVariableValue(istream, variable); const auto &value = parseValue(istream, variable);
m_initialStateFacts.push_back({variable, value}); m_initialStateFacts.push_back({variable, value});
} }
@ -352,7 +352,7 @@ void Description::parseGoalSection(std::istream &istream)
{ {
parseSectionIdentifier(istream, "begin_goal"); parseSectionIdentifier(istream, "begin_goal");
const auto numberOfGoalFacts = parseValue<size_t>(istream); const auto numberOfGoalFacts = parse<size_t>(istream);
m_goalFacts.reserve(numberOfGoalFacts); m_goalFacts.reserve(numberOfGoalFacts);
for (size_t i = 0; i < numberOfGoalFacts; i++) for (size_t i = 0; i < numberOfGoalFacts; i++)
@ -368,7 +368,7 @@ void Description::parseGoalSection(std::istream &istream)
void Description::parseOperatorSection(std::istream &istream) void Description::parseOperatorSection(std::istream &istream)
{ {
const auto numberOfOperators = parseValue<size_t>(istream); const auto numberOfOperators = parse<size_t>(istream);
m_operators.resize(numberOfOperators); m_operators.resize(numberOfOperators);
for (size_t i = 0; i < numberOfOperators; i++) for (size_t i = 0; i < numberOfOperators; i++)
@ -380,7 +380,7 @@ void Description::parseOperatorSection(std::istream &istream)
auto &operator_ = m_operators[i]; auto &operator_ = m_operators[i];
std::getline(istream, operator_.name); std::getline(istream, operator_.name);
const auto numberOfPrevailConditions = parseValue<size_t>(istream); const auto numberOfPrevailConditions = parse<size_t>(istream);
operator_.preconditions.reserve(numberOfPrevailConditions); operator_.preconditions.reserve(numberOfPrevailConditions);
for (size_t j = 0; j < numberOfPrevailConditions; j++) for (size_t j = 0; j < numberOfPrevailConditions; j++)
@ -389,14 +389,14 @@ void Description::parseOperatorSection(std::istream &istream)
operator_.preconditions.push_back(std::move(precondition)); operator_.preconditions.push_back(std::move(precondition));
} }
const auto numberOfEffects = parseValue<size_t>(istream); const auto numberOfEffects = parse<size_t>(istream);
operator_.effects.reserve(numberOfEffects); operator_.effects.reserve(numberOfEffects);
for (size_t j = 0; j < numberOfEffects; j++) for (size_t j = 0; j < numberOfEffects; j++)
{ {
Effect::Conditions conditions; Effect::Conditions conditions;
const auto numberOfEffectConditions = parseValue<size_t>(istream); const auto numberOfEffectConditions = parse<size_t>(istream);
conditions.reserve(numberOfEffectConditions); conditions.reserve(numberOfEffectConditions);
for (size_t k = 0; k < numberOfEffectConditions; k++) for (size_t k = 0; k < numberOfEffectConditions; k++)
@ -415,7 +415,7 @@ void Description::parseOperatorSection(std::istream &istream)
operator_.effects.push_back(std::move(effect)); operator_.effects.push_back(std::move(effect));
} }
operator_.costs = parseValue<size_t>(istream); operator_.costs = parse<size_t>(istream);
parseSectionIdentifier(istream, "end_operator"); parseSectionIdentifier(istream, "end_operator");
} }
@ -425,7 +425,7 @@ void Description::parseOperatorSection(std::istream &istream)
void Description::parseAxiomSection(std::istream &istream) void Description::parseAxiomSection(std::istream &istream)
{ {
const auto numberOfAxiomRules = parseValue<size_t>(istream); const auto numberOfAxiomRules = parse<size_t>(istream);
m_axiomRules.reserve(numberOfAxiomRules); m_axiomRules.reserve(numberOfAxiomRules);
std::cout << "Axiom rules: " << numberOfAxiomRules << std::endl; std::cout << "Axiom rules: " << numberOfAxiomRules << std::endl;
@ -434,7 +434,7 @@ void Description::parseAxiomSection(std::istream &istream)
{ {
parseSectionIdentifier(istream, "begin_rule"); parseSectionIdentifier(istream, "begin_rule");
const auto numberOfConditions = parseValue<size_t>(istream); const auto numberOfConditions = parse<size_t>(istream);
AxiomRule::Conditions conditions; AxiomRule::Conditions conditions;
conditions.reserve(numberOfConditions); conditions.reserve(numberOfConditions);