diff --git a/include/plasp/pddl/Description.h b/include/plasp/pddl/Description.h index db03e69..87e5740 100644 --- a/include/plasp/pddl/Description.h +++ b/include/plasp/pddl/Description.h @@ -35,7 +35,7 @@ class Description bool containsProblem() const; const Problem &problem() const; - void normalizeParameterNames(); + void normalize(); private: Description(); diff --git a/include/plasp/pddl/Domain.h b/include/plasp/pddl/Domain.h index 13b3426..b3fd831 100644 --- a/include/plasp/pddl/Domain.h +++ b/include/plasp/pddl/Domain.h @@ -51,7 +51,7 @@ class Domain void checkConsistency(); - void normalizeParameterNames(); + void normalize(); private: void parseSection(); @@ -67,6 +67,8 @@ class Domain void parseActionSection(); + void normalizeParameterNames(); + Context &m_context; std::string m_name; diff --git a/src/plasp/pddl/Description.cpp b/src/plasp/pddl/Description.cpp index b7b3b16..6d577ff 100644 --- a/src/plasp/pddl/Description.cpp +++ b/src/plasp/pddl/Description.cpp @@ -204,9 +204,9 @@ void Description::checkConsistency() //////////////////////////////////////////////////////////////////////////////////////////////////// -void Description::normalizeParameterNames() +void Description::normalize() { - m_domain->normalizeParameterNames(); + m_domain->normalize(); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/plasp/pddl/Domain.cpp b/src/plasp/pddl/Domain.cpp index acba0eb..889886b 100644 --- a/src/plasp/pddl/Domain.cpp +++ b/src/plasp/pddl/Domain.cpp @@ -415,6 +415,13 @@ void Domain::checkConsistency() //////////////////////////////////////////////////////////////////////////////////////////////////// +void Domain::normalize() +{ + normalizeParameterNames(); +} + +//////////////////////////////////////////////////////////////////////////////////////////////////// + void Domain::normalizeParameterNames() { std::for_each(m_predicates.begin(), m_predicates.end(), diff --git a/src/plasp/pddl/TranslatorASP.cpp b/src/plasp/pddl/TranslatorASP.cpp index eb98e29..183de3c 100644 --- a/src/plasp/pddl/TranslatorASP.cpp +++ b/src/plasp/pddl/TranslatorASP.cpp @@ -23,7 +23,7 @@ TranslatorASP::TranslatorASP(Description &description, utils::LogStream &outputS : m_description(description), m_outputStream(outputStream) { - m_description.normalizeParameterNames(); + m_description.normalize(); } ////////////////////////////////////////////////////////////////////////////////////////////////////