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

Timestamp:

12/20/06 12:18:41 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (1 diff)

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

@@ -743 +743 @@
         // assume pvs sampled sufficiently => take child pvs
         if (avgRayContri < mMinAvgRayContri)
+        {
+                cout << "here4 child" << endl;
                 return childPvs;
-
+        }
         // assume pvs not sampled sufficiently => take total pvs
         if (avgRayContri > mMaxAvgRayContri)
+        {
+                cout << "here9 parent" << endl;
                 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;
+        const float beta = (1.0f - alpha) * (totalPvs - childPvs);
+
+        cout << "alpha " << alpha << " beta: " << beta << " child: " << childPvs << " parent: " << totalPvs << endl;
+        
+        const float newPvs = childPvs + beta;
+
+        if ((newPvs < childPvs - Limits::Small) || (newPvs > totalPvs + Limits::Small))
+                cout << "Error!! " << newPvs << endl;
+        return newPvs;
 }