Changeset 1877 for GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

Timestamp:

12/11/06 08:31:01 (18 years ago)

Author:

bittner

Message:

sampling updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h (modified) (6 diffs)

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

@@ -184 +184 @@
         int Compress() {return 0;}
         int GetSize() const {return (int)mEntries.size();}
-        bool Empty() const {return mEntries.empty();}
-
+  bool Empty() const {return mEntries.empty();}
+
+  void Reserve(const int n) { mEntries.reserve(n); }
         /** Normalize the visibility of entries in order to get 
                 comparable results.
@@ -231 +232 @@
         */
         void Sort();
+
+  /** Sort pvs entries assume that the pvs contains unique entries
+   */
+  void SimpleSort();
 
         /** Adds sample to PVS. Assumes that the pvs is sorted
@@ -307 +312 @@
                 // way we can achieve logarithmic behaviour for insertion and find
                 const int dirtySize = (int)mEntries.size() - mLastSorted;
-                return dirtySize > (int)(log((double)mEntries.size()) / log(2.0));
+                return dirtySize > 4*(int)(log((double)mEntries.size()) / log(2.0));
         }
 
@@ -362 +367 @@
         mEntries = newPvs.mEntries;
         mLastSorted = (int)mEntries.size();
+}
+
+template <typename T, typename S>
+void Pvs<T, S>::SimpleSort()
+{
+  sort(mEntries.begin(), mEntries.end());
+  mLastSorted = (int)mEntries.size();
 }
 
@@ -587 +599 @@
                                          const bool checkDirty)
 {
-        bool found = false;
-
-        PvsEntry<T, S> dummy(sample, PvsData());
-
-        // only check clean part
-        // $$ TMP JB
-        // mLastSorted = 0;
-        vector<PvsEntry<T, S> >::iterator sorted_end = mEntries.begin() + mLastSorted;
-
-        // binary search
-        it = lower_bound(mEntries.begin(), sorted_end, dummy);
-
-        if ((it != mEntries.end()) && ((*it).mObject == sample))
-                found = true;
-
-        // sample not found yet => search further in the unsorted part
-        if (!found && checkDirty)
-        {
-                vector<PvsEntry<T, S> >::const_iterator dit, dit_end = mEntries.end();
-
-                for (dit = sorted_end; (dit != dit_end) && ((*dit).mObject != sample); ++ dit) ;
-                
-                if ((dit != mEntries.end()) && ((*dit).mObject == sample))
-                        found = true;
-        }
-        
-        return found;
+  bool found = false;
+  
+  PvsEntry<T, S> dummy(sample, PvsData());
+  
+  // only check clean part
+  vector<PvsEntry<T, S> >::iterator sorted_end = mEntries.begin() + mLastSorted;
+  
+  // binary search
+  it = lower_bound(mEntries.begin(), sorted_end, dummy);
+  
+  if ((it != mEntries.end()) && ((*it).mObject == sample))
+        found = true;
+  
+  // sample not found yet => search further in the unsorted part
+  if (!found && checkDirty) {
+        vector<PvsEntry<T, S> >::const_iterator dit, dit_end = mEntries.end();
+        
+        for (dit = sorted_end; (dit != dit_end) && ((*dit).mObject != sample); ++ dit) ;
+        
+        if (dit != dit_end)
+          found = true;
+  }
+  
+  return found;
 }
 
@@ -698 +707 @@
         const bool entryFound = Find(sample, it);
 
-        if (entryFound)
-        {
-                S &data = (*it).mData;
-
-                data.mSumPdf += pdf;
-                //contribution = pdf / data.mSumPdf;
-
-                return false;
-        }
-        else 
-        {
-                AddSampleDirty(sample, pdf);
-                //contribution = 1.0f;
-
-                return true;
+        if (entryFound) {
+          S &data = (*it).mData;
+          
+          data.mSumPdf += pdf;
+          //contribution = pdf / data.mSumPdf;
+          
+          return false;
+        }
+        else {
+          AddSampleDirty(sample, pdf);
+          //contribution = 1.0f;
+          return true;
         }
 }