Changeset 1916 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

12/20/06 17:20:55 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (5 diffs)

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

@@ -840 +840 @@
 
         splitCandidate.SetAvgRayContribution(avgRayContri);
-        cout << "vsp avg ray contri: " << avgRayContri << endl;
-
+        
         // compute global decrease in render cost
         float oldRenderCost;
@@ -900 +899 @@
         const float correctedOldPvs = splitCandidate.mParentData.mCorrectedPvs * oldPvsRatio;
 
-        cout <<"here102 old pvs ratio: " << oldPvsRatio << " " << splitCandidate.mParentData.mPvs << " " << oldPvsSize << endl;
-
         splitCandidate.mCorrectedFrontPvs = 
                 mHierarchyManager->EvalCorrectedPvs(fPvsSize, 
                                                                                         correctedOldPvs, 
                                                                                         splitCandidate.GetAvgRayContribution());
-        cout <<"here103 "<< endl;
         splitCandidate.mCorrectedBackPvs = 
                 mHierarchyManager->EvalCorrectedPvs(bPvsSize, 
@@ -912 +908 @@
                                                                                         splitCandidate.GetAvgRayContribution());
         
-        cout << "vsp front entries " << fPvsSize << " corrected: " << splitCandidate.mCorrectedFrontPvs << endl;
-        cout << "vsp back entries " << bPvsSize << " corrected: " << splitCandidate.mCorrectedBackPvs << endl;
+        
+        cout << "vsp pvs"
+                 << " avg ray contri: " << splitCandidate.GetAvgRayContribution() << " ratio: " << oldPvsRatio 
+                 << " parent: " << correctedOldPvs << " " << " old vol: " << oldPvsSize
+                 << " frontpvs: " << fPvsSize << " corr. " << splitCandidate.mCorrectedFrontPvs 
+                 << " backpvs: " << bPvsSize << " corr. " << splitCandidate.mCorrectedBackPvs << endl;
+
 
         return (int)(splitCandidate.mCorrectedFrontPvs + splitCandidate.mCorrectedBackPvs - correctedOldPvs);
@@ -1607 +1608 @@
         const float penaltyOld = tData.mCorrectedRenderCost * oldRenderCostRatio;
 
-        cout <<"here107 old render cost ratio " << oldRenderCostRatio << " old cost: " << penaltyOld << endl;
         sc.mCorrectedFrontRenderCost = mHierarchyManager->EvalCorrectedPvs(pvsFront, penaltyOld, avgRayContri);
-        cout <<"here108 " << tData.mCorrectedRenderCost << " " << oldRenderCostRatio << endl;
         sc.mCorrectedBackRenderCost = mHierarchyManager->EvalCorrectedPvs(pvsBack, penaltyOld, avgRayContri);
-
-        cout << "vsp front pvs " << pvsFront << " corrected: " << sc.mCorrectedFrontRenderCost << endl;
-        cout << "vsp back render cost " << pvsBack << " corrected: " << sc.mCorrectedBackRenderCost << endl;
 
         const float oldRenderCost = pOverall * penaltyOld;
@@ -1624 +1620 @@
         // the render cost decrase for this split
         const float renderCostDecrease = (oldRenderCost - newRenderCost) / viewSpaceVol;
+
+        cout << "vsp render cost"
+                 << " avg ray contri: " << avgRayContri << " ratio: " << oldRenderCostRatio
+                 << " parent: " << penaltyOld << " " << " old vol: " << totalPvs 
+                 << " front cost: " << sc.mCorrectedFrontRenderCost << " corr. " << sc.mCorrectedFrontRenderCost
+                 << " back cost: " << sc.mCorrectedBackRenderCost << " corr. " << sc.mCorrectedBackRenderCost << endl;
 
 #ifdef GTP_DEBUG