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

Timestamp:

05/04/17 15:14:37 (7 years ago)

Author:

mhnguyen

Message:

Fixing bug of using *_ref on chaining transformations.

+) Correct isEqual function of attribute_template
+) Modify isEqual function of CAttributeMap to make sure that some attributes are
excluded from comparasion

Test
+) On Curie
+) toy_cmpi6 works.

File:

• XIOS/trunk/src/attribute_map.cpp (modified) (1 diff)

XIOS/trunk/src/attribute_map.cpp

@@ -122 +122 @@
          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)
+      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)
          {
-            if ((*it).first.compare(StdString("id")) != 0 && (*it).first.compare(StdString("src")) != 0)
+            bool excluded = false;
+            for (int idx = 0; idx < excludedAttrs.size(); ++idx)
             {
-              if (this->hasAttribute(it->first))
-              { 
-                if (!((*it).second->isEqual(*(*this)[it->first])))
-                return false;
+               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;
               }
-              else
-                return false;
             }
          }