Changeset 2149

Timestamp:

02/22/07 10:26:50 (18 years ago)

Author:

mattausch

Message:

worked on traversal tree

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• TraversalTree.cpp (modified) (9 diffs)
• TraversalTree.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/TraversalTree.cpp

@@ -314 +314 @@
         if (axis == -1) {
                 cout << "terminate on cost ratio" << endl;
+                ++ mStat.costRatioNodes;
                 return leaf;
         }
@@ -421 +422 @@
                 minCostNodes * 100 / (double)Leaves() << endl;
 
+        app << "#N_COSTRATIOLEAVES ( Percentage of leaves with cost ratio termination )\n"<<
+                costRatioNodes * 100 / (double)Leaves() << endl;
+
         //  app << setprecision(4);
         //  app << "#N_CTIME  ( Construction time [s] )\n"
@@ -434 +438 @@
         TraversalLeaf *leaf = (TraversalLeaf *)data.mNode;
 
-        if (data.mDepth > mTermMaxDepth)
+        if (data.mDepth >= mTermMaxDepth)
                 ++ mStat.maxDepthNodes;
 
-        if ((int)(leaf->mViewCells.size()) < mTermMinCost)
+        if ((int)(leaf->mViewCells.size()) <= mTermMinCost)
                 ++ mStat.minCostNodes;
 
@@ -474 +478 @@
                 AxisAlignedBox3 box = (*mi)->GetBox();
 
+                //cout << "box: " << box << endl;
                 splitCandidates->push_back(new SortableEntry(SortableEntry::BOX_MAX,
                         box.Max(axis),
@@ -511 +516 @@
 {
 
-#define DEBUG_COST 0
+#define DEBUG_COST 1
 
 #if DEBUG_COST
@@ -518 +523 @@
 
         static int lastAxis = 100;
+
         if (axis <= lastAxis)
-                nodeId++;
+                ++ nodeId;
 
         lastAxis = axis;
@@ -552 +558 @@
         float minSum = 1e20f;
 
+        int openBoxes = 0;
+
         for(ci = splitCandidates->begin(); ci < splitCandidates->end(); ++ ci) 
         {
@@ -558 +566 @@
                 case SortableEntry::BOX_MIN:
                         ++ objectsLeft;
+                        ++ openBoxes;
                         break;
                 case SortableEntry::BOX_MAX:
                         -- objectsRight;
+                        -- openBoxes;
                         break;
                 }
@@ -581 +591 @@
                         {
                                 float oldCost = (float)node->mViewCells.size();
-                                float newCost = mCt_div_ci + sum/boxArea;
+                                float newCost = mCt_div_ci + sum / boxArea;
                                 float ratio = newCost / oldCost;
-                                costStream<<(*ci)->value<<" "<<ratio<<endl;
+
+                                costStream << (*ci)->value << " " << ratio << " open: " << openBoxes;
+
+                                if ((*ci)->type == SortableEntry::BOX_MAX)
+                                        costStream << " max event" << endl;
+                                else 
+                                        costStream << " min event" << endl;
                         }
 #endif

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

@@ -56 +56 @@
   // number of dynamically removed ray refs
   int removedRayRefs;
-  
+  // number of nodes terminated on cost ratio
+  int costRatioNodes;
+
   // Constructor
   TraversalTreeStatistics() 
@@ -71 +73 @@
           nodes = 0;
           
-          for (int i=0; i<7; i++)
+          for (int i = 0; i < 7; ++ i)
                   splits[i] = 0;
           
@@ -82 +84 @@
           totalObjectRefs = 0;
           addedRayRefs = removedRayRefs = 0;
+          costRatioNodes = 0;
   }