Changeset 736

Timestamp:

04/08/06 23:35:12 (18 years ago)

Author:

mattausch

Message:

completed histogram

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreSolidBoundingBox.cpp (modified) (1 diff)
• Preprocessing/data/artificial (added)
• Preprocessing/data/artificial/cube_test.x3d (added)
• Preprocessing/scripts/default.env (modified) (1 diff)
• Preprocessing/scripts/egsr_test_script (modified) (3 diffs)
• Preprocessing/src/Environment.cpp (modified) (1 diff)
• Preprocessing/src/ViewCell.cpp (modified) (1 diff)
• Preprocessing/src/ViewCell.h (modified) (2 diffs)
• Preprocessing/src/ViewCellsManager.cpp (modified) (12 diffs)
• shared/EvalStats/EvalStats.cpp (modified) (8 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -332 +332 @@
                 InitVisibilityCulling(mCameraInProgress);
 
-                std::stringstream d; d << "here34\n";
-                LogManager::getSingleton().logMessage(d.str());
-
+        
                 /** 
                 * the hierarchical culling algorithm

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreSolidBoundingBox.cpp

@@ -158 +158 @@
 Real SolidBoundingBox::getSquaredViewDepth(const Camera* cam) const
 {
-        Ogre::LogManager::getSingleton().logMessage("here3");
         const Vector3 &min = mBox.getMinimum();
         const Vector3 &max = mBox.getMaximum();

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -378 +378 @@
         useRandomAxis false
         usePolygonSplitIfAvailable false
-        useBreathFirstSplits false
+        nodePriorityQueueType 0
 
         Visualization {

GTP/trunk/Lib/Vis/Preprocessing/scripts/egsr_test_script

@@ -117 +117 @@
 -vsp_bsp_use_cost_heuristics=false \
 -vsp_bsp_max_poly_candidates=0 \
--vsp_bsp_breath_first_splits=true \
+-vsp_bsp_node_queue_type=0 \
 -vsp_bsp_term_min_pvs=50 \
 -view_cells_construction_samples=0 \
@@ -153 +153 @@
 -vsp_bsp_max_poly_candidates=0 \
 -vsp_bsp_use_split_cost_queue=false \
--vsp_bsp_breath_first_splits=true \
+-vsp_bsp_node_queue_type=0 \
 -view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d
 
@@ -181 +181 @@
 -vsp_bsp_use_cost_heuristics=false \
 -vsp_bsp_max_poly_candidates=0 \
--vsp_bsp_breath_first_splits=true \
+-vsp_bsp_node_queue_type=0 \
 -view_cells_construction_samples=0 \
 -vsp_bsp_simulate_octree=true \

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

@@ -1234 +1234 @@
                                         "5");
 
-
         RegisterOption("ViewCells.renderCostEvaluationType",
                                         optString,

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

@@ -401 +401 @@
 
 
-int ViewCellsTree::GetSize(ViewCell *vc) const
+int ViewCellsTree::GetNumInitialViewCells(ViewCell *vc) const
 {
         int vcSize = 0;

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

@@ -270 +270 @@
         ViewCellLeaf<T>(): mLeaf(NULL) { SetActive(); }
         ViewCellLeaf<T>(Mesh *mesh):
-                ViewCell(mesh), mLeaf(NULL) { SetActive(); }
-
+        ViewCell(mesh), mLeaf(NULL) { SetActive(); }
         
 
@@ -299 +298 @@
         /** Returns number of leaves this view cell consists of.
         */
-        int GetSize(ViewCell *vc) const;
+        int GetNumInitialViewCells(ViewCell *vc) const;
 
         /** Collects leaves corresponding to a view cell.

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

@@ -552 +552 @@
         maxRenderCost = viewCells.back()->GetRenderCost();
 
+        Debug << "histogram minrc: " << minRenderCost << " maxrc: " << maxRenderCost << endl;
+
         const int intervals = min(10000, (int)viewCells.size());
 
@@ -561 +563 @@
         const float totalRenderCost = mViewCellsTree->GetRoot()->GetRenderCost();
         const float totalVol = GetViewSpaceBox().GetVolume();
-
-        float vol = 0;
-        int smallerCost = 0;
+        //const float totalVol = mViewCellsTree->GetRoot()->GetVolume();
+
+        //float vol = 0;
+        //int smallerCost = 0;
+        int j = 0;
         int i = 0;
-        int j = 0;
-
         
         ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();             
@@ -574 +576 @@
     while (1)
         {
+                float vol = 0;
+                int smallerCost = 0;
+
                 while ((i < (int)viewCells.size()) && (viewCells[i]->GetRenderCost() < currentRenderCost))
                 {
@@ -580 +585 @@
                         ++ smallerCost;
                 }
-
-                if ((i >= (int)viewCells.size()) || (currentRenderCost >= maxRenderCost))
+                
+                if (i < (int)viewCells.size())
+                        Debug << "new rc increase: " << viewCells[i]->GetRenderCost() / totalVol << " " << currentRenderCost / totalVol << endl;
+
+                if ((smallerCost >= (int)viewCells.size()) || (currentRenderCost >= maxRenderCost))
                         break;
-
+                
                 float rcRatio = currentRenderCost / maxRenderCost;
                 float volRatio = vol / totalVol;
 
-                outstream << "#Pass\n" << j ++ << endl;
-                outstream << "#RenderCost\n" << rcRatio << endl;
-                //fprintf(outstream, "#RenderCost\n%3.3f", rcRatio);
-                outstream << "#ViewCells\n" << i << endl;               
+                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;
 
                 // increase current render cost
                 currentRenderCost += stepSize;
+                ++ j;
         }
 
@@ -617 +626 @@
         minPvsSize = viewCells.front()->GetPvs().GetSize();
         maxPvsSize = viewCells.back()->GetPvs().GetSize();
+        
+        Debug << "histogram minpvssize: " << minPvsSize << " maxpvssize: " << maxPvsSize << endl;
 
         const int intervals = min(10000, (int)viewCells.size());
@@ -629 +640 @@
         int currentPvsSize = minPvsSize;//(int)ceil(minRenderCost);
 
-        float vol = 0;
-        int smallerCost = 0;
-
+        //float vol = 0;
         int i = 0;
         int j = 0;
 
-        
         ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();             
         
-        // note can skip computations for view cells already evaluated and delete them from vector ...
-    while (1)
-        {
+        while (1)
+        {
+                float vol = 0;
+                int smaller = 0;
+
                 while ((i < (int)viewCells.size()) && (viewCells[i]->GetPvs().GetSize() < currentPvsSize))
                 {
                         vol += viewCells[i]->GetVolume();
                         ++ i;
-                        ++ smallerCost;
-                }
+                        ++ smaller;
+                }
+                
+                if (i < (int)viewCells.size())
+                        Debug << "new pvs size increase: " << viewCells[i]->GetPvs().GetSize() << " " << currentPvsSize << endl;
 
                 if ((i >= (int)viewCells.size()) || (currentPvsSize >= maxPvsSize))
@@ -655 +668 @@
                 outstream << "#Pass\n" << j ++ << endl;
                 outstream << "#Pvs\n" << currentPvsSize << endl;
-                //fprintf(outstream, "#RenderCost\n%3.3f", rcRatio);
-                outstream << "#ViewCells\n" << i << endl;               
+                outstream << "#ViewCells\n" << smaller << endl;         
                 outstream << "#Volume\n" << volRatio << endl << endl;
 
@@ -756 +768 @@
         environment->GetIntValue("ViewCells.Evaluation.histoPasses", histoPasses);
 
+        int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
+
+        Debug << "number of leaves: " << numLeaves << endl;
+        cout << "number of leaves: " << numLeaves << endl;
+
         if (useHisto)
         {
@@ -763 +780 @@
                 for (int passes = 1; passes <= histoPasses; ++ passes)
                 {
-                        int n = (int)mViewCells.size() * passes / histoPasses;
+                        int n = numLeaves * passes / histoPasses;
                 
                         cout << "computing histogram for " << n << " view cells" << endl;
@@ -2292 +2309 @@
         case 2: // merges
                 {
-            int lSize = mViewCellsTree->GetSize(vc);
+            int lSize = mViewCellsTree->GetNumInitialViewCells(vc);
                         importance = (float)lSize / (float)mCurrentViewCellsStats.maxLeaves;
                 }
@@ -3218 +3235 @@
         case 2: // merged leaves
                 {
-                int lSize = mViewCellsTree->GetSize(vc);
+                int lSize = mViewCellsTree->GetNumInitialViewCells(vc);
                         importance = (float)lSize /
                                 (float)mCurrentViewCellsStats.maxLeaves;
@@ -4146 +4163 @@
         case 2: // merges
                 {
-            int lSize = mViewCellsTree->GetSize(vc);
+            int lSize = mViewCellsTree->GetNumInitialViewCells(vc);
                         importance = (float)lSize / (float)mCurrentViewCellsStats.maxLeaves;
                 }

GTP/trunk/Lib/Vis/shared/EvalStats/EvalStats.cpp

@@ -110 +110 @@
 }
 
+
 void EvalNumViewCells(ofstream &outstream,
                                           const StatsContainer &firstStats, 
-                                          const StatsContainer &currentStats,
-                                          vector<float> &ratios)
+                                          const StatsContainer &currentStats)
+                //                        vector<float> &ratios)
 {
         //const int n = min((int)firstStats.size(), (int)currentStats.size());
@@ -126 +127 @@
         // compare render cost of current view cell with render cost 
         // of other view cells.
-        for (it = currentStats.begin(); it != it_end; ++ it)
+        for (it = currentStats.begin(); it != it_end; ++ it, ++ i)
         {
                 int j = 0;
@@ -141 +142 @@
                 float ratio = (float)i / (float)j;
 
-                outstream << "#RenderCost " << renderCost << endl;
-                outstream << "#ViewCellsRatio " << ratio << endl;
-
+                outstream << "#Pass\n" << i << endl;
+                outstream << "#RenderCost\n" << renderCost << endl;
+                outstream << "#ViewCellsRatio\n" << ratio << endl << endl;      
+
+                //cout << "#Pass " << i ++ << endl;
+                //cout << "#RenderCost " << renderCost << endl;
+                //cout << "#ViewCellsRatio " << ratio << endl;  
         }
 }
@@ -159 +164 @@
 
         vector<string> outFilenames;
+        vector<string> outFilenames2;
 
         // read input files from command line
@@ -182 +188 @@
                         //sscanf(argv[i], "%s.log", fn);
                         string outFilename = string(fn) + string("-ratio.log");
+                        string outFilename2 = string(fn) + string("-reverse.log");
 
                         outFilenames.push_back(outFilename);
+                        outFilenames2.push_back(outFilename2);
+                        cout << "new filen: " << outFilename2 << endl;
                 }
                 else
@@ -193 +202 @@
         //statsOut << "rc1 size: " << (int)renderCosts1.size() << " " << (int)renderCosts2.size() << endl << endl;
         vector<StatsContainer>::const_iterator it = renderStats.begin(), it_end = renderStats.end();
+
         vector<string>::const_iterator sit, sit_end = outFilenames.end();
+        vector<string>::const_iterator sit2, sit2_end = outFilenames2.end();
 
         sit = outFilenames.begin();
-        
+        sit2 = outFilenames2.begin();
+
         // compare all values with this vector
         StatsContainer &firstStats = renderStats[0];
@@ -204 +216 @@
         //++ sit;
 
-        for (it; it != it_end; ++ it)
+        for (it; it != it_end; ++ it, ++ sit, ++ sit2)
         {
                 cout << "now writing output to file " << *sit << endl;
                 ofstream statsOut;
                 statsOut.open((*sit).c_str());
-
+                ofstream statsOut2;
+                statsOut2.open((*sit2).c_str());
+
+                cout << "opening new file: " << (*sit2).c_str() << endl;
                 // compute size of output vector
                 const int n = min((int)firstStats.size(), (int)(*it).size());
@@ -221 +236 @@
                 cout << "need " << vc << " view cells to reach rendercost of method " << i << " with " << n << " view cells" << endl;
 #endif
+                EvalNumViewCells(statsOut2, firstStats, (*it));
+
                 statsOut.close();
-                
-                ++ sit;
+                statsOut2.close();
         }