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

Timestamp:

11/15/06 14:56:00 (18 years ago)

Author:

bittner

Message:

pvs updates

File:

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

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

@@ -159 +159 @@
 public:
 
-        Pvs(): mSamples(0), mEntries() {}
+        Pvs(): mSamples(0), mEntries(), mLastSorted(0) {}
 
         /** creates pvs and initializes it with the given entries. 
@@ -205 +205 @@
         */
         float AddSample(T sample, const float pdf);
-        
+
+  /** Adds sample to PVS without checking for presence of the sample
+          pvs remians unsorted!
+  */
+  void AddSampleDirty(T sample, const float pdf);
+
+  /** Sort pvs entries - this should always be called after a
+          sequence of AddSampleDirty calls */
+  void Sort();
+  
         /** Adds sample to PVS. Assumes that the pvs is sorted
                 @returns contribution of sample (0 or 1)
@@ -271 +280 @@
         /// Number of samples used to create the PVS
         int mSamples;
+  
+  /// Last sorted entry in the pvs (important for find and merge
+  int mLastSorted;
+  
 };
 
@@ -279 +292 @@
         mEntries.reserve(samples.size());
         mEntries = samples;
-}
-
+        mLastSorted = 0;
+}
+
+template <typename T, typename S>
+void Pvs<T, S>::Sort()
+{
+  std::vector<PvsEntry<T, S> >::iterator it = mEntries.begin();
+  it.inc(mLastSorted);
+  sort(it, mEntries.end());
+  mLastSorted = mEntries.size() - 1;
+}
 
 /**
@@ -500 +522 @@
 
 template <typename T, typename S>
+void Pvs<T, S>::AddSampleDirty(T sample, const float pdf)
+{
+  ++ mSamples;
+  mEntries.push_back(PvsEntry<T, S>(sample, pdf));
+}
+                                         
+
+template <typename T, typename S>
 typename vector< PvsEntry<T, S> >::iterator Pvs<T, S>::AddSample2(T sample, const float pdf)
 {