Changeset 1415 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

09/18/06 18:57:34 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (5 diffs)

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

@@ -94 +94 @@
         app << "#N_LEAVES ( Number of leaves )\n" << Leaves() << "\n";
 
-        app << "#AXIS_ALIGNED_SPLITS (number of axis aligned splits)\n" << splits[0] + splits[1] + splits[2] << endl;
-
         app << "#N_SPLITS ( Number of splits in axes x y z)\n";
 
         for (int i = 0; i < 3; ++ i)
                 app << splits[i] << " ";
+
         app << endl;
 
@@ -529 +528 @@
                 || (data.mPvs <= mTermMinPvs)
                 || (data.mProbability <= mTermMinProbability)
-                || (data.GetAvgRayContribution() > mTermMaxRayContribution)
+                //|| (data.GetAvgRayContribution() > mTermMaxRayContribution)
                 || (data.mDepth >= mTermMaxDepth)
                 );
 
-        if (1 && localTerminationCriteriaMet)
-        {
-                Debug << "********local termination *********" << endl;
+        if (0 && localTerminationCriteriaMet)
+        {
+                Debug << "local termination criteria met:" << endl;
                 Debug << "rays: " << (int)data.mRays->size() << "  " << mTermMinRays << endl;
                 Debug << "pvs: " << data.mPvs << " " << mTermMinPvs << endl;
@@ -552 +551 @@
                 // || mOutOfMemory
                 || (mVspStats.Leaves() >= mMaxViewCells)
-        //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
+        || (mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
                 );
 
         if (0 && terminationCriteriaMet)
         {
-                Debug << "********* terminationCriteriaMet *********" << endl;
+                Debug << "globlal termination criteria met:" << endl;
                 Debug << "cost misses: " << mGlobalCostMisses << " " << mTermGlobalCostMissTolerance << endl;
                 Debug << "leaves: " << mVspStats.Leaves() << " " <<  mMaxViewCells << endl;
@@ -768 +767 @@
         VspLeaf *leaf = dynamic_cast<VspLeaf *>(tData.mNode);
         
-        ///////////////////////////////////////////////////////////////////
-        //-- the front and back traversal data is filled with the new values
+        ////////////////////////////////////////////////////////
+        //-- the front and back traversal data are filled with the new values
 
         frontData.mDepth = tData.mDepth + 1;
@@ -807 +806 @@
         // two more leaves
         mVspStats.nodes += 2;
-
+        /// and a new split
+        ++ mVspStats.splits[splitPlane.mAxis];
 
     ///////////////////////////////////////////