Changeset 2206 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

03/07/07 18:35:10 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (8 diffs)

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

@@ -107 +107 @@
         mMixtureDistribution->GenerateSamples(samplesPerPass, rays);
         
-        bool doubleRays = true;
-        bool pruneInvalidRays = true;
+        const bool doubleRays = true;
+        const bool pruneInvalidRays = true;
         mPreprocessor->CastRays(rays, passSamples, doubleRays, pruneInvalidRays);
 
@@ -118 +118 @@
         
         mStats <<
-                "#Pass\n" << pass ++ <<endl<<
-                "#Time\n" << time <<endl<<
-                "#TotalSamples\n" <<totalRays<<endl;
+                "#Pass\n" << pass ++ << endl <<
+                "#Time\n" << time << endl <<
+                "#TotalSamples\n" << totalRays << endl;
 
         float last = 0.0f;
@@ -128 +128 @@
                 float ratio = 0.0f;
 
-                if (k < mMixtureDistribution->mDistributions.size()) 
-                {
-                        ratio = mMixtureDistribution->mDistributions[k]->mRatio-last;
+                if (k < (int)mMixtureDistribution->mDistributions.size()) 
+                {
+                        ratio = mMixtureDistribution->mDistributions[k]->mRatio - last;
                         last = mMixtureDistribution->mDistributions[k]->mRatio;
                 }
@@ -925 +925 @@
                 cout << "computing sample contribution for " << (int)constructionSamples.size() << " samples ... ";
 
-                // computes sample contribution of cast rays TODO: leak?
+                // computes sample contribution of cast rays
                 if (SAMPLE_AFTER_SUBDIVISION)
                         ComputeSampleContributions(constructionSamples, true, false);
@@ -2083 +2083 @@
 float
 ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
-                                                                                         const bool addRays,
+                                                                                         const bool addContributions,
                                                                                          const bool storeViewCells,
                                                                                          const bool useHitObjects)
@@ -2104 +2104 @@
                 else 
                 {
-                        sum += ComputeSampleContribution(*(*it), addRays, storeViewCells, useHitObjects);
+                        sum += ComputeSampleContribution(*(*it), addContributions, storeViewCells, useHitObjects);
                 }
         }
@@ -6900 +6900 @@
 
                 long startTime = GetTime();
+                Real timeDiff;
 
                 cout << "casting " << samplesPerPass << " samples ... ";
@@ -6905 +6906 @@
         
                 if (0)
+                {
                         CastPassSamples(samplesPerPass, evalStrats, evaluationSamples);
+
+                        timeDiff = TimeDiff(startTime, GetTime());
+                        cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
+                        Debug << "finished in " << timeDiff * 1e-3f << " secs" << endl;
+                
+                        cout << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
+                        Debug << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
+
+                        startTime = GetTime();
+
+                        ComputeSampleContributions(evaluationSamples, true, false);
+
+                        timeDiff = TimeDiff(startTime, GetTime());
+                        cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                        Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                }
                 else
+                {
                         // use mixed distributions
                         CastEvaluationSamples(samplesPerPass, evaluationSamples);
 
+                        timeDiff = TimeDiff(startTime, GetTime());
+                        cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
+                        Debug << "finished in " << timeDiff * 1e-3f << " secs" << endl;
+                
+                        // don't use sample contributions because already accounted for inside the mixture distribution!
+                }
+
                 castSamples += samplesPerPass;
-
-                Real timeDiff = TimeDiff(startTime, GetTime());
-                
-                cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
-                cout << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
-                
-                Debug << "finished in " << timeDiff * 1e-3f << " secs" << endl;
-                Debug << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
-
-                startTime = GetTime();
-
-                ComputeSampleContributions(evaluationSamples, true, false);
-
-                timeDiff = TimeDiff(startTime, GetTime());
-                cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-                Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
 
                 if ((castSamples >= samplesForStats + oldSamples) ||