Changeset 2003 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

01/21/07 00:40:56 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (9 diffs)

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

@@ -32 +32 @@
 Preprocessor(), 
 mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
-//mSamplingType(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION),
 mProcessedViewCells(0),
 mCurrentViewCell(NULL)
@@ -203 +202 @@
                 return false;
 
-        if (0 && GVS_DEBUG)
+        if (1 && GVS_DEBUG)
                 mVssRays.push_back(new VssRay(*vssRay));
 
@@ -653 +652 @@
         //exporter->ExportRays(vcRays, RgbColor(1, 0, 0));
         //exporter->ExportRays(vcRays2, RgbColor(0, 1, 0));
-        //exporter->ExportRays(vcRays3, RgbColor(1, 1, 1));
+        exporter->ExportRays(vcRays3, RgbColor(1, 1, 1));
 }
 
@@ -773 +772 @@
                 passSamples += newSamples;
                 mGvsStats.mPerViewCellSamples += newSamples;
-                //cout << "here2 " << passSamples % (mSamplesPerPass + 1) << endl;
+                
 
                 if (passSamples >= mSamplesPerPass)
@@ -884 +883 @@
                 (*oit)->mCounter = 0;
         }
+        long lastTime = GetTime();
 
         while (NextViewCell())
@@ -896 +896 @@
                 //mGvsStats.mTrianglePvs = mCurrentViewCell->GetPvs().GetSize();
                 mGvsStats.mTrianglePvs = (int)mTrianglePvs.size();
+                mGvsStats.mTotalTrianglePvs += mGvsStats.mTrianglePvs;
 
                 ObjectContainer objectPvs;
@@ -910 +911 @@
                 mGvsStats.mViewCells = mProcessedViewCells;//mPass;
                 //mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();
-                mGvsStats.mPerViewCellPvs = (int)mTrianglePvs.size();
+                mGvsStats.mPerViewCellPvs = (int)objectPvs.size();
 
                 mGvsStats.mTotalPvs += mGvsStats.mPerViewCellPvs;
                 mGvsStats.mTotalSamples += mGvsStats.mPerViewCellSamples;
 
+                // timing
+                const long currentTime = GetTime();
+        
+                mGvsStats.mTimePerViewCell = TimeDiff(lastTime, currentTime) * 1e-3f;
+                mGvsStats.mTotalTime += mGvsStats.mTimePerViewCell;
+
+                lastTime = currentTime;
+
                 mGvsStats.Stop();
                 mGvsStats.Print(mGvsStatsStream);
 
-                mTrianglePvs.clear();
+        mTrianglePvs.clear();
 
                 if (GVS_DEBUG)
@@ -1037 +1046 @@
 
         //Randomize(0);
-        
         mGvsStats.Reset();
         mGvsStats.Start();
@@ -1119 +1127 @@
 void GvsStatistics::Print(ostream &app) const
 {
-        app << "#Pass\n" << mPass << endl;
+        app << "#ViewCells\n" << mViewCells << endl;
         app << "#ViewCellId\n" << mViewCellId << endl;
-        app << "#Time\n" << Time() << endl;
+        app << "#TotalTime\n" << mTotalTime << endl;
+        app << "#TimePerViewCell\n" << mTimePerViewCell << endl;;
+
+        app << "#RaysPerSec\n" << RaysPerSec() << endl;
+
+        app << "#TrianglePvs\n" << mTrianglePvs << endl;
+        app << "#TotalTrianglePvs\n" << mTotalTrianglePvs << endl;
+
+        app << "#PerViewCellPvs\n" << mPerViewCellPvs << endl;
+        app << "#TotalPvs\n" << mTotalPvs << endl;
+        
+        app << "#PerViewCellSamples\n" << mPerViewCellSamples << endl;
         app << "#TotalSamples\n" << mTotalSamples << endl;
-        app << "#ScDiff\n" << mPassContribution << endl;
         app     << "#SamplesContri\n" << mTotalContribution << endl;
-        app << "#ReverseSamples\n" << mReverseSamples << endl;
-        app << "#BorderSamples\n" << mBorderSamples << endl;            
-        app << "#GvsRuns\n" << mGvsPass << endl;
-        app << "#ViewCells\n" << mViewCells << endl;
-        app << "#TotalPvs\n" << mTotalPvs << endl;
-        app << "#PerViewCellPvs\n" << mPerViewCellPvs << endl;
-        app << "#TrianglePvs\n" << mTrianglePvs << endl;
-        app << "#RaysPerSec\n" << RaysPerSec() << endl;
-        app << "#PerViewCellSamples\n" << mPerViewCellSamples << endl << endl;
-}
-
-
-}
+                
+        //app << "#ReverseSamples\n" << mReverseSamples << endl;
+        //app << "#BorderSamples\n" << mBorderSamples << endl;
+
+        //app << "#Pass\n" << mPass << endl;
+        //app << "#ScDiff\n" << mPassContribution << endl;
+        //app << "#GvsRuns\n" << mGvsPass << endl;      
+
+        app << endl;
+}
+
+
+}