Changeset 655

Timestamp:

02/19/06 20:22:36 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/default.env (modified) (1 diff)
• src/Environment.cpp (modified) (1 diff)
• src/VspBspTree.cpp (modified) (4 diffs)
• src/VspBspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -333 +333 @@
                 minGlobalCostRatio      0.0000001
                 maxViewCells            40000
-        
+                useSplitCostQueue       true
+
                 # used for pvs criterium
                 ct_div_ci 0.0

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

@@ -1816 +1816 @@
                                         "0.0001");
 
+        RegisterOption("VspBspTree.useSplitCostQueue",
+                optBool,
+                "-vsp_bsp_use_split_cost_queue=",
+                "true");
+
         RegisterOption("VspBspTree.Termination.globalCostMissTolerance",
                                         optInt,

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

@@ -123 +123 @@
 
         environment->GetFloatValue("VspBspTree.Construction.renderCostWeight", mRenderCostWeight);
-
         environment->GetBoolValue("VspBspTree.usePolygonSplitIfAvailable", mUsePolygonSplitIfAvailable);
 
@@ -129 +128 @@
 
         environment->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
+        environment->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
 
 
@@ -399 +399 @@
                   << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl << endl;
 
-        if (0)
+        // use split cost priority queue
+        if (mUseSplitCostQueue)
+        {
                 ConstructWithSplitQueue(polys, rays);
+        }
         else
+        {
                 Construct(polys, rays);
+        }
 
         // clean up polygons
@@ -593 +598 @@
                 float costRatio = splitCandidate.GetCost() / mTotalCost;
 
-                Debug << "cost ratio: " << costRatio << endl;
+                //Debug << "cost ratio: " << costRatio << endl;
 
                 if (costRatio < mTermMinGlobalCostRatio)
-                {Debug << "here1 cost ratio: " << costRatio << " max " << mTermMinGlobalCostRatio << endl;
                         ++ mGlobalCostMisses;
-                }
+                
                 if (0 && !mOutOfMemory)
                 {

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

@@ -715 +715 @@
         int mGlobalCostMisses;
 
+        bool mUseSplitCostQueue;
         //-- termination criteria for axis aligned split