Merge pull request #4487 from macumber/less_than_bcl

Add operator< for BCLComponent and BCLMeasure
NREL · Nov 3, 2021 · 3731f8c · 3731f8c
2 parents 93c1b91 + dd22a5f
commit 3731f8c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/src/utilities/bcl/BCLComponent.cpp b/src/utilities/bcl/BCLComponent.cpp
@@ -186,4 +186,8 @@ bool BCLComponent::operator!=(const BCLComponent& other) const {
   return !(operator==(other));
 }
 
+bool BCLComponent::operator<(const BCLComponent& other) const {
+  return (uid() + versionId()) < (other.uid() + other.versionId());
+}
+
 }  // namespace openstudio
diff --git a/src/utilities/bcl/BCLComponent.hpp b/src/utilities/bcl/BCLComponent.hpp
@@ -108,6 +108,9 @@ class UTILITIES_API BCLComponent
   /// Negation of ==.
   bool operator!=(const BCLComponent& other) const;
 
+  /// Less than
+  bool operator<(const BCLComponent& other) const;
+
   //@}
  private:
   REGISTER_LOGGER("openstudio.BCLComponent");

diff --git a/src/utilities/bcl/BCLMeasure.cpp b/src/utilities/bcl/BCLMeasure.cpp
@@ -997,6 +997,10 @@ bool BCLMeasure::operator!=(const BCLMeasure& other) const {
   return !(operator==(other));
 }
 
+bool BCLMeasure::operator<(const BCLMeasure& other) const {
+  return (uid() + versionId()) < (other.uid() + other.versionId());
+}
+
 bool BCLMeasure::save() const {
   return m_bclXML.save();
 }

diff --git a/src/utilities/bcl/BCLMeasure.hpp b/src/utilities/bcl/BCLMeasure.hpp
@@ -255,6 +255,9 @@ class UTILITIES_API BCLMeasure
 
   bool operator!=(const BCLMeasure& other) const;
 
+  /// Less than
+  bool operator<(const BCLMeasure& other) const;
+
   /// Save the measure.xml back to the directory
   bool save() const;