Changeset 2161 for GTP/trunk/Lib/Vis/Preprocessing/src/HashPvs.h

Timestamp:

02/23/07 13:54:56 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HashPvs.h (modified) (14 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/HashPvs.h

@@ -2 +2 @@
 #define __HASHPVS_H
 
-//#include <hash_map>
+
 #include <hash_set>
 #include "common.h"
 #include <math.h>
 #include "PvsBase.h"
+#include "google/dense_hash_set"
 
 
@@ -25 +26 @@
    size_t operator()(T a) const
    {
-      size_t h = (size_t)(a->GetId());// % 2000;
-      //for (; *s; ++s)
-      //   h = 5 * h + *s;
-      return h;
+           return (size_t)(a->GetId());
    }
 
@@ -37 +35 @@
 };
 
-/*
-template<typename T>
-struct gt
-{
-        bool operator() (T s1, T s2) const
-        {
-                return s1 > s2;
-        }
-};
-*/
-//#define HASH_SET stdext::hash_set<T, stdext::hash_compare<T, gt<T> > >
-#define HASH_SET stdext::hash_set<T, my_hash_compare<T> >
+
+#define HASH_SET google::dense_hash_set<T, my_hash_compare<T> >
+//#define HASH_SET stdext::hash_set<T, my_hash_compare<T> >
+#define HASH_ITERATOR HASH_SET::iterator
+#define CONST_HASH_ITERATOR HASH_SET::const_iterator
 
 /** Iterator over a hash pvs.
@@ -59 +50 @@
         HashPvsIterator<T, S>() {}
 
-        HashPvsIterator<T, S>(const typename HASH_SET::const_iterator &itCurrent,
-                                                  const typename HASH_SET::const_iterator &itEnd):
+        HashPvsIterator<T, S>(const typename CONST_HASH_ITERATOR &itCurrent,
+                                                  const typename CONST_HASH_ITERATOR &itEnd):
         mItCurrent(itCurrent), mItEnd(itEnd)
         {
@@ -72 +63 @@
         T Next(S &pdf)
         {
-                // hack: create new pvs entry
-                return *(mItCurrent) ++;
+                T sample = *mItCurrent;
+                ++ mItCurrent;
+
+                return sample;
         }
 
         T Next()
         {
-                // hack: create new pvs entry
-                return *(mItCurrent) ++;
+                T sample = *mItCurrent;
+                ++ mItCurrent;
+
+                return sample;
         }
         
 private:
-        typename HASH_SET::const_iterator mItCurrent;
-        typename HASH_SET::const_iterator mItEnd;
+        typename CONST_HASH_ITERATOR mItCurrent;
+        typename CONST_HASH_ITERATOR mItEnd;
 };
 
@@ -139 +134 @@
                 it would be added in the sorted vector.
         */
-        bool Find(T sample, typename HASH_SET::iterator &it);
+        inline bool Find(T sample, typename HASH_ITERATOR &it);
 
         typename HashPvsIterator<T, S> GetIterator() const;
@@ -210 +205 @@
 
 template <typename T, typename S>
-bool HashPvs<T, S>::Find(T sample, typename HASH_SET::iterator &it)
+bool HashPvs<T, S>::Find(T sample, typename HASH_ITERATOR &it)
 {
         it = mEntries.find(sample);
@@ -216 +211 @@
         // already in map
         return (it != mEntries.end());
+        return false;
 }
 
@@ -236 +232 @@
 float HashPvs<T, S>::AddSample(T sample, const float pdf)
 {
-        static HASH_SET::iterator it;
+        static HASH_ITERATOR it;
 
         if (Find(sample, it))
@@ -256 +252 @@
 void HashPvs<T, S>::AddSampleDirty(T sample, const float pdf)
 {
-        static HASH_SET::iterator it;
+        static HASH_ITERATOR it;
 
         // not yet in map
@@ -272 +268 @@
                                                                                 const float pdf)
 {
-        /*pair<HASH_SET::iterator, bool> p = mEntries.insert(sample);
+        /*pair<HASH_ITERATOR, bool> p = mEntries.insert(sample);
 
         // already in map
         return p.second;
 */
-        static HASH_SET::iterator it;
+        static HASH_ITERATOR it;
 
         // already in map
@@ -375 +371 @@
                                                   const HashPvs<T, S> &b)
 {
-        HASH_SET::const_iterator ait, ait_end = a.mEntries.end();
+        CONST_HASH_ITERATOR ait, ait_end = a.mEntries.end();
 
         for (ait = a.mEntries.begin(); ait != ait_end; ++ ait)
@@ -382 +378 @@
         }
 
-        HASH_SET::const_iterator bit, bit_end = b.mEntries.end();
+        CONST_HASH_ITERATOR bit, bit_end = b.mEntries.end();
 
         for (bit = b.mEntries.begin(); bit != bit_end; ++ bit)
@@ -389 +385 @@
         }
 
-        //cerr << "not implemented" << endl; 
 }