From d8578eb2733b2485be9f478c238cf74452966209 Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Fri, 30 Apr 2021 16:04:44 +0200
Subject: [PATCH] [MPL] add overloaded operator functions.
---
MaterialLib/MPL/Component.cpp | 12 ++++++++++++
MaterialLib/MPL/Component.h | 3 +++
MaterialLib/MPL/Medium.cpp | 5 +++++
MaterialLib/MPL/Medium.h | 3 +++
MaterialLib/MPL/Phase.cpp | 5 +++++
MaterialLib/MPL/Phase.h | 3 +++
6 files changed, 31 insertions(+)
diff --git a/MaterialLib/MPL/Component.cpp b/MaterialLib/MPL/Component.cpp
index 83fa3188351..96c44fcfe76 100644
--- a/MaterialLib/MPL/Component.cpp
+++ b/MaterialLib/MPL/Component.cpp
@@ -31,9 +31,21 @@ Component::Component(std::string const& component_name,
Property const& Component::property(PropertyType const& p) const
{
+ Property const* const property = properties_[p].get();
+ if (property == nullptr)
+ {
+ OGS_FATAL("Trying to access undefined property '{:s}' of {:s}",
+ property_enum_to_string[p], description());
+ }
+
return *properties_[p];
}
+Property const& Component::operator[](PropertyType const& p) const
+{
+ return property(p);
+}
+
bool Component::hasProperty(PropertyType const& p) const
{
return properties_[p] != nullptr;
diff --git a/MaterialLib/MPL/Component.h b/MaterialLib/MPL/Component.h
index df3eadf0f02..7a995388ac4 100644
--- a/MaterialLib/MPL/Component.h
+++ b/MaterialLib/MPL/Component.h
@@ -34,6 +34,9 @@ public:
/// A get-function for retrieving a certain property.
Property const& property(PropertyType const& /*p*/) const;
+
+ Property const& operator[](PropertyType const& p) const;
+
bool hasProperty(PropertyType const& p) const;
template <typename T>
diff --git a/MaterialLib/MPL/Medium.cpp b/MaterialLib/MPL/Medium.cpp
index 2e99adaab1d..0deb92d67af 100644
--- a/MaterialLib/MPL/Medium.cpp
+++ b/MaterialLib/MPL/Medium.cpp
@@ -61,6 +61,11 @@ Property const& Medium::property(PropertyType const& p) const
return *properties_[p];
}
+Property const& Medium::operator[](PropertyType const& p) const
+{
+ return property(p);
+}
+
bool Medium::hasProperty(PropertyType const& p) const
{
return properties_[p] != nullptr;
diff --git a/MaterialLib/MPL/Medium.h b/MaterialLib/MPL/Medium.h
index bfc0d290b85..aa79781c8d0 100644
--- a/MaterialLib/MPL/Medium.h
+++ b/MaterialLib/MPL/Medium.h
@@ -45,6 +45,9 @@ public:
/// A get-function for a property. The argument refers to the name of the
/// property.
Property const& property(PropertyType const& p) const;
+
+ Property const& operator[](PropertyType const& p) const;
+
bool hasProperty(PropertyType const& p) const;
/// A simple get-function for retrieving the number of phases the medium
diff --git a/MaterialLib/MPL/Phase.cpp b/MaterialLib/MPL/Phase.cpp
index 68921e4770c..f65c660d80e 100644
--- a/MaterialLib/MPL/Phase.cpp
+++ b/MaterialLib/MPL/Phase.cpp
@@ -60,6 +60,11 @@ Property const& Phase::property(PropertyType const& p) const
return *properties_[p];
}
+Property const& Phase::operator[](PropertyType const& p) const
+{
+ return property(p);
+}
+
bool Phase::hasProperty(PropertyType const& p) const
{
return properties_[p] != nullptr;
diff --git a/MaterialLib/MPL/Phase.h b/MaterialLib/MPL/Phase.h
index b4fbe03590a..141c3eb4a9d 100644
--- a/MaterialLib/MPL/Phase.h
+++ b/MaterialLib/MPL/Phase.h
@@ -46,6 +46,9 @@ public:
/// A get-function for a property. The argument refers to the name of the
/// property.
Property const& property(PropertyType const& p) const;
+
+ Property const& operator[](PropertyType const& p) const;
+
bool hasProperty(PropertyType const& p) const;
/// A get-function for retrieving the number of components in this phase.
--
GitLab