Replaced CompileStats with GraphicsCostEstimator

include/osgUtil/IncrementalCompileOperation

@@ -15,7 +15,7 @@
 #define OSGUTIL_INCREMENTALCOMPILEOPERATOR
 
 #include <osgUtil/GLObjectsVisitor>
-#include <osg/Geometry>
+#include <osgUtil/GraphicsCostEstimator>
 
 namespace osgUtil {
 
@@ -49,74 +49,6 @@ class OSGUTIL_EXPORT StateToCompile : public osg::NodeVisitor
         virtual void apply(osg::Texture& texture);
 };
 
-class OSGUTIL_EXPORT CompileStats : public osg::Referenced
-{
-    public:
-
-        CompileStats();
-
-        void add(const std::string& name,double size, double time);
-
-        double estimateTime(const std::string& name, double size) const;
-        double estimateTime2(const std::string& name, double size) const;
-        double estimateTime3(const std::string& name, double size) const;
-        double estimateTime4(const std::string& name, double size) const;
-        double averageTime(const std::string& name) const;
-
-        void print(std::ostream& out) const;
-
-    protected:
-
-        struct OSGUTIL_EXPORT Values
-        {
-            Values():
-                totalSize(0.0), totalTime(0.0), totalNum(0.0),
-                minSize(0.0), minTime(0.0),
-                a(0.0), b(0.0),
-                m(0.0), n(0.0), o(0.0), p(0.0) {}
-
-            void add(double size, double time);
-
-            double estimateTime(double size) const
-            {
-                return a + b * size;
-            }
-
-            double estimateTime2(double size) const
-            {
-                return (totalTime/totalSize) * size;
-            }
-
-            double estimateTime3(double size) const
-            {
-                if (size<minSize) return minTime;
-                return minTime + (totalTime/totalSize) * (size-minSize);
-            }
-
-            double estimateTime4(double size) const
-            {
-                if (size<minSize) return minTime;
-                double denominator = totalSize-minSize*totalNum;
-                return denominator==0.0 ? minTime : 
-                       minTime + (totalTime-minTime*totalNum)/(totalSize-minSize*totalNum) * (size-minSize);
-            }
-
-            double averageTime() const
-            {
-                if (totalNum!=0.0) return totalTime/totalTime;
-                else return 0.0;
-            }
-
-            double totalSize, totalTime, totalNum;
-            double minSize, minTime;
-            double a,b;
-            double m,n,o,p;
-        };
-
-        typedef std::map<std::string, Values> StatsMap;
-        StatsMap _statsMap;
-};
-
 class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
 {
     public:
@@ -186,8 +118,8 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
         osg::Geometry* getForceTextureDownloadGeometry() { return _forceTextureDownloadGeometry.get(); }
         const osg::Geometry* getForceTextureDownloadGeometry() const { return _forceTextureDownloadGeometry.get(); }
 
-        CompileStats* getCompileStats() { return _compileStats.get(); }
+        GraphicsCostEstimator* getGraphicsCostEstimator() { return _graphicsCostEstimator.get(); }
-        const CompileStats* getCompileStats() const { return _compileStats.get(); }
+        const GraphicsCostEstimator* getGraphicsCostEstimator() const { return _graphicsCostEstimator.get(); }
 
 
         typedef std::vector<osg::GraphicsContext*> Contexts;
@@ -338,22 +270,22 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
         virtual ~IncrementalCompileOperation();
         
     
-        double                          _targetFrameRate;
+        double                              _targetFrameRate;
-        double                          _minimumTimeAvailableForGLCompileAndDeletePerFrame;
+        double                              _minimumTimeAvailableForGLCompileAndDeletePerFrame;
-        unsigned int                    _maximumNumOfObjectsToCompilePerFrame;
+        unsigned int                        _maximumNumOfObjectsToCompilePerFrame;
-        double                          _flushTimeRatio;
+        double                              _flushTimeRatio;
-        double                          _conservativeTimeRatio;
+        double                              _conservativeTimeRatio;
 
-        osg::ref_ptr<osg::Geometry>     _forceTextureDownloadGeometry;
+        osg::ref_ptr<osg::Geometry>         _forceTextureDownloadGeometry;
-        osg::ref_ptr<CompileStats>      _compileStats;
+        osg::ref_ptr<GraphicsCostEstimator> _graphicsCostEstimator;
 
-        OpenThreads::Mutex              _toCompileMutex;
+        OpenThreads::Mutex                  _toCompileMutex;
-        CompileSets                     _toCompile;
+        CompileSets                         _toCompile;
         
-        OpenThreads::Mutex              _compiledMutex;
+        OpenThreads::Mutex                  _compiledMutex;
-        CompileSets                     _compiled;
+        CompileSets                         _compiled;
         
-        ContextSet                      _contexts;
+        ContextSet                          _contexts;
 
 };
 

src/osgUtil/IncrementalCompileOperation.cpp

@@ -163,97 +163,6 @@ void StateToCompile::apply(osg::Texture& texture)
     _textures.insert(&texture);
 }
 
-/////////////////////////////////////////////////////////////////
-//
-// CompileStats
-//
-CompileStats::CompileStats()
-{
-}
-
-void CompileStats::add(const std::string& name,double size, double time)
-{
-    Values& values = _statsMap[name];
-    values.add(size,time);
-}
-
-double CompileStats::estimateTime(const std::string& name, double size) const
-{
-    StatsMap::const_iterator itr = _statsMap.find(name);
-    return (itr!=_statsMap.end()) ? itr->second.estimateTime(size) : 0.0;
-}
-
-double CompileStats::estimateTime2(const std::string& name, double size) const
-{
-    StatsMap::const_iterator itr = _statsMap.find(name);
-    return (itr!=_statsMap.end()) ? itr->second.estimateTime2(size) : 0.0;
-}
-
-double CompileStats::estimateTime3(const std::string& name, double size) const
-{
-    StatsMap::const_iterator itr = _statsMap.find(name);
-    return (itr!=_statsMap.end()) ? itr->second.estimateTime3(size) : 0.0;
-}
-
-double CompileStats::estimateTime4(const std::string& name, double size) const
-{
-    StatsMap::const_iterator itr = _statsMap.find(name);
-    return (itr!=_statsMap.end()) ? itr->second.estimateTime4(size) : 0.0;
-}
-
-double CompileStats::averageTime(const std::string& name) const
-{
-    StatsMap::const_iterator itr = _statsMap.find(name);
-    return (itr!=_statsMap.end()) ? itr->second.averageTime() : 0.0;
-}
-
-void CompileStats::print(std::ostream& out) const
-{
-    for(StatsMap::const_iterator itr = _statsMap.begin();
-        itr != _statsMap.end();
-        ++itr)
-    {
-        const Values& values = itr->second;
-        out<<itr->first<<" : averageTime "<<values.averageTime()<<", a="<<values.a<<" b="<<values.b<<std::endl;
-    }
-}
-
-void CompileStats::Values::add(double size, double time)
-{
-    if (totalNum==0.0)
-    {
-        minSize = size;
-        minTime = time;
-    }
-    else
-    {
-        if (size<minSize) minSize = size;
-        if (time<minTime) minTime = time;
-    }
-
-    totalSize += size;
-    totalTime += time;
-    totalNum += 1.0;
-
-    m += time/(size*size); // sum of yi/xi^2
-    n += time/size; // sum of yi/xi
-    o += 1.0/(size*size); // sum of 1/xi^2
-    p += 1.0/size; // sum of 1/xi
-
-    double d = o + p*p;
-    if (d!=0.0)
-    {
-        a = (n*p - m)/d;
-        b = (n*o - m*p)/d;
-    }
-    else
-    {
-        a = time;
-        b = 0.0;
-    }
-}
-
-
 /////////////////////////////////////////////////////////////////
 //
 // CompileOps
@@ -467,7 +376,7 @@ IncrementalCompileOperation::IncrementalCompileOperation():
         _maximumNumOfObjectsToCompilePerFrame = atoi(ptr);
     }
 
-    _compileStats = new CompileStats;
+    _graphicsCostEstimator = new GraphicsCostEstimator;
 
     // assignForceTextureDownloadGeometry();
 }