moved factory to include

rleap-project · Nov 21, 2023 · eee4aba · eee4aba
1 parent 0d61450
commit eee4aba
Show file tree

Hide file tree

Showing 39 changed files with 92 additions and 94 deletions.
diff --git a/include/dlplan/core/elements/booleans/empty.h b/include/dlplan/core/elements/booleans/empty.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -55,7 +55,7 @@ class EmptyBoolean : public Boolean {
     }
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Boolean& other) const override {

diff --git a/include/dlplan/core/elements/booleans/inclusion.h b/include/dlplan/core/elements/booleans/inclusion.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -61,7 +61,7 @@ class InclusionBoolean : public Boolean {
     }
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Boolean& other) const override {

diff --git a/include/dlplan/core/elements/booleans/nullary.h b/include/dlplan/core/elements/booleans/nullary.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class NullaryBoolean : public Boolean {
     NullaryBoolean(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, const Predicate& predicate);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Boolean& other) const override;

diff --git a/include/dlplan/core/elements/concepts/all.h b/include/dlplan/core/elements/concepts/all.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class AllConcept : public Concept {
     AllConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/and.h b/include/dlplan/core/elements/concepts/and.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -33,7 +33,7 @@ class AndConcept : public Concept {
     AndConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_1, std::shared_ptr<const Concept> concept_2);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/bot.h b/include/dlplan/core/elements/concepts/bot.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -26,7 +26,7 @@ class BotConcept : public Concept {
     BotConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/diff.h b/include/dlplan/core/elements/concepts/diff.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -30,7 +30,7 @@ class DiffConcept : public Concept {
 
     DiffConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_1, std::shared_ptr<const Concept> concept_2);
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/equal.h b/include/dlplan/core/elements/concepts/equal.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class EqualConcept : public Concept {
     EqualConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role_left, std::shared_ptr<const Role> role_right);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/not.h b/include/dlplan/core/elements/concepts/not.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -30,7 +30,7 @@ class NotConcept : public Concept {
     NotConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/one_of.h b/include/dlplan/core/elements/concepts/one_of.h
@@ -11,7 +11,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class OneOfConcept : public Concept {
     OneOfConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, const Constant& constant);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/or.h b/include/dlplan/core/elements/concepts/or.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class OrConcept : public Concept {
     OrConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_1, std::shared_ptr<const Concept> concept_2);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/primitive.h b/include/dlplan/core/elements/concepts/primitive.h
@@ -11,7 +11,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -32,7 +32,7 @@ class PrimitiveConcept : public Concept {
     PrimitiveConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, const Predicate& predicate, int pos);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/projection.h b/include/dlplan/core/elements/concepts/projection.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class ProjectionConcept : public Concept {
     ProjectionConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, const std::shared_ptr<const Role>& role, int pos);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/some.h b/include/dlplan/core/elements/concepts/some.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -30,7 +30,7 @@ class SomeConcept : public Concept {
 
     SomeConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept);
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/subset.h b/include/dlplan/core/elements/concepts/subset.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -30,7 +30,7 @@ class SubsetConcept : public Concept {
 
     SubsetConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role_left, std::shared_ptr<const Role> role_right);
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/concepts/top.h b/include/dlplan/core/elements/concepts/top.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -26,7 +26,7 @@ class TopConcept : public Concept {
     TopConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Concept& other) const override;

diff --git a/include/dlplan/core/elements/numericals/concept_distance.h b/include/dlplan/core/elements/numericals/concept_distance.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class ConceptDistanceNumerical : public Numerical {
 
     ConceptDistanceNumerical(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_from, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept_to);
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Numerical& other) const override;

diff --git a/include/dlplan/core/elements/numericals/count.h b/include/dlplan/core/elements/numericals/count.h
@@ -16,7 +16,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -60,7 +60,7 @@ class CountNumerical : public Numerical {
         : Numerical(vocabulary_info, index, element->is_static()), m_element(element) { }
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Numerical& other) const override {

diff --git a/include/dlplan/core/elements/numericals/role_distance.h b/include/dlplan/core/elements/numericals/role_distance.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class RoleDistanceNumerical : public Numerical {
 
     RoleDistanceNumerical(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role_from, std::shared_ptr<const Role> role, std::shared_ptr<const Role> role_to);
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Numerical& other) const override;

diff --git a/include/dlplan/core/elements/numericals/sum_concept_distance.h b/include/dlplan/core/elements/numericals/sum_concept_distance.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -31,7 +31,7 @@ class SumConceptDistanceNumerical : public Numerical {
 
     SumConceptDistanceNumerical(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_from, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept_to);
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Numerical& other) const override;

diff --git a/include/dlplan/core/elements/numericals/sum_role_distance.h b/include/dlplan/core/elements/numericals/sum_role_distance.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -32,7 +32,7 @@ class SumRoleDistanceNumerical : public Numerical {
     SumRoleDistanceNumerical(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role_from, std::shared_ptr<const Role> role, std::shared_ptr<const Role> role_to);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Numerical& other) const override;

diff --git a/include/dlplan/core/elements/roles/and.h b/include/dlplan/core/elements/roles/and.h
@@ -10,7 +10,7 @@
 using namespace std::string_literals;
 
 
-namespace dlplan::utils {
+namespace dlplan {
 template<typename... Ts>
 class ReferenceCountedObjectFactory;
 }
@@ -30,7 +30,7 @@ class AndRole : public Role {
     AndRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role_1, std::shared_ptr<const Role> role_2);
 
     template<typename... Ts>
-    friend class dlplan::utils::ReferenceCountedObjectFactory;
+    friend class dlplan::ReferenceCountedObjectFactory;
 
 public:
     bool operator==(const Role& other) const override;