From f1ad1c4c8dab3c0da13b40819f3111fb8b347677 Mon Sep 17 00:00:00 2001 From: Dominik Drexler Date: Mon, 3 Jun 2024 14:28:37 +0200 Subject: [PATCH] name fixes --- include/dlplan/core/elements/concepts/all.h | 2 +- include/dlplan/core/elements/concepts/not.h | 2 +- include/dlplan/core/elements/concepts/some.h | 2 +- include/dlplan/core/elements/roles/identity.h | 2 +- include/dlplan/core/elements/roles/restrict.h | 2 +- src/core/elements/concepts/all.cpp | 4 ++-- src/core/elements/concepts/not.cpp | 4 ++-- src/core/elements/concepts/some.cpp | 4 ++-- src/core/elements/roles/identity.cpp | 4 ++-- src/core/elements/roles/restrict.cpp | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/dlplan/core/elements/concepts/all.h b/include/dlplan/core/elements/concepts/all.h index 9369d9b5..4ee804d9 100644 --- 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 vocabulary_info, std::shared_ptr role, std::shared_ptr concept); + AllConcept(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr role, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/include/dlplan/core/elements/concepts/not.h b/include/dlplan/core/elements/concepts/not.h index 9c87c313..75a48298 100644 --- 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 vocabulary_info, std::shared_ptr concept); + NotConcept(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/include/dlplan/core/elements/concepts/some.h b/include/dlplan/core/elements/concepts/some.h index 63827ce4..ef1faf77 100644 --- 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 vocabulary_info, std::shared_ptr role, std::shared_ptr concept); + SomeConcept(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr role, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/include/dlplan/core/elements/roles/identity.h b/include/dlplan/core/elements/roles/identity.h index 730a8c80..824d12e4 100644 --- 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 vocabulary_info, std::shared_ptr concept); + IdentityRole(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/include/dlplan/core/elements/roles/restrict.h b/include/dlplan/core/elements/roles/restrict.h index e8c987c1..86a42366 100644 --- 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 vocabulary_info, std::shared_ptr role, std::shared_ptr concept); + RestrictRole(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr role, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/src/core/elements/concepts/all.cpp b/src/core/elements/concepts/all.cpp index 9a00aaeb..cea43d71 100644 --- 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 vocabulary_info, std::shared_ptr role, std::shared_ptr concept) - : Concept(index, vocabulary_info, role->is_static() && concept->is_static()), m_role(role), m_concept(concept) { } +AllConcept::AllConcept(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr role, std::shared_ptr 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 index bb47e8b1..11b8c58f 100644 --- 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 vocabulary_info, std::shared_ptr concept) - : Concept(index, vocabulary_info, concept->is_static()), m_concept(concept){ } +NotConcept::NotConcept(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr 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 index 14ef9a73..a75ddea0 100644 --- 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 vocabulary_info, std::shared_ptr role, std::shared_ptr concept) - : Concept(index, vocabulary_info, role->is_static() && concept->is_static()), m_role(role), m_concept(concept) { } +SomeConcept::SomeConcept(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr role, std::shared_ptr 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 index caeabc33..9e90afdc 100644 --- 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 vocabulary_info, std::shared_ptr concept) - : Role(index, vocabulary_info, concept->is_static()), m_concept(concept) { } +IdentityRole::IdentityRole(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr 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 index 524d7712..01d4a4c6 100644 --- 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 vocabulary_info, std::shared_ptr role, std::shared_ptr concept) -: Role(index, vocabulary_info, role->is_static() && concept->is_static()), m_role(role), m_concept(concept) { } +RestrictRole::RestrictRole(ElementIndex index, std::shared_ptr vocabulary_info, std::shared_ptr role, std::shared_ptr 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)) {