Changeset 1158 for XIOS/dev/dev_olga/src/attribute_map.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/attribute_map.cpp (modified) (8 diffs)

XIOS/dev/dev_olga/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
+         \param [in] excludedAttrs attribute to be excluded from comparasion
+         \return true if these two maps have same attributes whose value are identical
+      */
+      bool CAttributeMap::isEqual(const CAttributeMap& another, const vector<StdString>& excludedAttrs)
+      {
+         SuperClassMap::const_iterator itb = another.begin(), ite = another.end(), it;
+         for (it = itb; it !=ite; ++it)
+         {
+            bool excluded = false;
+            for (int idx = 0; idx < excludedAttrs.size(); ++idx)
+            {
+               if (0 == (*it).first.compare(excludedAttrs[idx]))
+               {
+                 excluded = true;
+                 break;
+               } 
+            }
+
+            if (!excluded)
+            {
+              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;
+      }
+
 
       //---------------------------------------------------------------
@@ -129 +186 @@
                if (apply)
                {
-                 if (currentAtt->isEmpty() && !el.second->isEmpty())
+                 if (currentAtt->isEmpty() && currentAtt->canInherite() && !el.second->isEmpty())
                  {
                     this->setAttribute(el.first, el.second);
@@ -139 +196 @@
       }
 
+      /*!
+        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 +278 @@
       }
  */
+      
       void CAttributeMap::generateCInterface(ostream& oss, const string& className)
       {