Index: GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.sh
===================================================================
--- GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.sh	(revision 1680)
+++ GTP/trunk/Lib/Vis/Preprocessing/scripts/vsposp_typical.sh	(revision 1687)
@@ -6,7 +6,5 @@
 #TARGET=debug
 TARGET=release
-
 PROGRAM=../bin/$TARGET/Preprocessor.exe
-
 echo "starting $TARGET mode"
 
@@ -29,6 +27,6 @@
 
 
- METHOD=interleaved_full
- echo "$SCENE $METHOD"
+# METHOD=interleaved
+# echo "$SCENE $METHOD"
 
 # $PROGRAM $ENVIRONMENT \
@@ -41,10 +39,10 @@
 # -hierarchy_construction_recompute_split_on_repair=true
 
-sh movefiles.sh $LOG_PREFIX-$METHOD
+#sh movefiles.sh $LOG_PREFIX-$METHOD
 
 ###########################################################################
 
- METHOD=interleaved
- echo "$SCENE $METHOD"
+# METHOD=interleaved-norepair
+# echo "$SCENE $METHOD"
 
 # $PROGRAM $ENVIRONMENT \
@@ -57,9 +55,8 @@
 # -hierarchy_construction_recompute_split_on_repair=false
 
-sh movefiles.sh $LOG_PREFIX-$METHOD
+#sh movefiles.sh $LOG_PREFIX-$METHOD
 
 ##################################################################################
-MEMCONST=1.0
- METHOD=gradient-mem2-$MEMCONST
+ METHOD=gradient
  echo "$SCENE $METHOD"
 
@@ -75,5 +72,4 @@
  -vsp_construction_render_cost_decrease_weight=0.99 \
   -hierarchy_construction_multilevel=false \
-  -hierarchy_term_memory_const=$MEMCONST \
   -hierarchy_construction_recompute_split_on_repair=true
 
@@ -81,50 +77,6 @@
 
 
-##################################################################################
-MEMCONST=0.5
- METHOD=gradient-mem2-$MEMCONST
- 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_consider_memory2=true \
- -bvh_construction_render_cost_decrease_weight=0.99 \
- -vsp_construction_render_cost_decrease_weight=0.99 \
-  -hierarchy_construction_multilevel=false \
-  -hierarchy_term_memory_const=$MEMCONST \
-  -hierarchy_construction_recompute_split_on_repair=true
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-##################################################################################
-MEMCONST=0.2
- METHOD=gradient-mem2-$MEMCONST
- 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_consider_memory2=true \
- -bvh_construction_render_cost_decrease_weight=0.99 \
- -vsp_construction_render_cost_decrease_weight=0.99 \
-  -hierarchy_construction_multilevel=false \
-  -hierarchy_term_memory_const=$MEMCONST \
-  -hierarchy_construction_recompute_split_on_repair=true
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-
 ############################################################################
-NODES=10000
+NODES=1000
 
   METHOD=sequential-$NODES
@@ -144,5 +96,5 @@
 ############################################################################
 
-NODES=70000
+NODES=10000
 
   METHOD=sequential-$NODES
@@ -157,111 +109,4 @@
   -hierarchy_construction_type=0 \
   -bvh_term_max_leaves=$NODES
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-############################################################################
-
-NODES=30000
-
-  METHOD=sequential-$NODES
-  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=0 \
-  -bvh_term_max_leaves=$NODES
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-############################################################################
-
-NODES=100000
-
-  METHOD=sequential-$NODES
-  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=0 \
-   -bvh_term_max_leaves=$NODES
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-##################################################################################
-MEMCONST=1.0
- METHOD=gradient-multi-$MEMCONST
- 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_consider_memory2=true \
- -bvh_construction_render_cost_decrease_weight=0.99 \
- -vsp_construction_render_cost_decrease_weight=0.99 \
-  -hierarchy_construction_multilevel=true \
- -hierarchy_construction_levels=4 \
-  -hierarchy_term_memory_const=$MEMCONST \
-  -hierarchy_construction_recompute_split_on_repair=true
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-###############################################################
-MEMCONST=1.0
- METHOD=gradient-$MEMCONST
- 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_multilevel=false \
- -hierarchy_construction_levels=4 \
- -hierarchy_construction_consider_memory=true \
- -hierarchy_term_memory_const=$MEMCONST \
- -bvh_construction_render_cost_decrease_weight=0.99 \
- -vsp_construction_render_cost_decrease_weight=0.99 \
- -hierarchy_construction_recompute_split_on_repair=true
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-#########################################################################
-
-MEMCONST=0.1
- METHOD=gradient-$MEMCONST
- 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_multilevel=false \
- -hierarchy_construction_levels=4 \
- -hierarchy_construction_consider_memory=true \
- -hierarchy_term_memory_const=$MEMCONST \
- -bvh_construction_render_cost_decrease_weight=0.99 \
- -vsp_construction_render_cost_decrease_weight=0.99 \
- -hierarchy_construction_recompute_split_on_repair=true
 
 sh movefiles.sh $LOG_PREFIX-$METHOD
@@ -286,23 +131,3 @@
 sh movefiles.sh $LOG_PREFIX-$METHOD
 
-##########################################################
- METHOD=gradient-500
- 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_consider_memory=false \
-  -hierarchy_construction_min_steps_same_type=500 \
-  -hierarchy_construction_multilevel=false \
-  -hierarchy_construction_recompute_split_on_repair=true
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-############################################################################
-
