Changeset 1117

Timestamp:

05/04/17 15:14:37 (8 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.

Location:

XIOS/trunk/src

Files:

• attribute_map.cpp (modified) (1 diff)
• attribute_map.hpp (modified) (2 diffs)
• attribute_template.hpp (modified) (2 diffs)
• attribute_template_impl.hpp (modified) (1 diff)
• node/axis.cpp (modified) (1 diff)
• node/domain.cpp (modified) (1 diff)
• node/scalar.cpp (modified) (1 diff)
• object_template.hpp (modified) (1 diff)
• object_template_impl.hpp (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;
             }
          }

XIOS/trunk/src/attribute_map.hpp

@@ -15 +15 @@
         \class CAttributeMap
         This class represents the set of attributes which an object can have.
+        Each attribute in the set is represented by an unique id.
       */
 
@@ -39 +40 @@
 
             void clearAttribute(const StdString& key);
-            bool isEqual(const CAttributeMap& another);
+            bool isEqual(const CAttributeMap& another, const vector<StdString>& excludedAttrs);
 
             /// Destructeur ///

XIOS/trunk/src/attribute_template.hpp

@@ -16 +16 @@
 {
       /// ////////////////////// Déclarations ////////////////////// ///
+  /*!
+    \class CAttributeTemplate
+    The class implements attribute of some basic types
+  */
       template <class T>
          class CAttributeTemplate : public CAttribute, public CType<T>
@@ -54 +58 @@
             bool hasInheritedValue(void) const;
 
-            bool isEqual(const CAttributeTemplate& attr );
+            bool isEqual_(const CAttributeTemplate& attr );
             bool isEqual(const CAttribute& attr );
-            
+
             /// Destructeur ///
             virtual ~CAttributeTemplate(void) { }

XIOS/trunk/src/attribute_template_impl.hpp

@@ -145 +145 @@
     {
       const CAttributeTemplate<T>& tmp = dynamic_cast<const CAttributeTemplate<T>& >(attr);
-      this->isEqual(tmp);
-
-    }
-
-    template <class T>
-    bool CAttributeTemplate<T>::isEqual(const CAttributeTemplate& attr)
+      return this->isEqual_(tmp);
+    }
+
+    template <class T>
+    bool CAttributeTemplate<T>::isEqual_(const CAttributeTemplate& attr)
     {
       if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))

XIOS/trunk/src/node/axis.cpp

@@ -986 +986 @@
   bool CAxis::isEqual(CAxis* obj)
   {
-    bool objEqual = SuperClass::isEqual(obj);
+    vector<StdString> excludedAttr;
+    excludedAttr.push_back("axis_ref");
+
+    bool objEqual = SuperClass::isEqual(obj, excludedAttr);    
     if (!objEqual) return objEqual;
 

XIOS/trunk/src/node/domain.cpp

@@ -2247 +2247 @@
   bool CDomain::isEqual(CDomain* obj)
   {
-    bool objEqual = SuperClass::isEqual(obj);
+    vector<StdString> excludedAttr;
+    excludedAttr.push_back("domain_ref");
+    bool objEqual = SuperClass::isEqual(obj, excludedAttr);
     if (!objEqual) return objEqual;
 

XIOS/trunk/src/node/scalar.cpp

@@ -74 +74 @@
   bool CScalar::isEqual(CScalar* obj)
   {
-    bool objEqual = SuperClass::isEqual(obj);
+    vector<StdString> excludedAttr;
+    excludedAttr.push_back("scalar_ref");
+    bool objEqual = SuperClass::isEqual(obj, excludedAttr);
     if (!objEqual) return objEqual;
 

XIOS/trunk/src/object_template.hpp

@@ -61 +61 @@
          static bool dispatchEvent(CEventServer& event) ;
 
-         bool isEqual(const string& id);
-         bool isEqual(T* obj);
+         bool isEqual(const string& id, const vector<StdString>& excludedAttrs);
+         bool isEqual(T* obj, const vector<StdString>& excludedAttrs);
 
          /// Accesseur statique ///

XIOS/trunk/src/object_template_impl.hpp

@@ -140 +140 @@
    */
    template <class T>
-   bool CObjectTemplate<T>::isEqual(const string& id)
+   bool CObjectTemplate<T>::isEqual(const string& id, const vector<StdString>& excludedAttrs)
    {
       T* obj = CObjectTemplate<T>::get(id);
-      return this->isEqual(obj);
-   }
-
-   template <class T>
-   bool CObjectTemplate<T>::isEqual(T* obj)
+      return this->isEqual(obj, excludedAttrs);
+   }
+
+   template <class T>
+   bool CObjectTemplate<T>::isEqual(T* obj, const vector<StdString>& excludedAttrs)
    {
 
       CAttributeMap& attrMapThis = *this;
       CAttributeMap& attrMapObj  = *obj;
-      return (attrMapThis.isEqual(attrMapObj));
+      return (attrMapThis.isEqual(attrMapObj, excludedAttrs));
    }