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

Timestamp:

01/15/07 21:46:52 (18 years ago)

Author:

bittner

Message:

merge

File:

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

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

@@ -80 +80 @@
 
         mViewCellsTree->SetViewCellsManager(this);
+        mSamplesStat.Reset();
 }
 
@@ -2076 +2077 @@
         stat.avgPvs/=stat.viewcells;
         stat.avgPvsEntries/=stat.viewcells;
+        stat.avgFilteredPvsEntries/=stat.viewcells;
         stat.avgFilteredPvs/=stat.viewcells;
         stat.avgFilterContribution/=stat.viewcells;
@@ -2109 +2111 @@
   s<<"#AVG_REL_PVS_INCREASE\n"<<pvsStat.avgRelPvsIncrease<<endl;
   s<<"#DEV_REL_PVS_INCREASE\n"<<pvsStat.devRelPvsIncrease<<endl;
+
+  s<<"#CONTRIBUTING_RAYS\n"<<mSamplesStat.mContributingRays<<endl;
+
+  if (mSamplesStat.mRays) {
+        s<<"#AVG_VIEWCELLS_PER_RAY\n"<<mSamplesStat.mViewCells/(float)mSamplesStat.mRays<<endl;
+  } else {
+        s<<"#AVG_VIEWCELLS_PER_RAY\n 1 \n";
+  }
+  mSamplesStat.Reset();
 }
 
@@ -2329 +2340 @@
         ray.mRelativePvsContribution = 0.0f;
 
+        mSamplesStat.mRays++;
+        
         if (!ray.mTerminationObject)
                 return 0.0f;
@@ -2352 +2365 @@
         CastLineSegment(origin, termination, viewCells);
 
-        
+        mSamplesStat.mViewCells+=viewCells.size();
+
         if (storeViewCells)
         {       
@@ -2379 +2393 @@
         }
 
+        mSamplesStat.mPvsContributions += ray.mPvsContribution;
+        if (ray.mPvsContribution)
+          mSamplesStat.mContributingRays++;
+        
 #if AVG_RAY_CONTRIBUTIONS
         ray.mRelativePvsContribution /= (float)viewCells.size();