Changeset 2044

Timestamp:

01/23/07 19:41:14 (17 years ago)

Author:

bittner

Message:

merge

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• SamplingStrategy.cpp (modified) (3 diffs)
• run_test_arena (modified) (1 diff)

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

@@ -11 +11 @@
 namespace GtpVisibilityPreprocessor {
 
-  
-  extern PerfTimer pvsTimer;
-  extern PerfTimer viewCellCastTimer;
+extern PerfTimer pvsTimer;
+extern PerfTimer viewCellCastTimer;
 
 //HaltonSequence SamplingStrategy::sHalton;
@@ -556 +555 @@
   pvsTimer.Exit();
 #endif
+
   
   UpdateRatios();
 
+#if 1
   cout<<"view cell cast time:"<<viewCellCastTimer.TotalTime()<<" s"<<endl;
   cout<<"pvs time:"<<pvsTimer.TotalTime()<<" s"<<endl;
-        //cout<<"obj time:"<<objTimer.TotalTime()<<" s"<<endl;
-
+  //  cout<<"obj time:"<<objTimer.TotalTime()<<" s"<<endl;
+#endif
 }
 
@@ -663 +664 @@
                                   mDistributions.push_back(new ReverseObjectBasedDistribution(mPreprocessor));
                                 } else
+                                  
                                   if (strcmp(curr, "reverse_viewspace_border")==0) {
                                         mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(mPreprocessor));

GTP/trunk/Lib/Vis/Preprocessing/src/run_test_arena

@@ -18 +18 @@
 # # n - no origin mutation, q=2, reverse samples
 
-# $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 \
-#  -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 -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
 
 #mutation+object_direction+