Changeset 1023 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

06/19/06 18:41:08 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (5 diffs)
• VspBspTree.cpp (modified) (1 diff)
• VspOspTree.cpp (modified) (8 diffs)
• VspOspTree.h (modified) (2 diffs)

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

@@ -1541 +1541 @@
         RegisterOption("BspTree.Construction.epsilon",
                 optFloat,
-                "bsp_construction_side_tolerance=",
+                "bsp_construction_epsilon=",
                 "0.002");
 
@@ -1859 +1859 @@
 
 /************************************************************************************/
-/*               View space partition BSP tree related options                      */
+/*                      Rss preprocessor related options                            */
 /************************************************************************************/
 
@@ -1875 +1875 @@
 
 /************************************************************************************/
-/*               View space partition BSP tree related options                      */
+/*                 View space partition BSP tree related options                    */
 /************************************************************************************/
 
@@ -2004 +2004 @@
         RegisterOption("VspBspTree.Construction.epsilon",
                                         optFloat,
-                                        "vsp_bsp_construction_side_tolerance=",
+                                        "vsp_bsp_construction_epsilon=",
                                         "0.002");
 
@@ -2087 +2087 @@
                 "8.0");
 
+
+
+/************************************************************************************/
+/*                 View space partition tree related options                        */
+/************************************************************************************/
+
         
+        RegisterOption("VspTree.Termination.maxDepth",
+                                        optInt,
+                                        "vsp_term_max_depth=",
+                                        "100");
+
+        RegisterOption("VspTree.Termination.minRays",
+                                        optInt,
+                                        "vsp_term_min_rays=",
+                                        "-1");
+
+
+        RegisterOption("VspTree.Termination.minPvs",
+                                        optInt,
+                                        "vsp_term_min_pvs=",
+                                        "20");
+
+        RegisterOption("VspTree.Termination.minProbability",
+                                        optFloat,
+                                        "vsp_term_min_probability=",
+                                        "0.001");
+
         
+        RegisterOption("VspTree.Termination.maxRayContribution",
+                        optFloat,
+                        "vsp_term_ray_contribution=",
+                        "0.9");
+        
+        RegisterOption("VspTree.Termination.maxCostRatio",
+                optFloat,
+                "vsp_term_max_cost_ratio=",
+                "1.5");
+        
+        RegisterOption("VspTree.Termination.maxViewCells",
+                optInt,
+                "vsp_term_max_view_cells=",
+                "10000");
+
+        
+        RegisterOption("VspTree.Termination.missTolerance",
+                optInt,
+                "vsp_term_miss_tolerance=",
+                "4");
+
+        RegisterOption("VspTree.Termination.minGlobalCostRatio",
+                                        optFloat,
+                                        "vsp_term_min_global_cost_ratio=",
+                                        "0.0001");
+
+        RegisterOption("VspTree.useSplitCostQueue",
+                optBool,
+                "vsp_use_split_cost_queue=",
+                "true");
+
+        RegisterOption("VspTree.Termination.globalCostMissTolerance",
+                                        optInt,
+                                        "vsp_term_global_cost_miss_tolerance=",
+                                        "4");
+
+        RegisterOption("VspTree.Termination.ct_div_ci",
+                                        optFloat,
+                                        "vsp_term_ct_div_ci=",
+                                        "0.0");
+
+        RegisterOption("VspTree.Construction.epsilon",
+                                        optFloat,
+                                        "vsp_construction_epsilon=",
+                                        "0.002");
+
+        RegisterOption("VspTree.splitUseOnlyDrivingAxis", 
+                                        optBool, 
+                                        "vsp_split_only_driving_axis=", 
+                                        "false");
+
+        RegisterOption("VspTree.maxStaticMemory", 
+                optFloat, 
+                "vsp_max_static_mem=", 
+                "8.0");
+
+        RegisterOption("VspTree.useCostHeuristics",
+                optBool,
+                "vsp_use_cost_heuristics=",
+                "false");
+
+        RegisterOption("VspTree.simulateOctree", 
+                optBool, 
+                "vsp_simulate_octree=", 
+                "false");
+
+        RegisterOption("VspTree.Construction.randomize", 
+                optBool, 
+                "vsp_construction_randomize=", 
+                "false");
+
+        RegisterOption("VspTree.subdivisionStats",
+                                        optString,
+                                        "vsp_subdivision_stats=",
+                                        "vspSubdivisionStats.log");
+
+        RegisterOption("VspTree.Construction.minBand",
+                                        optFloat,
+                                        "vsp_construction_min_band=",
+                                        "0.1");
+
+        RegisterOption("VspTree.Construction.maxBand",
+                                        optFloat,
+                                        "vsp_construction_min_band=",
+                                        "0.9");
 
         //////////////////////////////////////////////////////////////////////////////////

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

@@ -79 +79 @@
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.maxRayContribution", mTermMaxRayContribution);
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.minAccRayLenght", mTermMinAccRayLength);
-        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.maxCostRatio", mTermMaxCostRatio);
+        
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.maxViewCells", mMaxViewCells);

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

@@ -333 +333 @@
 mOutOfBoundsCell(NULL),
 mStoreRays(false),
-mUseRandomAxis(false),
 mTimeStamp(1)
 {
@@ -347 +346 @@
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.minProbability", mTermMinProbability);
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxRayContribution", mTermMaxRayContribution);
-        Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxCostRatio", mTermMaxCostRatio);
+        
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxViewCells", mMaxViewCells);
@@ -373 +372 @@
         Environment::GetSingleton()->GetBoolValue("VspTree.useCostHeuristics", mUseCostHeuristics);
         Environment::GetSingleton()->GetBoolValue("VspTree.simulateOctree", mCirculatingAxis);
-        Environment::GetSingleton()->GetBoolValue("VspTree.useRandomAxis", mUseRandomAxis);
-        Environment::GetSingleton()->GetIntValue("VspTree.nodePriorityQueueType", mNodePriorityQueueType);
-        
+        
+
         char subdivisionStatsLog[100];
         Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
@@ -403 +401 @@
         Debug << "use cost heuristics: " << mUseCostHeuristics << endl;
         Debug << "subdivision stats log: " << subdivisionStatsLog << endl;
-        Debug << "use random axis: " << mUseRandomAxis << endl;
-        Debug << "priority queue type: " << mNodePriorityQueueType << endl;
+        
         Debug << "circulating axis: " << mCirculatingAxis << endl;
         Debug << "minband: " << mMinBand << endl;
@@ -1025 +1022 @@
         // if we use some kind of specialised fixed axis
     const bool useSpecialAxis = 
-                mOnlyDrivingAxis || mUseRandomAxis || mCirculatingAxis;
-
-        if (mUseRandomAxis)
-                sAxis = Random(3);
-        else if (mCirculatingAxis)
+                mOnlyDrivingAxis || mCirculatingAxis;
+
+        if (mCirculatingAxis)
                 sAxis = (tData.mAxis + 1) % 3;
         else if (mOnlyDrivingAxis)
@@ -2331 +2326 @@
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.minProbability", mTermMinProbability);
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxRayContribution", mTermMaxRayContribution);
-        Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxCostRatio", mTermMaxCostRatio);
+        
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxViewCells", mMaxViewCells);
@@ -2357 +2352 @@
         Environment::GetSingleton()->GetBoolValue("VspTree.useCostHeuristics", mUseCostHeuristics);
         Environment::GetSingleton()->GetBoolValue("VspTree.simulateOctree", mCirculatingAxis);
-        Environment::GetSingleton()->GetBoolValue("VspTree.useRandomAxis", mUseRandomAxis);
-        Environment::GetSingleton()->GetIntValue("VspTree.nodePriorityQueueType", mNodePriorityQueueType);
-        
+
+
         char subdivisionStatsLog[100];
         Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
@@ -2387 +2381 @@
         Debug << "use cost heuristics: " << mUseCostHeuristics << endl;
         Debug << "subdivision stats log: " << subdivisionStatsLog << endl;
-        Debug << "use random axis: " << mUseRandomAxis << endl;
-        Debug << "priority queue type: " << mNodePriorityQueueType << endl;
+        
         Debug << "circulating axis: " << mCirculatingAxis << endl;
         Debug << "minband: " << mMinBand << endl;

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

@@ -1049 +1049 @@
         float mEpsilon;
 
-        /// if we should use breath first priority for the splits
-        int mNodePriorityQueueType;
-
-        // priority queue strategy
-        enum {BREATH_FIRST, DEPTH_FIRST, COST_BASED};
-
 
         /// subdivision stats output file
@@ -1581 +1575 @@
         float mEpsilon;
 
-        /// if we should use breath first priority for the splits
-        int mNodePriorityQueueType;
-
 
         /// subdivision stats output file