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

Timestamp:

04/10/06 21:09:43 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -572 +572 @@
         ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();             
 
+        // count for integral
+        float volSum = 0;
+        int smallerCostSum = 0;
         
         // note can skip computations for view cells already evaluated and delete them from vector ...
     while (1)
         {
-                float vol = 0;
-                int smallerCost = 0;
+                // count for histogram value
+                float volDif = 0;
+                int smallerCostDif = 0;
 
                 while ((i < (int)viewCells.size()) && (viewCells[i]->GetRenderCost() < currentRenderCost))
                 {
-                        vol += viewCells[i]->GetVolume();
+                        volSum += viewCells[i]->GetVolume();
+                        volDif += viewCells[i]->GetVolume();
+
                         ++ i;
-                        ++ smallerCost;
+                        ++ smallerCostSum;
+                        ++ smallerCostDif;
                 }
                 
-                if (i < (int)viewCells.size())
-                        Debug << "new rc increase: " << viewCells[i]->GetRenderCost() / totalVol << " " << currentRenderCost / totalVol << endl;
-
-                if ((smallerCost >= (int)viewCells.size()) || (currentRenderCost >= maxRenderCost))
+                if ((i >= (int)viewCells.size()) || (currentRenderCost >= maxRenderCost))
                         break;
                 
-                float rcRatio = currentRenderCost / maxRenderCost;
-                float volRatio = vol / totalVol;
+                const float rcRatio = currentRenderCost / maxRenderCost;
+                const float volRatioSum = volSum / totalVol;
+                const float volRatioDif = volDif / totalVol;
 
                 outstream << "#Pass\n" << j << endl;
                 outstream << "#RenderCostRatio\n" << rcRatio << endl;
                 outstream << "#WeightedCost\n" << currentRenderCost / totalVol << endl;
-                outstream << "#ViewCells\n" << smallerCost << endl;             
-                outstream << "#Volume\n" << volRatio << endl << endl;
+                outstream << "#ViewCellsDif\n" << smallerCostDif << endl;
+                outstream << "#ViewCellsSum\n" << smallerCostSum << endl;       
+                outstream << "#VolumeDif\n" << volRatioDif << endl << endl;
+                outstream << "#VolumeSum\n" << volRatioSum << endl << endl;
 
                 // increase current render cost
@@ -644 +651 @@
         int j = 0;
 
+        float volSum = 0;
+        int smallerSum = 0;
+
         ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();             
         
         while (1)
         {
-                float vol = 0;
-                int smaller = 0;
+                float volDif = 0;
+                int smallerDif = 0;
 
                 while ((i < (int)viewCells.size()) && (viewCells[i]->GetPvs().GetSize() < currentPvsSize))
                 {
-                        vol += viewCells[i]->GetVolume();
+                        volDif += viewCells[i]->GetVolume();
+                        volSum += viewCells[i]->GetVolume();
                         ++ i;
-                        ++ smaller;
+                        ++ smallerDif;
+                        ++ smallerSum;
                 }
                 
-                if (i < (int)viewCells.size())
-                        Debug << "new pvs size increase: " << viewCells[i]->GetPvs().GetSize() << " " << currentPvsSize << endl;
+                //if (i < (int)viewCells.size())
+                //      Debug << "new pvs size increase: " << viewCells[i]->GetPvs().GetSize() << " " << currentPvsSize << endl;
 
                 if ((i >= (int)viewCells.size()) || (currentPvsSize >= maxPvsSize))
                         break;
 
-                float volRatio = vol / totalVol;
+                const float volRatioDif = volDif / totalVol;
+                const float volRatioSum = volSum / totalVol;
 
                 outstream << "#Pass\n" << j ++ << endl;
                 outstream << "#Pvs\n" << currentPvsSize << endl;
-                outstream << "#ViewCells\n" << smaller << endl;         
-                outstream << "#Volume\n" << volRatio << endl << endl;
-
+                outstream << "#ViewCellsDif\n" << smallerDif << endl;
+                outstream << "#ViewCellsSum\n" << smallerSum << endl;   
+                outstream << "#VolumeDif\n" << volRatioDif << endl << endl;
+                outstream << "#VolumeSum\n" << volRatioSum << endl << endl;
 
                 // increase current pvs size
@@ -701 +715 @@
         bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
-        cout << "Evaluating view cell partition" << endl;
+        cout << "collect leaf view cells and reseting pvs ... ";
 
         ViewCellContainer leaves;
         mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
-
+        cout << " ... ";
         bool startFromZero = true;
 
@@ -723 +737 @@
         }
         
-        
+        cout << "finished" << endl;
+
+        cout << "Evaluating view cell partition" << endl;
+
         while (castSamples < numSamples)
         {
@@ -734 +751 @@
                 */
                 //-- construction rays => we use uniform samples for this
+                cout << "casting " << samplesPerPass << " samples " << endl;
                 CastPassSamples(samplesPerPass, samplingType, evaluationSamples);
                 
                 castSamples += samplesPerPass;
 
-                cout << "casting " << (int)evaluationSamples.size() << " samples " << endl;
+                cout << "computing sample contributions of " << (int)evaluationSamples.size() << " samples " << endl;
 
                 ComputeSampleContributions(evaluationSamples, true, false);
@@ -768 +786 @@
         environment->GetIntValue("ViewCells.Evaluation.histoPasses", histoPasses);
 
-        int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
+        const int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
 
         Debug << "number of leaves: " << numLeaves << endl;
@@ -777 +795 @@
                 // evaluate view cells in a histogram           
                 char s[64];
-
+#if 0
                 for (int passes = 1; passes <= histoPasses; ++ passes)
                 {
@@ -800 +818 @@
                         EvalViewCellHistogramForPvsSize(filename, n);
                 }
+#else
+                for (int pass = histoPasses; pass < numLeaves; pass += histoPasses)
+                {
+                        cout << "computing histogram for " << pass << " view cells" << endl;
+
+                        //-- evaluate histogram for render cost
+                        sprintf(s, "-%09d-histo.log", pass);
+                        string filename = string(statsPrefix) + string(s);
+
+                        EvalViewCellHistogram(filename, pass);
+
+                        //////////////////////////////////////////
+            // --evaluate histogram for pvs size
+
+                        cout << "computing pvs histogram for " << pass << " view cells" << endl;
+
+                        sprintf(s, "-%09d-histo-pvs.log", pass);
+                        filename = string(statsPrefix) + string(s);
+
+                        EvalViewCellHistogramForPvsSize(filename, pass);
+                }
+#endif
         }
 
@@ -2013 +2053 @@
                 mColorCode = 0;
                 
-                Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
+                Exporter *exporter = Exporter::GetExporter("merged_view_cells.wrl");
                 
 
@@ -2037 +2077 @@
                 mColorCode = 1;
 
-                Exporter *exporter = Exporter::GetExporter("merged_view_cells_pvs.x3d");
+                Exporter *exporter = Exporter::GetExporter("merged_view_cells_pvs.wrl");
         
                 cout << "exporting view cells after merge (pvs size) ... ";     
@@ -3235 +3275 @@
         case 2: // merged leaves
                 {
-                int lSize = mViewCellsTree->GetNumInitialViewCells(vc);
+                const int lSize = mViewCellsTree->GetNumInitialViewCells(vc);
                         importance = (float)lSize /
                                 (float)mCurrentViewCellsStats.maxLeaves;
@@ -3474 +3514 @@
         {
                 mColorCode = 0;
-                Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
+                Exporter *exporter = Exporter::GetExporter("merged_view_cells.wrl");
                 
                 cout << "exporting view cells after merge ... ";
@@ -3506 +3546 @@
                 mColorCode = 1;
 
-                Exporter *exporter = Exporter::GetExporter("merged_view_cells_pvs.x3d");
+                Exporter *exporter = Exporter::GetExporter("merged_view_cells_pvs.wrl");
         
                 cout << "exporting view cells after merge (pvs size) ... ";     
@@ -4157 +4197 @@
                 {
                         importance = (float)vc->GetPvs().GetSize() /
+#if 1 // hack for result                        
                                 (float)mCurrentViewCellsStats.maxPvs;
-
+#else
+                                463.0f;
+#endif
                 }
                 break;