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

Timestamp:

11/09/06 19:41:31 (18 years ago)

Author:

bittner

Message:

visibility filter updates

File:

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

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

@@ -366 +366 @@
 
 void
-NormalizeRatios(float ratios[3])
+NormalizeRatios(float ratios[4])
 {
   int i;
   float sumRatios;
-  sumRatios = ratios[0] + ratios[1] + ratios[2];
+  sumRatios = ratios[0] + ratios[1] + ratios[2] + ratios[3];
   if (sumRatios == 0.0f) {
         ratios[0] = ratios[1] = ratios[2] = 1.0f;
-        sumRatios = 3.0f;
-  }
-  
-  for (i=0 ; i < 3; i++)
+        sumRatios = 4.0f;
+  }
+  
+  for (i=0 ; i < 4; i++)
         ratios[i]/=sumRatios;
 
@@ -387 +387 @@
 #endif
   
-  for (; i < 3; i++)
+  for (; i < 4; i++)
         if (ratios[i] < MIN_RATIO)
           ratios[i] = MIN_RATIO;
 
-  sumRatios = ratios[0] + ratios[1] + ratios[2];
-  for (i=0 ; i < 3; i++)
+  sumRatios = ratios[0] + ratios[1] + ratios[2] + ratios[3];
+  for (i=0 ; i < 4; i++)
         ratios[i]/=sumRatios;
   
@@ -432 +432 @@
   int rssPass = 0;
   int rssSamples = 0;
+
+  mDistributions.push_back(SamplingDistribution(SamplingStrategy::RSS_BASED_DISTRIBUTION));
+  mDistributions.push_back(SamplingDistribution(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION));
+  mDistributions.push_back(SamplingDistribution(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION));
+  mDistributions.push_back(SamplingDistribution(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION));
   
   if (mLoadInitialSamples) {
@@ -439 +444 @@
   } else {
         SimpleRayContainer rays;
-
+        
         cout<<"Generating initial rays..."<<endl<<flush;
-
+        
         if (mUseImportanceSampling) {
-          GenerateRays(mInitialSamples/2, SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION, rays);
+          GenerateRays(mInitialSamples/3, SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION, rays);
           //      GenerateRays(mInitialSamples/3, SamplingStrategy::OBJECT_BASED_DISTRIBUTION, rays);
-          GenerateRays(mInitialSamples/2, SamplingStrategy::DIRECTION_BASED_DISTRIBUTION, rays);
+          GenerateRays(mInitialSamples/3, SamplingStrategy::DIRECTION_BASED_DISTRIBUTION, rays);
+          GenerateRays(mInitialSamples/3, SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION, rays);
           //    GenerateRays(mInitialSamples/4, OBJECT_DIRECTION_BASED_DISTRIBUTION, rays);
+          
+
         } else {
-                int rayType = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
+          int rayType = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
           if (mObjectBasedSampling)
                 rayType = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
@@ -578 +586 @@
 
 #if USE_RSS_TREE        
-          static float ratios[] = {0.9f,0.05f,0.05f};
+          static float ratios[] = {0.9f,0.05f,0.05f,0.05f};
 #else
-          static float ratios[] = {0.0f,0.05f,0.05f};
+          static float ratios[] = {0.0f,0.05f,0.05f,0.05f};
 #endif
           NormalizeRatios(ratios);
                   
-          cout<<"New ratios: "<<ratios[0]<<" "<<ratios[1]<<" "<<ratios[2]<<endl;
+          cout<<"New ratios: "<<ratios[0]<<" "<<ratios[1]<<" "<<ratios[2]<<" "<<ratios[3]<<endl;
 
           //float ratios[] = {1.0f,0.0f,0.0f};
           
-          int nrays[3];
-          float contributions[3];
-          float times[3];
+          int nrays[4];
+          float contributions[4];
+          float times[4];
           
           long t1;
@@ -660 +668 @@
           }
           
+          if (ratios[3]!=0.0f) {
+                t1 = GetTime();
+                GenerateRays(int(mRssSamplesPerPass*ratios[3]),
+                                         SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION, rays);
+                CastRays(rays, tmpVssRays, true);
+                castRays += (int)rays.size();
+#if ADD_RAYS_IN_PLACE 
+                contributions[3] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
+#else
+                contributions[3] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
+#endif
+                times[3] = TimeDiff(t1, GetTime());
+                nrays[3] = (int)rays.size();
+                
+                mStats<<"#DirectionalRelContrib"<<endl<<contributions[3]/nrays[3]<<endl;
+                
+                vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
+                
+                rays.clear();
+                tmpVssRays.clear();
+          }
+
           
           // now evaluate the ratios for the next pass
@@ -668 +698 @@
           ratios[1] = sqr(contributions[1]/(TIME_WEIGHT*times[1] + (1 - TIME_WEIGHT)*nrays[1]));
           ratios[2] = sqr(contributions[2]/(TIME_WEIGHT*times[2] + (1 - TIME_WEIGHT)*nrays[2]));
+          ratios[3] = sqr(contributions[3]/(TIME_WEIGHT*times[3] + (1 - TIME_WEIGHT)*nrays[3]));
 #else
           ratios[0] = contributions[0]/(TIME_WEIGHT*times[0] + (1 - TIME_WEIGHT)*nrays[0]);
           ratios[1] = contributions[1]/(TIME_WEIGHT*times[1] + (1 - TIME_WEIGHT)*nrays[1]);
           ratios[2] = contributions[2]/(TIME_WEIGHT*times[2] + (1 - TIME_WEIGHT)*nrays[2]);
+          ratios[3] = contributions[3]/(TIME_WEIGHT*times[3] + (1 - TIME_WEIGHT)*nrays[3]);
+          
 #endif