Changeset 2076 for GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

Timestamp:

02/02/07 13:25:06 (18 years ago)

Author:

bittner

Message:

merge

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/run_test2 (modified) (5 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -1 @@
-#!/bin/sh
+#!sh
 
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter+ -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=100000000"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=100000000"
 
 
@@ -31 +31 @@
 
 SCENE=../data/vienna/vienna_cropped.obj
-#VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
-VIEWCELLS=../data/vienna/vienna-seq-viewcells-20000.xml.gz
+VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
+#VIEWCELLS=../data/vienna/vienna-seq-viewcells-20000.xml.gz
 
-<<<<<<< .mine
-PREFIX=../work/plots/osp-vienna2-1e5
-=======
+
 # SCENE=../data/Pompeii/PompeiiTen.obj
 # VIEWCELLS=../data/Pompeii/pompeii_big-seq-viewcells.xml.gz
->>>>>>> .r2051
 
-PREFIX=../work/plots/osp-FILTER-1e5
+PREFIX=../work/plots/osp-TEST-1e5
 
 #SCENE=../data/atlanta/atlanta2.x3d
@@ -49 +46 @@
 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
 -rss_distributions=mutation+object_direction+spatial \
--view_cells_filter_width=1.0 \
 -view_cells_use_kd_pvs+ -af_use_kd_pvs- \
 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
@@ -55 +51 @@
 -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog
 
-<<<<<<< .mine
-# $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -preprocessor_visibility_file=$PREFIX-r-reference.xml \
-# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \
-# -preprocessor_histogram_file=$PREFIX-r-reference.hlog
-=======
-$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=mutation+object_direction+spatial \
--view_cells_filter_width=0.0 \
--view_cells_use_kd_pvs+ -af_use_kd_pvs- \
--preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4b.xml \
--preprocessor_stats=$PREFIX-i-mixed-b1-n4b.log \
--preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4b.hlog
->>>>>>> .r2051
+# # $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# # -preprocessor_visibility_file=$PREFIX-r-reference.xml \
+# # -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \
+# # -preprocessor_histogram_file=$PREFIX-r-reference.hlog
 
-$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=mutation+object_direction+spatial \
--view_cells_filter_width=1.0 \
--view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
--preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4c.xml \
--preprocessor_stats=$PREFIX-i-mixed-b1-n4c.log \
--preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4c.hlog
+# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# -rss_distributions=mutation+object_direction+spatial \
+# -view_cells_filter_width=0.0 \
+# -view_cells_use_kd_pvs+ -af_use_kd_pvs- \
+# -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4b.xml \
+# -preprocessor_stats=$PREFIX-i-mixed-b1-n4b.log \
+# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4b.hlog
+
+# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# -rss_distributions=mutation+object_direction+spatial \
+# -view_cells_filter_width=1.0 \
+# -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
+# -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4c.xml \
+# -preprocessor_stats=$PREFIX-i-mixed-b1-n4c.log \
+# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4c.hlog
+
+# # $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# # -preprocessor_visibility_file=$PREFIX-r-reference.xml \
+# # -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \
+# # -preprocessor_histogram_file=$PREFIX-r-reference.hlog
+
+# # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# #  -rss_distributions=direction -view_cells_filter_max_size=1 \
+# #  -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \
+# #  -preprocessor_stats=$PREFIX-r-reference-global.log \
+# #  -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog
+
+
+# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+# -view_cells_use_kd_pvs- -af_use_kd_pvs- \
+# -preprocessor_visibility_file=$PREFIX-i-mixed-bvh-n4k.xml \
+# -preprocessor_stats=$PREFIX-i-mixed-bvh-n4k.log \
+# -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4k.hlog
 
 # $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -preprocessor_visibility_file=$PREFIX-r-reference.xml \
-# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \
-# -preprocessor_histogram_file=$PREFIX-r-reference.hlog
+# -view_cells_use_kd_pvs- -af_use_kd_pvs- \
+# -preprocessor_visibility_file=$PREFIX-r-bvh-reference.xml \
+# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-bvh-reference.log \
+# -preprocessor_histogram_file=$PREFIX-r-bvh-reference.hlog
 
 # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# -view_cells_use_kd_pvs- -af_use_kd_pvs- \
 #  -rss_distributions=direction -view_cells_filter_max_size=1 \
-#  -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \
-#  -preprocessor_stats=$PREFIX-r-reference-global.log \
-#  -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog
-
-
-$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
--view_cells_use_kd_pvs- -af_use_kd_pvs- \
--preprocessor_visibility_file=$PREFIX-i-mixed-bvh-n4k.xml \
--preprocessor_stats=$PREFIX-i-mixed-bvh-n4k.log \
--preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4k.hlog
-
-$COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--view_cells_use_kd_pvs- -af_use_kd_pvs- \
--preprocessor_visibility_file=$PREFIX-r-bvh-reference.xml \
--view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-bvh-reference.log \
--preprocessor_histogram_file=$PREFIX-r-bvh-reference.hlog
-
-$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--view_cells_use_kd_pvs- -af_use_kd_pvs- \
- -rss_distributions=direction -view_cells_filter_max_size=1 \
- -preprocessor_visibility_file=$PREFIX-r-bvh-reference-global.xml \
- -preprocessor_stats=$PREFIX-r-bvh-reference-global.log \
- -preprocessor_histogram_file=$PREFIX-r-bvh-reference-global.hlog
+#  -preprocessor_visibility_file=$PREFIX-r-bvh-reference-global.xml \
+#  -preprocessor_stats=$PREFIX-r-bvh-reference-global.log \
+#  -preprocessor_histogram_file=$PREFIX-r-bvh-reference-global.hlog
 
 
@@ -116 +110 @@
 #############
 #############
-#############
+# #############
 
 
 
-# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-#  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
-#  -view_cells_use_kd_pvs- -af_use_kd_pvs- \
-#  -preprocessor_visibility_file=$PREFIX-i-mixed-bvh-n4i.xml \
-#  -preprocessor_stats=$PREFIX-i-mixed-bvh-n4i.log \
-#  -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4i.hlog
+# # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# #  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+# #  -view_cells_use_kd_pvs- -af_use_kd_pvs- \
+# #  -preprocessor_visibility_file=$PREFIX-i-mixed-bvh-n4i.xml \
+# #  -preprocessor_stats=$PREFIX-i-mixed-bvh-n4i.log \
+# #  -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4i.hlog
 
 
 
-#$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
-# -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4i.xml \
-# -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \
-# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4i.hlog
+# #$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# # -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+# # -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4i.xml \
+# # -preprocessor_stats=$PREFIX-i-mixed-b1-n4i.log \
+# # -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4i.hlog
 
 
-# e - no origin mutation, silh. tm Q=2, reverse samples
-# f - no origin, q=2, no reverse samples
-# g - gaussian origin, q=2, reverse samples
+# # e - no origin mutation, silh. tm Q=2, reverse samples
+# # f - no origin, q=2, no reverse samples
+# # g - gaussian origin, q=2, reverse samples
 
-# g, h contain pvs error estimations...
+# # g, h contain pvs error estimations...
 
-# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -rss_distributions=rss+object_direction+spatial+object+direction -view_cells_filter_max_size=1 \
-# -preprocessor_stats=$PREFIX-i-mixed-b1-n2.log \
-# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n2.hlog
+# # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# # -rss_distributions=rss+object_direction+spatial+object+direction -view_cells_filter_max_size=1 \
+# # -preprocessor_stats=$PREFIX-i-mixed-b1-n2.log \
+# # -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n2.hlog