Changeset 1876 for GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

Timestamp:

12/08/06 23:46:17 (18 years ago)

Author:

bittner

Message:

halton generator updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp (modified) (6 diffs)

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

@@ -19 +19 @@
 
 
-  const bool pruneRays = false;
-  
-
-
+  const bool pruneInvalidRays = false;
+  
+  
 #define ADD_RAYS_IN_PLACE 1
   
@@ -498 +497 @@
   
   if (1) {
-        mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
-//      //  mDistributions.push_back(new DirectionBasedDistribution(*this));
-//      mDistributions.push_back(new ObjectDirectionBasedDistribution(*this));
-//      //  mDistributions.push_back(new ReverseObjectBasedDistribution(*this));
-//      mDistributions.push_back(new ObjectBasedDistribution(*this));
-//      mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(*this));
+        // mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
+        //  mDistributions.push_back(new DirectionBasedDistribution(*this));
+        mDistributions.push_back(new ObjectDirectionBasedDistribution(*this));
+        //  mDistributions.push_back(new ReverseObjectBasedDistribution(*this));
+        mDistributions.push_back(new ObjectBasedDistribution(*this));
+        mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(*this));
   } else {
         mDistributions.push_back(new GlobalLinesDistribution(*this));
@@ -547 +546 @@
         
         cout<<"Casting initial rays..."<<endl<<flush;
-        CastRays(rays, mVssRays, true, pruneRays);
+        CastRays(rays, mVssRays, true, pruneInvalidRays);
 
         ExportObjectRays(mVssRays, 1546);
@@ -640 +639 @@
   rssPass++;
 
-        //      mDistributions.resize(1);
+  //  mDistributions.resize(1);
 
   mRssTree = new RssTree;
@@ -671 +670 @@
 
   // keep only rss
-  mDistributions.resize(1);
+  //  mDistributions.resize(1);
 
   while (1) {
@@ -703 +702 @@
                   rays.NormalizePdf((float)rays.size());
                   
-                  CastRays(rays, tmpVssRays, true, pruneRays);
+                  CastRays(rays, tmpVssRays, true, pruneInvalidRays);
                   castRays += (int)rays.size();