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

Timestamp:

11/09/06 19:41:31 (18 years ago)

Author:

bittner

Message:

visibility filter updates

File:

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

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

@@ -298 +298 @@
 template <typename T, typename S> void Pvs<T, S>::Merge(const Pvs<T, S> &a)
 {
-        std::map<T, S, LtSample<T> >::const_iterator it;
-
-        for (it = a.mEntries.begin(); it != a.mEntries.end(); ++ it)
-        {
-                AddSample((*it).first, (*it).second.mSumPdf);
-        }
+  
+  std::map<T, S, LtSample<T> >::const_iterator it;
+  int samples = mSamples + a.mSamples;
+
+  for (it = a.mEntries.begin(); it != a.mEntries.end(); ++ it)
+        {
+          AddSample((*it).first, (*it).second.mSumPdf);
+        }
+  mSamples = samples;
 }
 
@@ -446 +449 @@
 int Pvs<T, S>::AddPvs(const Pvs<T, S> &pvs)
 {
-  mSamples += pvs.mSamples;
+  int samples = mSamples + pvs.mSamples;
   std::map<T, S, LtSample<T> >::
         const_iterator it, it_end = pvs.mEntries.end();
@@ -456 +459 @@
           AddSample((*it).first, (*it).second.mSumPdf, contri);
   }
-  
+
+  mSamples = samples;
+
   return GetSize();
 }
@@ -463 +468 @@
 int Pvs<T, S>::SubtractPvs(const Pvs<T, S> &pvs)
 {
-  mSamples -= pvs.mSamples;
+  
+  int samples = mSamples - pvs.mSamples;
   std::map<T, S, LtSample<T> >::
         const_iterator it, it_end = pvs.mEntries.end();
@@ -470 +476 @@
   for (it = pvs.mEntries.begin(); it != it_end; ++ it) 
         RemoveSample((*it).first, (*it).second.mSumPdf);
-  
+
+  mSamples = samples;
   return GetSize();
 }