added missing getter

rleap-project · Nov 25, 2023 · 5ffd21d · 5ffd21d
1 parent cbd4324
commit 5ffd21d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/api/python/src/dlplan/policy/__init__.pyi b/api/python/src/dlplan/policy/__init__.pyi
@@ -76,8 +76,9 @@ class Policy:
     @overload
     def evaluate_effects(self, source_state: State, target_state: State, rules: List[Rule], caches: DenotationsCaches) -> bool: ...
     def get_rules(self) -> MutableSet[Rule]: ...
-    def get_booleans(self) -> MutableSet[Boolean]: ...
-    def get_numericals(self) -> MutableSet[Numerical]: ...
+    def get_booleans(self) -> MutableSet[NamedBoolean]: ...
+    def get_numericals(self) -> MutableSet[NamedNumerical]: ...
+    def get_concepts(self) -> MutableSet[NamedConcept]: ...
 
 
 class PolicyFactory:

diff --git a/api/python/src/policy.cpp b/api/python/src/policy.cpp
@@ -75,6 +75,7 @@ void init_policy(py::module_ &m_policy) {
         .def("get_rules", &policy::Policy::get_rules)
         .def("get_booleans", &policy::Policy::get_booleans)
         .def("get_numericals", &policy::Policy::get_numericals)
+        .def("get_concepts", &policy::Policy::get_concepts)
     ;
 
 // py::overload_cast<>(&policy::PolicyFactory::str, py::const_)

diff --git a/include/dlplan/policy.h b/include/dlplan/policy.h
@@ -194,6 +194,7 @@ class Policy : public Base<Policy> {
 private:
     Booleans m_booleans;
     Numericals m_numericals;
+    Concepts m_concepts;
     Rules m_rules;
 
     Policy(int identifier, const Rules& rules);
@@ -230,6 +231,7 @@ class Policy : public Base<Policy> {
 
     const Booleans& get_booleans() const;
     const Numericals& get_numericals() const;
+    const Concepts& get_concepts() const;
     const Rules& get_rules() const;
 };
 

diff --git a/src/policy/policy_impl.cpp b/src/policy/policy_impl.cpp
@@ -109,10 +109,9 @@ struct InsertNamedElementFromEffect : public BaseEffectVisitor {
 
 Policy::Policy(int identifier, const Rules& rules)
     : Base<Policy>(identifier), m_rules(rules) {
-    // Retrieve boolean and numericals from the rules.
-    Concepts concepts;
-    InsertNamedElementFromCondition condition_visitor(m_booleans, m_numericals, concepts);
-    InsertNamedElementFromEffect effect_visitor(m_booleans, m_numericals, concepts);
+    // Retrieve boolean, numericals, and concepts from the rules.
+    InsertNamedElementFromCondition condition_visitor(m_booleans, m_numericals, m_concepts);
+    InsertNamedElementFromEffect effect_visitor(m_booleans, m_numericals, m_concepts);
     for (const auto& rule : m_rules) {
         for (const auto& condition : rule->get_conditions()) {
             condition->accept(condition_visitor);
@@ -241,6 +240,10 @@ const Numericals& Policy::get_numericals() const {
     return m_numericals;
 }
 
+const Concepts& Policy::get_concepts() const {
+    return m_concepts;
+}
+
 const Rules& Policy::get_rules() const {
     return m_rules;
 }