Changeset 2666

Timestamp:

04/29/08 21:24:30 (16 years ago)

Author:

bittner

Message:

merge on notes

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GvsPreprocessor.cpp (modified) (1 diff)
• SG08/run_test_pixel_rebuttal (modified) (2 diffs)
• SamplingPreprocessor.cpp (modified) (1 diff)

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

@@ -1155 +1155 @@
         {
                 ComputeRenderError();
+                // recompute once more
+                ComputeRenderError();
+
         }
 

GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_pixel_rebuttal

@@ -41 +41 @@
 
 
-#$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=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 \
+# $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 \
@@ -54 +54 @@
 
 
+
 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
 # -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+# -preprocessor_evaluate_filter- \
+# -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4l.xml \
+# -preprocessor_stats=$PREFIX-i-mixed-b1-n4l-nofilter.log \
+# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4f.hlog
+
+# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+# -preprocessor_evaluate_filter+ \
 # -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4l.xml \
 # -preprocessor_stats=$PREFIX-i-mixed-b1-n4l.log \
-# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4l.hlog
-
-
-$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
--preprocessor_evaluate_filter- \
--preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4l.xml \
--preprocessor_stats=$PREFIX-i-mixed-b1-n4l-nofilter.log \
--preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4f.hlog
-
-$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
--preprocessor_evaluate_filter+ \
--preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4l.xml \
--preprocessor_stats=$PREFIX-i-mixed-b1-n4l.log \
--preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4f.hlog
+# -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4f.hlog
 
 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \

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

@@ -67 +67 @@
 SamplingPreprocessor::ComputeVisibility()
 {
-  
   Debug << "type: sampling" << endl;
-  
   cout<<"Sampling Preprocessor started\n"<<flush;
   //  cout<<"Memory/ray "<<sizeof(VssRay)+sizeof(RssTreeNode::RayInfo)<<endl;