Index: GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh
===================================================================
--- GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh	(revision 2309)
+++ GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh	(revision 2350)
@@ -7,19 +7,20 @@
 TARGET=release
 
-PROGRAM=../bin/$TARGET/Preprocessor.exe
+PROGRAM=../bin/$TARGET/Preprocessor2.exe
+#PROGRAM=../bin/$TARGET/Preprocessor_old.exe
+#PROGRAM=../bin/$TARGET/Preprocessor_itl.exe
 
 EXT=obj
-#SCENE=vienna_cropped
-#SCENE_PATH=../data/vienna
+SCENE=vienna_cropped
+SCENE_PATH=../data/vienna
 
 #SCENE=arena-high-lods
 #SCENE_PATH=../data/Arena
 
-SCENE=PompeiiOne
-SCENE_PATH=../data/Pompeii
+SCENE=soda
+SCENE_PATH=../data/soda
 
 ENVIRONMENT=gi_final.env
-
-LOG_PREFIX=../scripts/tests/gi/$SCENE-speed
+LOG_PREFIX=../scripts/tests/gi/$SCENE-test
 
 echo "starting $TARGET mode for $SCENE scene ($PROGRAM)"
@@ -29,9 +30,8 @@
 #######################################################
 
-USE_HEUR=true
- METHOD=int
- echo "$SCENE $METHOD"
+USE_HEUR=false
+METHOD=int-$USE_HEUR
 
-
+echo "$SCENE $METHOD"
 $PROGRAM $ENVIRONMENT \
   -scene_filename=$SCENE_FILENAME \
@@ -40,4 +40,6 @@
   -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
   -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \
+  -view_cells_triangle_weight=1.0 \
+  -view_cells_object_weight=0.0 \
   -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \
   -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \
@@ -46,80 +48,32 @@
   -hierarchy_construction_min_avg_rays_per_object=0 \
   -hierarchy_construction_max_avg_rays_per_object=0 \
-  -bvh_use_sah=false \
+  -bvh_use_sah=true \
   -vsp_use_cost_heuristics=$USE_HEUR
 
 sh movefiles.sh $LOG_PREFIX-$METHOD
 
-#######################################################
 
-USE_HEUR=true
- METHOD=int-2
- echo "$SCENE $METHOD"
-
-
-$PROGRAM $ENVIRONMENT \
-  -scene_filename=$SCENE_FILENAME \
-  -view_cells_sampling_type=object_directional \
-  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
-  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
-  -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \
-  -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_min_avg_rays_per_object=1 \
-  -hierarchy_construction_max_avg_rays_per_object=10 \
-  -bvh_use_sah=false \
-  -vsp_use_cost_heuristics=$USE_HEUR
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
 
 #######################################################
 
 NODES=60000
-#NODES=5000
-USE_HEUR=true
-#USE_HEUR=false
-  
-METHOD=seq-$NODES
-echo "$SCENE $METHOD"
+USE_HEUR=false
+METHOD=seq-$NODES-$USE_HEUR
+ 
+#echo "$SCENE $METHOD"
+# $PROGRAM $ENVIRONMENT \
+ -scene_filename=$SCENE_FILENAME \
+ -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
+ -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
+ -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \
+ -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 \
+ -view_cells_triangle_weight=1.0 \
+ -view_cells_object_weight=50.0 \
+ -vsp_use_cost_heuristics=$USE_HEUR \
+ -bvh_term_max_leaves=$NODES
 
-$PROGRAM $ENVIRONMENT \
-  -scene_filename=$SCENE_FILENAME \
-  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
-  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
-  -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \
-  -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 \
-  -hierarchy_construction_consider_memory=false \
-  -vsp_use_cost_heuristics=$USE_HEUR \
-  -bvh_term_max_leaves=$NODES
+#sh movefiles.sh $LOG_PREFIX-$METHOD
 
-sh movefiles.sh $LOG_PREFIX-$METHOD
-
-
-#######################################################
-
-NODES=10000
-USE_HEUR=true
-#USE_HEUR=false
-  
-METHOD=seq-$NODES
-echo "$SCENE $METHOD"
-
-$PROGRAM $ENVIRONMENT \
-  -scene_filename=$SCENE_FILENAME \
-  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
-  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \
-  -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \
-  -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 \
-  -hierarchy_construction_consider_memory=false \
-  -vsp_use_cost_heuristics=$USE_HEUR \
-  -bvh_term_max_leaves=$NODES
-
-sh movefiles.sh $LOG_PREFIX-$METHOD
Index: GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env
===================================================================
--- GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env	(revision 2255)
+++ GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env	(revision 2350)
@@ -173,14 +173,12 @@
 	}
 
-	#showVisualization true
-	showVisualization false
+	showVisualization true
+	#showVisualization false
 	#evaluateViewCells false
 	evaluateViewCells true
 	
 	Evaluation {
-		samples         100000000
-		samplesForStats 100000000
-		#samples          10000000
-		#samplesForStats  10000000
+		samples         6000000
+		samplesForStats 2000000
 
 		samplesPerPass  500000
@@ -233,4 +231,5 @@
 	Construction {		
 		renderCostDecreaseWeight 0.999
+#		renderCostDecreaseWeight 1.0
 	}
 
@@ -265,5 +264,5 @@
 	Construction {
 
-		samples 6000000
+		samples 100000
 
 		# type 0 = sequential computation, 1 = interleaved, 2 = gradient
@@ -280,5 +279,4 @@
 		# minimal steps of same type: for interleaved, this is only valid for the first few splits
 		minStepsOfSameType 100
-		#maxStepsOfSameType 3000
 		maxStepsOfSameType 900
 
@@ -288,9 +286,8 @@
 	Termination {
 		# maximal number of leaves
-		maxLeaves 300000
-#		maxLeaves 6000
+		maxLeaves 10000
 		# maximal memory in MB
 #		maxMemory 4
-		maxMemory 35
+		maxMemory 25
 		# minimum ratio of global cost decrease
 		minGlobalCostRatio -1
