Changeset 1640 for GTP/trunk/Lib/Vis/Preprocessing/scripts

Timestamp:

10/18/06 18:17:27 (18 years ago)

Author:

mattausch

Message:

worked on vsp osp methodsd

Location:

GTP/trunk/Lib/Vis/Preprocessing/scripts

Files:

• vsposp_typical.env (modified) (4 diffs)
• vsposp_typical.sh (modified) (4 diffs)

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

@@ -184 +184 @@
 VspTree {
         Construction {
-                samples 100000
         }
 
@@ -225 +224 @@
         
         Construction {
-                # type 0 = sequential computation, type 1=interleaved
-                type 2
+
+                samples 100000
+
+                # type 0 = sequential computation, 1 = interleaved, 2 = gradient
+                type 1
+
                 # if the object space should be subdivided first (if false, the view space is subdivided first)
                 startWithObjectSpace true
@@ -233 +236 @@
                 # only for interleaved method
 
-                # only for interleaved method: the minimum depth for object space partition
-                minDepthForOsp 7
-                # the minimum depth for view space partition
-                minDepthForVsp 7
-
                 # if dirty split candidates are reevaluated 
-                repairQueue false
+                repairQueue true
+
+                # recompute split plane when "repairing" a candidate
+                recomputeSplitPlaneOnRepair false
 
                 ###################################################
@@ -249 +250 @@
                 levels 4
 
-                # recompute split plane when "repairing" a candidate
-                recomputeSplitPlaneOnRepair true
+                # minimal steps of same type: for interleaved, this is only valid for the first few splits
+                minStepsOfSameType 200
         }
 

GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.sh

@@ -12 +12 @@
 
 SCENE=vsposp_typical
+#SCENE=vsposp_vienna
 #SCENE=soda5
 #SCENE=cube
@@ -25 +26 @@
 
 
-METHOD=sequential
+METHOD=interleaved_full
 echo "$SCENE $METHOD"
 
@@ -34 +35 @@
 -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \
 -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \
--hierarchy_construction_start_with_osp=true
+-hierarchy_construction_type=1 \
+-hierarchy_construction_recompute_split_on_repair=true
 
 mv debug.log $LOG_PREFIX-$METHOD-debug.log
@@ -40 +42 @@
 mv final_object_partition.wrl $LOG_PREFIX-$METHOD-final_object_partition.wrl
 mv final_view_cells.wrl $LOG_PREFIX-$METHOD-final_view_cells.wrl
+
+
+METHOD=interleaved
+echo "$SCENE $METHOD"
+
+$PROGRAM $ENVIRONMENT \
+-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
+-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
+-vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \
+-bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \
+-hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \
+-hierarchy_construction_type=1 \
+-hierarchy_construction_recompute_split_on_repair=false
+
+mv debug.log $LOG_PREFIX-$METHOD-debug.log
+mv view_cells.wrl $LOG_PREFIX-$METHOD-view_cells.wrl
+mv final_object_partition.wrl $LOG_PREFIX-$METHOD-final_object_partition.wrl
+mv final_view_cells.wrl $LOG_PREFIX-$METHOD-final_view_cells.wrl
+
+
+METHOD=gradient
+echo "$SCENE $METHOD"
+
+$PROGRAM $ENVIRONMENT \
+-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
+-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
+-vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \
+-bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \
+-hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \
+-hierarchy_construction_type=2 \
+-hierarchy_construction_recompute_split_on_repair=true
+
+mv debug.log $LOG_PREFIX-$METHOD-debug.log
+mv view_cells.wrl $LOG_PREFIX-$METHOD-view_cells.wrl
+mv final_object_partition.wrl $LOG_PREFIX-$METHOD-final_object_partition.wrl
+mv final_view_cells.wrl $LOG_PREFIX-$METHOD-final_view_cells.wrl