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

Timestamp:

03/07/07 16:26:58 (17 years ago)

Author:

mattausch

Message:

using mutationsamples for evaluation

File:

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

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

@@ -83 +83 @@
         mViewCellsTree->SetViewCellsManager(this);
         mSamplesStat.Reset();
-}
-
-
-int ViewCellsManager::CastPassSamples2(const int samplesPerPass, 
-                                                                           VssRayContainer &passSamples) const
-{
+        mStats.open("mystats.log");
+}
+
+
+int ViewCellsManager::CastEvaluationSamples(const int samplesPerPass,
+                                                                                        VssRayContainer &passSamples)
+{
+        static int pass = 0;
+        static int totalRays = 0;
+
+        SimpleRayContainer rays;
+        rays.reserve(samplesPerPass);
+        passSamples.reserve(samplesPerPass * 2);
+  
         long startTime = GetTime();
 
-        SimpleRayContainer simpleRays;
-        
-        simpleRays.reserve(samplesPerPass);
-        passSamples.reserve(samplesPerPass * 2); // always creates double rays
-
-        // create one third of each type
-        int castRays = 0;
-
-        mMixtureDistribution->GenerateSamples(mSamplesPerPass, simpleRays);
-
-        cout << "generated " << (int)simpleRays.size() << " samples in " 
-                 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
-
-        startTime = GetTime();
-
-        // shoot simple ray and add it to importance samples
-        mPreprocessor->CastRays(simpleRays, passSamples, true);
-
-    cout << "cast " <<  samplesPerPass << " samples in " 
-                 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        //cout<<"Progress :"<<i/1e6f<<"M rays, "<<(100.0f*i)/mTotalSamples<<"%"<<endl;
+        
+        //rays.clear();
+        //passSamples.clear();
+        
+        mMixtureDistribution->GenerateSamples(samplesPerPass, rays);
+        
+        bool doubleRays = true;
+        bool pruneInvalidRays = true;
+        mPreprocessor->CastRays(rays, passSamples, doubleRays, pruneInvalidRays);
 
         mMixtureDistribution->ComputeContributions(passSamples);
+        mMixtureDistribution->UpdateDistributions(passSamples);
+        
+        Real time = TimeDiff(startTime, GetTime());
+        PrintPvsStatistics(mStats);
+        
+        mStats <<
+                "#Pass\n" << pass ++ <<endl<<
+                "#Time\n" << time <<endl<<
+                "#TotalSamples\n" <<totalRays<<endl;
+
+        float last = 0.0f;
+
+        for (int k=0; k < 6; ++ k) 
+        {
+                float ratio = 0.0f;
+
+                if (k < mMixtureDistribution->mDistributions.size()) 
+                {
+                        ratio = mMixtureDistribution->mDistributions[k]->mRatio-last;
+                        last = mMixtureDistribution->mDistributions[k]->mRatio;
+                }
+
+                mStats <<  "#Distribution"<<k<<endl<< ratio<<endl;
+        }
+        
+
+        totalRays += samplesPerPass;
 
         return (int)passSamples.size();
@@ -173 +198 @@
                 Debug << mStrategies[i] << " ";
         Debug << endl;
-
-        // now decode distribution string
-        char buff[1024];
-        Environment::GetSingleton()->GetStringValue("RssPreprocessor.distributions", buff);
-
-        mMixtureDistribution = new MixtureDistribution(*mPreprocessor);
-        mMixtureDistribution->Construct(buff);
-
 
         // sampling type for view cells construction samples
@@ -301 +318 @@
         Debug << "export pvs for view cells: " << mExportPvs << endl;
         Debug << "use kd pvs " << mUseKdPvs << endl;
+
         Debug << endl;
 }
@@ -805 +823 @@
         mPreprocessor = preprocessor;
         
+        // now decode distribution string
+        char mix[1024];
+        Environment::GetSingleton()->GetStringValue("RssPreprocessor.distributions", mix);
+        Debug << "using mixture distributions: " << mix << endl;
+
+        mMixtureDistribution = new MixtureDistribution(*mPreprocessor);
+        mMixtureDistribution->Construct(mix);
 
         ///////////////////////////////////////////////////////
@@ -6873 +6898 @@
                 Debug << "casting " << samplesPerPass << " samples ... ";
         
-                if (1)
-                {
+                if (0)
                         CastPassSamples(samplesPerPass, evalStrats, evaluationSamples);
-                }
                 else
-                {
                         // use mixed distributions
-                        CastPassSamples2(samplesPerPass, evaluationSamples);
-                }
+                        CastEvaluationSamples(samplesPerPass, evaluationSamples);
 
                 castSamples += samplesPerPass;