Changeset 744 for GTP/trunk/Lib/Vis/shared/EvalStats

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/shared/EvalStats/EvalStats.cpp (modified) (7 diffs)

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

@@ -8 +8 @@
 #include <iostream>
 #include <fstream>
-
+#include <math.h>
+#include <algorithm>
 
 using namespace std;
@@ -111 +112 @@
 
 
+inline bool vlt(const RenderStats &c1, const RenderStats &c2)
+{
+        return c1.mRenderCost > c2.mRenderCost;
+}
+
+
+// evaluate number of view cells needed for same rendercost
 void EvalNumViewCells(ofstream &outstream,
                                           const StatsContainer &firstStats, 
                                           const StatsContainer &currentStats)
-                                          // vector<float> &ratios)
 {
         
@@ -130 +137 @@
         for (it = currentStats.begin(); it != it_end; ++ it, ++ i)
         {
-                //if (i > 200)  break;
-
-                int j = 0;
                 
-
                 const float renderCost = (*it).mRenderCost;
     
@@ -140 +143 @@
                 // don't stop until cursor is placed one element behind
                 // or end of vector is reached
-                // note: use stl for this
-                while ((j < n) && (renderCost <= firstStats[j].mRenderCost))
-                {
-                        //cout << "!!rendercost: " << renderCost << " " << firstStats[j].mRenderCost << endl;
-                        ++ j;
-                }
+                StatsContainer::const_iterator equalCostIt = std::upper_bound(firstStats.begin(), firstStats.end(), *it, vlt);
+
+                int j = (int)(equalCostIt - firstStats.begin());
 
                 float val;
@@ -154 +154 @@
                         val = (float)j;
                 }
-                else if (j == n)
+                else if (j >= n)
                 {
                         val = (float)(j - 1);
                 }
-                else // interpolate linearly. NOTE: probably big error because of steep curve
-                {
+                else 
+                // interpolate linearly. NOTE: probably big error because of steep curve
+                // => intepolate logarithmically
+                {
+#if 1
+                        const float rcu = log(firstStats[j - 1].mRenderCost);
+                        const float rcl = log(firstStats[j].mRenderCost);
+                        const float rc = log(renderCost);
+#else
                         const float rcu = firstStats[j - 1].mRenderCost;
                         const float rcl = firstStats[j].mRenderCost;
-
+                        const float rc = renderCost;
+#endif
                         const float factor = (rcu - rcl != 0) ?
-                                (rcu - renderCost) / (rcu - rcl) : 1;
-
+                                (rcu - rc) / (rcu - rcl) : 1;
+
+                        // view cells needed for same render cost
                         val = (float)j - 1 + factor;
                 }
@@ -171 +180 @@
                 // lower bound
                 //int j = max (0, i - 1);
-                cout << "i: " << i << " j: " << j << endl;
+                //cout << "i: " << i << " j: " << j << endl;
                 float ratio = (i && val) ? (float)i / val : 1;
 
-                cout << "ratio: " << ratio << endl;
+                //cout << "ratio: " << 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;  
         }
 }
@@ -263 +268 @@
                 for (int i = 0; i < n; ++ i)
                 {
-                        cout << "rc: " << (*it)[i].mRenderCost << endl;
+                        //cout << "rc: " << (*it)[i].mRenderCost << endl;
                         ComputeStats(statsOut, firstStats[i], (*it)[i], i);
                 }
-#if 0
-                const int vc = ComputeNoViewCells(firstStats, *it);
-                cout << "need " << vc << " view cells to reach rendercost of method " << i << " with " << n << " view cells" << endl;
-#endif
+
+                // evaluate number of view cells needed for same rendercost
                 EvalNumViewCells(statsOut2, firstStats, (*it));