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

Timestamp:

11/20/06 14:02:29 (18 years ago)

Author:

bittner

Message:

merge, preparing sampling strategy support for mixed distributions, filter changes, histogram output for preprocessor

File:

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

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

@@ -34 +34 @@
 // $$JB HACK
 #define USE_KD_PVS 0
-#define KD_PVS_AREA (1e-4f)
+#define KD_PVS_AREA (1e-5f)
 
 
@@ -599 +599 @@
 
         ViewCellContainer viewCells;
+        // $$ JB hack - the collect best viewcells does not work?
+#if 1
         mViewCellsTree->CollectBestViewCellSet(viewCells, nViewCells);
+#else
+        viewCells = mViewCells;
+#endif
 
         float maxRenderCost, minRenderCost;
@@ -823 +828 @@
 
         ViewCellContainer viewCells;
+        
+        // $$ JB hack - the collect best viewcells does not work?
+#if 0
         mViewCellsTree->CollectBestViewCellSet(viewCells, nViewCells);
+#else
+        viewCells = mViewCells;
+#endif
+        ViewCellContainer::iterator it = viewCells.begin(), it_end = viewCells.end();           
+        for (; it != it_end; ++it) {
+          //(*it)->UpdatePvsCost();
+          (*it)->SetPvsCost((*it)->GetFilteredPvsSize());
+        }
+        
 
         float maxPvs, maxVal, minVal;
-
+        
         // sort by pvs size
         sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
 
-        maxPvs = mViewCellsTree->GetPvsCost(viewCells.back());
+        maxPvs = viewCells.back()->GetPvsCost();
         minVal = 0;
 
@@ -863 +880 @@
         int smallerSum = 0;
 
-        ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();             
+        it = viewCells.begin();
         
         for (int j = 0; j < intervals; ++ j)
@@ -871 +888 @@
 
                 while ((i < (int)viewCells.size()) && 
-                           (mViewCellsTree->GetPvsCost(viewCells[i]) < currentPvs))
+                           (viewCells[i]->GetPvsCost() < currentPvs))
                 {
                         volDif += viewCells[i]->GetVolume();
@@ -881 +898 @@
                 }
                 
-                if (0 && (i < (int)viewCells.size()))
-                        Debug << "new pvs cost increase: " << mViewCellsTree->GetPvsCost(viewCells[i]) 
-                        << " " << currentPvs << endl;
-        
+                //              if (0 && (i < (int)viewCells.size()))
+                //                Debug << "new pvs cost increase: " << mViewCellsTree->GetPvsCost(viewCells[i]) 
+                //                              << " " << currentPvs << endl;
+                
                 const float volRatioDif = volDif / totalVol;
                 const float volRatioSum = volSum / totalVol;
@@ -900 +917 @@
 
         outstream.close();
+
 }
 
@@ -1804 +1822 @@
 
                   stat.avgFilterRadius += fstat.mAvgFilterRadius;
-                  stat.avgFilterRatio += fstat.mLocalFilterCount / (float) fstat.mGlobalFilterCount;
+                  int sum = fstat.mGlobalFilterCount + fstat.mLocalFilterCount;
+                  if (sum) {
+                        stat.avgFilterRatio += fstat.mLocalFilterCount /
+                          (float) sum;
+                  }
                   
                   
@@ -2578 +2600 @@
   float samples = (float)basePvs.GetSamples();
   
-  cout<<"f #s="<<samples<<"pvs size = "<<basePvs.GetSize();
+  Debug<<"f #s="<<samples<<"pvs size = "<<basePvs.GetSize();
   //  cout<<"Filter size = "<<filterSize<<endl;
   //  cout<<"vbox = "<<vbox<<endl;
@@ -2681 +2703 @@
   }
   
-  cout<<" nPvs size = "<<pvs.GetSize()<<endl;
+  Debug<<" nPvs size = "<<pvs.GetSize()<<endl;
 
 #if !USE_KD_PVS
@@ -2691 +2713 @@
   }
 #endif
+  viewCell->SetFilteredPvsSize(pvs.GetSize());
   
   Intersectable::NewMail();