Changeset 610 for trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

Timestamp:

02/09/06 12:14:11 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

@@ -59 +59 @@
   void NormalizeMaximum();
   
-  /** Merges pvs of a and pvs of b into this pvs.
+  /** Merges pvs of a into this pvs.
    */
-  void Merge(const Pvs<T> &a, const Pvs<T> &b);
+  void Merge(const Pvs<T> &a);
   
   /** Difference of pvs to pvs b.
@@ -130 +130 @@
 
 template <typename T>
-void Pvs<T>::Merge(const Pvs<T> &a, const Pvs<T> &b)
+void Pvs<T>::Merge(const Pvs<T> &a)
 {
         std::map<T, PvsData<T>, LtSample<T> >::const_iterator it;
 
-        mEntries = a.mEntries;
-        
-        for (it = b.mEntries.begin(); it != b.mEntries.end(); ++ it)
+        for (it = a.mEntries.begin(); it != a.mEntries.end(); ++ it)
         {
                 PvsData<T> *data = Find((*it).first);