Changeset 2177 for XIOS

Timestamp:

07/12/21 19:58:18 (3 years ago)

Author:

ymipsl

Message:

Correct problem in hash methods for vector.
Implement hash combine.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/utils.hpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/utils.hpp

@@ -181 +181 @@
       for(int i = 0; i < sizeVec; ++i)
       {
-        hash ^= i + 0x9e3779b9 + (hash << 6) + (hash >> 2);
+        hash ^= jenkins_hash(vec[i]) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
       }
       return hash;
     }
+
+    static inline size_t hash_combine(size_t seed, const T& value)
+    {
+      seed ^= jenkins_hash(value) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+      return seed;
+    }
+
   };
 
@@ -200 +207 @@
       return HashAlgorithm<T>::boost_hash(vec);
     }
-
+    
+    std::size_t hashCombine(size_t seed, const T& val)
+    {
+      return HashAlgorithm<T>::hash_combine(seed, val);
+    }
   private:
     size_t hash_value(const T& val, Int2Type<0>)