Changeset 1912 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

12/20/06 00:26:02 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (2 diffs)

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

@@ -156 +156 @@
                 "Hierarchy.Construction.maxAvgRayContri", mMaxAvgRayContri);
 
+        Environment::GetSingleton()->GetFloatValue(
+                "Hierarchy.Construction.minAvgRayContri", mMinAvgRayContri);
+
         // for comparing it with byte - value
         mTermMaxMemory *= (1024.0f * 1024.0f);
@@ -734 +737 @@
 
 
-float HierarchyManager::EvalPvsCorrectionFactor(const float childPvs, 
-                                                                                                const float totalPvs, 
-                                                                                                const float avgRayContri) const
-{
-        if (!childPvs ||
-                // assume pvs sampled sufficiently => take child pvs
-                (avgRayContri < mMinAvgRayContri))
-                return 1.0f;
+float HierarchyManager::EvalCorrectedPvs(const float childPvs, 
+                                                                                 const float totalPvs, 
+                                                                                 const float avgRayContri) const
+{
+        // assume pvs sampled sufficiently => take child pvs
+        if (avgRayContri < mMinAvgRayContri)
+                return childPvs;
 
         // assume pvs not sampled sufficiently => take total pvs
         if (avgRayContri > mMaxAvgRayContri)
-                return totalPvs / childPvs;
-
-        const float factor = 
-                        (mMaxAvgRayContri - avgRayContri) / 
-                        (mMaxAvgRayContri - mMinAvgRayContri);
-
-        const float newPvs = factor * childPvs + (1.0f - factor) * totalPvs;    
-        
-        return newPvs / childPvs;
+                return totalPvs;
+
+        const float alpha = (mMaxAvgRayContri - avgRayContri) / 
+                                                (mMaxAvgRayContri - mMinAvgRayContri);
+
+        cout << "here41 **************** " << alpha << " " << childPvs << " " << totalPvs << endl;
+
+        const float beta = (1.0f - alpha) * (totalPvs + childPvs) / totalPvs;
+
+        return childPvs + beta;
 }