Changeset 737

Timestamp:

04/09/06 13:38:39 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -114 +114 @@
                                           const StatsContainer &firstStats, 
                                           const StatsContainer &currentStats)
-                //                        vector<float> &ratios)
-{
-        //const int n = min((int)firstStats.size(), (int)currentStats.size());
-        const int n = (int)firstStats.size();
+                                          // vector<float> &ratios)
+{
+        
+        const int n = min((int)firstStats.size(), (int)currentStats.size());
+        //const int n = (int)firstStats.size();
         
         StatsContainer::const_iterator it, it_end = currentStats.end();
@@ -123 +124 @@
         int i = 0;
 
-        // currentStats would be the other (necessarily worse?) method
-        // firstStats would be our method
-        // compare render cost of current view cell with render cost 
-        // of other view cells.
+        // currentStats would be the other (necessarily worse?) method, firstStats would be our method
+        // loop through view cells of currentStats
+        // Compare render cost with render cost of other view cell
+        // compute ratio of view cells
         for (it = currentStats.begin(); it != it_end; ++ it, ++ i)
         {
+                //if (i > 200)  break;
+
                 int j = 0;
+                
 
                 const float renderCost = (*it).mRenderCost;
@@ -136 +140 @@
                 // don't stop until cursor is placed one element behind
                 // or end of vector is reached
-                while ((j < n) && (renderCost > (int)firstStats[j ++].mRenderCost));
-        
+                // note: use stl for this
+                while ((j < n) && (renderCost <= firstStats[j].mRenderCost))
+                {
+                        //cout << "!!rendercost: " << renderCost << " " << firstStats[j].mRenderCost << endl;
+                        ++ j;
+                }
+
+                float val;
+
+                // soecial cases
+                if (j == 0)
+                {
+                        val = (float)j;
+                }
+                else if (j == n)
+                {
+                        val = (float)(j - 1);
+                }
+                else // interpolate linearly. NOTE: probably big error because of steep curve
+                {
+                        const float rcu = firstStats[j - 1].mRenderCost;
+                        const float rcl = firstStats[j].mRenderCost;
+
+                        const float factor = (rcu - rcl != 0) ?
+                                (rcu - renderCost) / (rcu - rcl) : 1;
+
+                        val = (float)j - 1 + factor;
+                }
+
                 // lower bound
                 //int j = max (0, i - 1);
-                float ratio = (float)i / (float)j;
-
+                cout << "i: " << i << " j: " << j << endl;
+                float ratio = (i && val) ? (float)i / val : 1;
+
+                cout << "ratio: " << ratio << endl;
                 outstream << "#Pass\n" << i << endl;
                 outstream << "#RenderCost\n" << renderCost << endl;
@@ -230 +263 @@
                 for (int i = 0; i < n; ++ i)
                 {
+                        cout << "rc: " << (*it)[i].mRenderCost << endl;
                         ComputeStats(statsOut, firstStats[i], (*it)[i], i);
                 }