name fixes

rleap-project · Jun 3, 2024 · f1ad1c4 · f1ad1c4
1 parent b631cb7
commit f1ad1c4
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/include/dlplan/core/elements/concepts/all.h b/include/dlplan/core/elements/concepts/all.h
@@ -28,7 +28,7 @@ class AllConcept : public Concept {
 
     ConceptDenotations evaluate_impl(const States& states, DenotationsCaches& caches) const override;
 
-    AllConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> 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::ReferenceCountedObjectFactory;

diff --git a/include/dlplan/core/elements/concepts/not.h b/include/dlplan/core/elements/concepts/not.h
@@ -27,7 +27,7 @@ class NotConcept : public Concept {
 
     ConceptDenotations evaluate_impl(const States& states, DenotationsCaches& caches) const override;
 
-    NotConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept);
+    NotConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_);
 
     template<typename... Ts>
     friend class dlplan::ReferenceCountedObjectFactory;

diff --git a/include/dlplan/core/elements/concepts/some.h b/include/dlplan/core/elements/concepts/some.h
@@ -28,7 +28,7 @@ class SomeConcept : public Concept {
 
     ConceptDenotations evaluate_impl(const States& states, DenotationsCaches& caches) const override;
 
-    SomeConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> 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::ReferenceCountedObjectFactory;
 

diff --git a/include/dlplan/core/elements/roles/identity.h b/include/dlplan/core/elements/roles/identity.h
@@ -27,7 +27,7 @@ class IdentityRole : public Role {
 
     RoleDenotations evaluate_impl(const States& states, DenotationsCaches& caches) const override;
 
-    IdentityRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept);
+    IdentityRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_);
 
     template<typename... Ts>
     friend class dlplan::ReferenceCountedObjectFactory;

diff --git a/include/dlplan/core/elements/roles/restrict.h b/include/dlplan/core/elements/roles/restrict.h
@@ -28,7 +28,7 @@ class RestrictRole : public Role {
 
     RoleDenotations evaluate_impl(const States& states, DenotationsCaches& caches) const override;
 
-    RestrictRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept);
+    RestrictRole(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::ReferenceCountedObjectFactory;
 

diff --git a/src/core/elements/concepts/all.cpp b/src/core/elements/concepts/all.cpp
@@ -37,8 +37,8 @@ ConceptDenotations AllConcept::evaluate_impl(const States& states, DenotationsCa
     return denotations;
 }
 
-AllConcept::AllConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept)
-    : Concept(index, vocabulary_info, role->is_static() && concept->is_static()), m_role(role), m_concept(concept) { }
+AllConcept::AllConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept_)
+    : Concept(index, vocabulary_info, role->is_static() && concept_->is_static()), m_role(role), m_concept(concept_) { }
 
 bool AllConcept::are_equal_impl(const Concept& other) const {
     if (typeid(*this) == typeid(other)) {

diff --git a/src/core/elements/concepts/not.cpp b/src/core/elements/concepts/not.cpp
@@ -31,8 +31,8 @@ ConceptDenotations NotConcept::evaluate_impl(const States& states, DenotationsCa
     return denotations;
 }
 
-NotConcept::NotConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept)
-    : Concept(index, vocabulary_info, concept->is_static()), m_concept(concept){ }
+NotConcept::NotConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_)
+    : Concept(index, vocabulary_info, concept_->is_static()), m_concept(concept_){ }
 
 bool NotConcept::are_equal_impl(const Concept& other) const {
     if (typeid(*this) == typeid(other)) {

diff --git a/src/core/elements/concepts/some.cpp b/src/core/elements/concepts/some.cpp
@@ -36,8 +36,8 @@ ConceptDenotations SomeConcept::evaluate_impl(const States& states, DenotationsC
     return denotations;
 }
 
-SomeConcept::SomeConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept)
-    : Concept(index, vocabulary_info, role->is_static() && concept->is_static()), m_role(role), m_concept(concept) { }
+SomeConcept::SomeConcept(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept_)
+    : Concept(index, vocabulary_info, role->is_static() && concept_->is_static()), m_role(role), m_concept(concept_) { }
 
 bool SomeConcept::are_equal_impl(const Concept& other) const {
     if (typeid(*this) == typeid(other)) {

diff --git a/src/core/elements/roles/identity.cpp b/src/core/elements/roles/identity.cpp
@@ -30,8 +30,8 @@ RoleDenotations IdentityRole::evaluate_impl(const States& states, DenotationsCac
     return denotations;
 }
 
-IdentityRole::IdentityRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept)
-    : Role(index, vocabulary_info, concept->is_static()), m_concept(concept) { }
+IdentityRole::IdentityRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Concept> concept_)
+    : Role(index, vocabulary_info, concept_->is_static()), m_concept(concept_) { }
 
 bool IdentityRole::are_equal_impl(const Role& other) const {
     if (typeid(*this) == typeid(other)) {

diff --git a/src/core/elements/roles/restrict.cpp b/src/core/elements/roles/restrict.cpp
@@ -36,8 +36,8 @@ RoleDenotations RestrictRole::evaluate_impl(const States& states, DenotationsCac
     return denotations;
 }
 
-RestrictRole::RestrictRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept)
-: Role(index, vocabulary_info, role->is_static() && concept->is_static()), m_role(role), m_concept(concept) { }
+RestrictRole::RestrictRole(ElementIndex index, std::shared_ptr<VocabularyInfo> vocabulary_info, std::shared_ptr<const Role> role, std::shared_ptr<const Concept> concept_)
+: Role(index, vocabulary_info, role->is_static() && concept_->is_static()), m_role(role), m_concept(concept_) { }
 
 bool RestrictRole::are_equal_impl(const Role& other) const {
     if (typeid(*this) == typeid(other)) {