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

Timestamp:

11/02/06 19:09:30 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -296 +296 @@
         int stype;
         
+        const int numStrategies = 3;
+
         stype = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / 4, sampleType, simpleRays);
+        mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
         
         stype = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / 4, sampleType, simpleRays);
-        
-        stype = SamplingStrategy::DIRECTION_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / 4, sampleType, simpleRays);
+        mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
+        
+        if (0)
+        {
+                stype = SamplingStrategy::DIRECTION_BASED_DISTRIBUTION;
+                mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
+        }
 
         stype = SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION;
-        mPreprocessor->GenerateRays(samplesPerPass / 4, sampleType, simpleRays);
+        mPreprocessor->GenerateRays(samplesPerPass / numStrategies, sampleType, simpleRays);
 
         cout << "generated " << samplesPerPass << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -516 +521 @@
         if (mEvaluateViewCells)
         {
-cout << "here42 ***********" << endl;
                 EvalViewCellPartition();
         }
@@ -794 +798 @@
         mViewCellsTree->CollectBestViewCellSet(viewCells, nViewCells);
 
-        int maxPvs, maxVal, minVal;
+        float maxPvs, maxVal, minVal;
 
         // sort by pvs size
         sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
 
-        maxPvs = mViewCellsTree->GetPvsSize(viewCells.back());
+        maxPvs = mViewCellsTree->GetPvsCost(viewCells.back());
         minVal = 0;
 
@@ -805 +809 @@
         int histoMaxVal;
         Environment::GetSingleton()->GetIntValue("Preprocessor.histogram.maxValue", histoMaxVal);
-        maxVal = max(histoMaxVal, maxPvs);
+        maxVal = max((float)histoMaxVal, maxPvs);
                 
         Debug << "histogram minpvssize: " << minVal << " maxpvssize: " << maxVal 
@@ -814 +818 @@
         const int intervals = min(histoIntervals, (int)viewCells.size());
 
-        const int range = maxVal - minVal;
-        int stepSize = range / intervals;
+        const float range = maxVal - minVal;
+        int stepSize = (int)(range / intervals);
 
         // set step size to avoid endless loop
@@ -825 +829 @@
         const float totalVol = GetViewSpaceBox().GetVolume();
 
-        int currentPvs = minVal;//(int)ceil(minRenderCost);
+        float currentPvs = minVal;
         
         int i = 0;
@@ -840 +844 @@
 
                 while ((i < (int)viewCells.size()) && 
-                           (mViewCellsTree->GetPvsSize(viewCells[i]) < currentPvs))
+                           (mViewCellsTree->GetPvsCost(viewCells[i]) < currentPvs))
                 {
                         volDif += viewCells[i]->GetVolume();
@@ -851 +855 @@
                 
                 if (0 && (i < (int)viewCells.size()))
-                        Debug << "new pvs size increase: " << mViewCellsTree->GetPvsSize(viewCells[i]) 
+                        Debug << "new pvs cost increase: " << mViewCellsTree->GetPvsCost(viewCells[i]) 
                         << " " << currentPvs << endl;
         
@@ -864 +868 @@
                 outstream << "#VolumeSum\n" << volRatioSum << endl << endl;
         
-                //if ((i >= (int)viewCells.size()) || (currentPvs >= maxPvs))   break;
-
                 //-- increase current pvs size to define next interval
                 currentPvs += stepSize;
@@ -1009 +1011 @@
                         ObjectPvs pvs;
 
-                        cout << "updating pvs for contribution ... " << endl;
+                        cout << "updating pvs for evaluation ... " << endl;
 
                         UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
@@ -1499 +1501 @@
                                                                                                 float &deviation,
                                                                                                 float &variance,
-                                                                                                int &totalPvs,
+                                                                                                float &totalCost,
                                                                                                 float &avgRenderCost)
 {
@@ -1506 +1508 @@
 
         totalRenderCost = 0;
-        totalPvs = 0;
+        totalCost = 0;
 
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
@@ -1514 +1516 @@
                 ViewCell *vc = *it;
                 totalRenderCost += vc->GetPvs().EvalPvsCost() * vc->GetVolume();
-                totalPvs += (int)vc->GetPvs().EvalPvsCost();
+                totalCost += (int)vc->GetPvs().EvalPvsCost();
         }
 
@@ -1520 +1522 @@
         totalRenderCost /= mViewSpaceBox.GetVolume();
         expectedRenderCost = totalRenderCost / (float)mViewCells.size();
-        avgRenderCost = totalPvs / (float)mViewCells.size();
+        avgRenderCost = totalCost / (float)mViewCells.size();
 
 
@@ -1744 +1746 @@
 void ViewCellsManager::GetPvsStatistics(PvsStatistics &stat)
 {
-  // update pvs of view cells tree if necessary
-  UpdatePvs();
-  
-  ViewCellContainer::const_iterator it = mViewCells.begin();
-  
-  stat.viewcells = 0;
-  stat.minPvs = 100000000;
-  stat.maxPvs = 0;
-  stat.avgPvs = 0.0f;
-  
-  for (; it != mViewCells.end(); ++ it) 
-        {
-          ViewCell *viewcell = *it;
-
-          //      bool mCountKdPvs = false;
-          const int pvsSize = mViewCellsTree->GetPvsSize(viewcell);
-
-
-          if (pvsSize < stat.minPvs)
-                stat.minPvs = pvsSize;
-          if (pvsSize > stat.maxPvs)
-                stat.maxPvs = pvsSize;
-          
-          stat.avgPvs += pvsSize;
-          
-          ++ stat.viewcells;
-        }
-  
-  if (stat.viewcells)
-        stat.avgPvs/=stat.viewcells;
+        // update pvs of view cells tree if necessary
+        UpdatePvs();
+
+        ViewCellContainer::const_iterator it = mViewCells.begin();
+
+        stat.viewcells = 0;
+        stat.minPvs = 100000000;
+        stat.maxPvs = 0;
+        stat.avgPvs = 0.0f;
+
+        for (; it != mViewCells.end(); ++ it) 
+        {
+                ViewCell *viewcell = *it;
+
+                const float pvsCost = mViewCellsTree->GetPvsCost(viewcell);
+
+                if (pvsCost < stat.minPvs)
+                        stat.minPvs = pvsCost;
+                if (pvsCost > stat.maxPvs)
+                        stat.maxPvs = pvsCost;
+
+                stat.avgPvs += pvsCost;
+
+                ++ stat.viewcells;
+        }
+
+        if (stat.viewcells)
+                stat.avgPvs/=stat.viewcells;
 }
 
@@ -2053 +2053 @@
 float ViewCellsManager::GetRendercost(ViewCell *viewCell) const
 {
-        return (float)mViewCellsTree->GetPvsSize(viewCell);
+        return (float)mViewCellsTree->GetPvsCost(viewCell);
 }
 
@@ -2327 +2327 @@
 
 void ViewCellsManager::UpdateScalarPvsSize(ViewCell *vc, 
-                                                                                   const int pvsSize, 
+                                                                                   const float pvsCost, 
                                                                                    const int entriesInPvs) const
 {
-        vc->mPvsSize = pvsSize;
+        vc->mPvsCost = pvsCost;
         vc->mEntriesInPvs = entriesInPvs;
 
@@ -2525 +2525 @@
                         {
                                 importance = 
-                                        (float)mViewCellsTree->GetPvsSize(vc) / 
+                                        (float)mViewCellsTree->GetPvsCost(vc) / 
                                         (float)mCurrentViewCellsStats.maxPvs;
                         }
@@ -2578 +2578 @@
         if (root->IsLeaf())
         { 
+                //cout << "updating leaf" << endl;
                 // we assume that pvs is explicitly stored in leaves
                 pvs = root->GetPvs();
                 UpdateScalarPvsSize(root, pvs.EvalPvsCost(), pvs.GetSize());
-                
                 return;
         }
-        
+
+        //cout << "recursivly updating pvs" << endl;
+
         ////////////////
         //-- interior node => propagate pvs up the tree
@@ -2597 +2599 @@
         // pvss of child nodes
         vector<ObjectPvs> pvsList;
+        pvsList.resize((int)interior->mChildren.size());
 
         ViewCellContainer::const_iterator vit, vit_end = interior->mChildren.end();
-        pvsList.resize((int)interior->mChildren.size());
+        
         int i = 0;
+
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit, ++ i)
         {
-                //ObjectPvs objPvs;
-                
                 //////////////////
                 //-- recursivly compute child pvss
-
                 UpdatePvsForEvaluation(*vit, pvsList[i]/*objPvs*/);
-
-                // store pvs in vector
-                //pvsList.push_back(objPvs);
         }
 
@@ -3047 +3045 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                cout << "view cell " << idx << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
+                cout << "view cell " << idx << ": pvs cost=" << (int)mViewCellsTree->GetPvsCost(vc) << endl;
 
                 if (exportRays)
@@ -4400 +4398 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                const int pvsSize = (int)mViewCellsTree->GetPvsSize(vc);
-                cout << "view cell " << vc->GetId() << ": pvs size=" << pvsSize << endl;
+                const float pvsCost = mViewCellsTree->GetPvsCost(vc);
+                cout << "view cell " << vc->GetId() << ": pvs cost=" << pvsCost << endl;
 
                 if (exportRays)
@@ -5285 +5283 @@
                 Exporter *exporter = Exporter::GetExporter(s);
                 
-                cout << "view cell " << vc->GetId() << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
+                cout << "view cell " << vc->GetId() << ": pvs cost=" << mViewCellsTree->GetPvsCost(vc) << endl;
 
                 if (exportPvs)
@@ -5661 +5659 @@
 
 
-#if 0
+#if 1
 #if TEST_EVALUATION
 void VspOspViewCellsManager::EvalViewCellPartition()
@@ -5730 +5728 @@
         {
                 ViewCell *vc = *vit;
-                int pvs = vc->GetPvs().EvalPvsCost();
-                float vol = vc->GetVolume();
-                rc += pvs * vol;
+                const float pvsCost = vc->GetPvs().EvalPvsCost();
+                const float vol = vc->GetVolume();
+                rc += pvsCost * vol;
         }
 
@@ -5826 +5824 @@
                 sprintf(str, "-%09d-eval.log", castSamples);
                 string filename = string(statsPrefix) + string(str);
-
-                mHierarchyManager->EvaluateSubdivision(evaluationSamples, mPreprocessor->mObjects, filename);
+                ofstream ofstr(filename.c_str());
+                mHierarchyManager->EvaluateSubdivision2(ofstr);
 
                 timeDiff = TimeDiff(startTime, GetTime());
@@ -5833 +5831 @@
                 Debug << "statistis compted in " << timeDiff * 1e-3 << " secs" << endl;
         
-                //disposeRays(evaluationSamples, NULL);
-        }
-        
-        disposeRays(evaluationSamples, NULL);
-
+                disposeRays(evaluationSamples, NULL);
+        }
 }
 #endif