Changeset 1105 for XIOS/trunk/src/attribute_map.cpp

Timestamp:

04/25/17 10:57:48 (7 years ago)

Author:

mhnguyen

Message:

Adding comparison operator between objects of XIOS.
Two objects of a same type are considered equal if they have same non-empty
attributes which have same values

+) Add operator== to class CArray
+) Add comparison operator to some basic attribute classes
+) Add operator== to date and duration (It seems that they don't serve much)

Test
+) On Curie
+) No Unit tests but test with transformation work (the next commit)

File:

• XIOS/trunk/src/attribute_map.cpp (modified) (7 diffs)

XIOS/trunk/src/attribute_map.cpp

@@ -16 +16 @@
       ///--------------------------------------------------------------
 
+      /*!
+         Clear all attributes of an object and reset them to empty state
+      */
       void CAttributeMap::clearAllAttributes(void)
       {
@@ -29 +32 @@
       //---------------------------------------------------------------
 
+      /*
+        Clear an attribute and reset its value
+        \param[in] key id of attribute
+      */
       void CAttributeMap::clearAttribute(const StdString& key)
       {
@@ -36 +43 @@
       //---------------------------------------------------------------
 
+      /*!
+        Set an attribute of certain id with a value
+        \param[in] key id of the attribute
+        \param[in] attr value of attribute
+      */
       void CAttributeMap::setAttribute(const StdString& key, CAttribute* const attr)
       {
@@ -50 +62 @@
       //---------------------------------------------------------------
 
+      /*!
+        Subscript operator. Return attribute with a specific id
+      */
       CAttribute* CAttributeMap::operator[](const StdString& key)
       {
@@ -103 +118 @@
          }
       }
+
+      /*!
+         Compare two attribute maps
+         \param [in] another attribute map to compare
+         \return true if these two maps have same attributes whose value are identical
+      */
+      bool CAttributeMap::isEqual(const CAttributeMap& another)
+      {
+         SuperClassMap::const_iterator itb = another.begin(), ite = another.end(), it;
+         for (it = itb; it !=ite; ++it)
+         {
+            if ((*it).first.compare(StdString("id")) != 0 && (*it).first.compare(StdString("src")) != 0)
+            {
+              if (this->hasAttribute(it->first))
+              { 
+                if (!((*it).second->isEqual(*(*this)[it->first])))
+                return false;
+              }
+              else
+                return false;
+            }
+         }
+
+         return true;
+      }
+
 
       //---------------------------------------------------------------
@@ -139 +180 @@
       }
 
+      /*!
+        Duplicate attribute map with a specific attribute map.
+        Copy all non-empty attribute of the current attribute map
+        \param [in] srcAttr attribute map which is copied from.
+      */
       void CAttributeMap::duplicateAttributes(const CAttributeMap* const srcAttr)
       {
@@ -216 +262 @@
       }
  */
+
+      
       void CAttributeMap::generateCInterface(ostream& oss, const string& className)
       {