Changeset 580 for trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

Timestamp:

02/01/06 19:29:59 (18 years ago)

Author:

mattausch

Message:

implemented variance
started implementing merge history

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -43 +43 @@
         Candidate for leaf merging based on priority.
 */
-class MergeCandidate
+class VspKdMergeCandidate
 {  
 public:
 
-        MergeCandidate(VspKdLeaf *l1, VspKdLeaf *l2);
+        VspKdMergeCandidate(VspKdLeaf *l1, VspKdLeaf *l2);
 
         /** Computes PVS difference between the leaves.
@@ -61 +61 @@
         void SetValid();
 
-        friend bool operator<(const MergeCandidate &leafa, const MergeCandidate &leafb)
+        friend bool operator<(const VspKdMergeCandidate &leafa, const VspKdMergeCandidate &leafb)
         {
                 return leafb.GetMergeCost() < leafa.GetMergeCost();
@@ -850 +850 @@
         ViewCellsManager *mViewCellsManager;
 
-        priority_queue<MergeCandidate> mMergeQueue;
+        priority_queue<VspKdMergeCandidate> mMergeQueue;