Changeset 997 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

Timestamp:

05/31/06 10:04:05 (18 years ago)

Author:

mattausch

Message:

fixed bug for histogram
improved samplerenderer
todo: difference detectempty true / false

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h (modified) (7 diffs)

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

@@ -193 +193 @@
         static bool SmallerPvs(const ViewCell *a, const ViewCell *b) 
         {
-        return a->GetPvs().GetSize() < b->GetPvs().GetSize();
-  }
-
- static bool SmallerRenderCost(const ViewCell *a, const ViewCell *b) 
- {
-         return a->GetRenderCost() < b->GetRenderCost();
- }
-
- static bool LargerRenderCost(const ViewCell *a, const ViewCell *b) 
- {
-         return a->GetRenderCost() > b->GetRenderCost();
- }
+                // HACK: take scalar value because pvs may not have been stored properly
+#if 1
+                return a->mPvsSize < b->mPvsSize;
+#else
+                return a->GetPvs().GetSize() < b->GetPvs().GetSize();
+#endif
+        }
+
+        static bool SmallerRenderCost(const ViewCell *a, const ViewCell *b) 
+        {
+                return a->GetRenderCost() < b->GetRenderCost();
+        }
+
+        static bool LargerRenderCost(const ViewCell *a, const ViewCell *b) 
+        {
+                return a->GetRenderCost() > b->GetRenderCost();
+        }
 
         void SetMergeCost(const float mergeCost);
+
         float GetMergeCost() const;
-        static void NewMail(const int reserve = 1) {
+
+        static void NewMail(const int reserve = 1) 
+        {
                 sMailId += sReservedMailboxes;
                 sReservedMailboxes = reserve;
         }
+
         void Mail() { mMailbox = sMailId; }
         bool Mailed() const { return mMailbox == sMailId; }
@@ -309 +318 @@
 
         
-        /// points to the currently active view cell.
+        /** points to the currently active view cell. This is the
+                view cell representing the current brach.
+        */
         ViewCell *mActiveViewCell;
 };
@@ -349 +360 @@
 
 public:
+        /** View cells tree constructor taking a view cell mnanager and
+                an environment as parameters.
+        */
         ViewCellsTree(ViewCellsManager *vcm, Environment *env);
         ~ViewCellsTree();
@@ -372 +386 @@
         
         /** Assign colors to the viewcells so that they can be renderered interactively without
-          color flickering.
-          */
+            color flickering.  
+        */
         void AssignRandomColors();
 
-        /** Updates view cell stats for this particular view cell
+        /** Updates view cell stats for this particular view cell.
         */
         void UpdateViewCellsStats(ViewCell *vc, ViewCellsStatistics &vcStat);
 
 
-        /** Get costs resulting from each merge step. */
+        /** Get costs resulting from each merge step. 
+        */
         void GetCostFunction(vector<float> &costFunction);
 
@@ -465 +480 @@
 
 
-        //////////////////////////////////////////////////////////////
-        //                 merge related stuff                      //
-        //////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////////
+        //                    merge related stuff                      //
+        /////////////////////////////////////////////////////////////////
 
         /** Computes render cost of the merged pvs.
@@ -525 +540 @@
                                                            const int numNewViewCells);
 
-        /** merge queue must be reset after some time because expected value
+        /** Merge queue must be reset after some time because expected value
                 may not be valid.
         */
@@ -535 +550 @@
         int UpdateActiveViewCells(ViewCellContainer &viewCells);
 
+        /** Helper function pullling pvs as high up in the tree as possible.
+        */ 
         void PullUpVisibility(ViewCellInterior *interior);
 
+        /** Compress pvs of view cell and children.
+        */
         void CompressViewCellsPvs(ViewCell *root);