Changeset 1174 for GTP/trunk

Timestamp:

07/31/06 18:27:06 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• Intersectable.h (modified) (1 diff)
• Preprocessor.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (4 diffs)
• VspOspTree.cpp (modified) (27 diffs)
• VspOspTree.h (modified) (5 diffs)

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

@@ -2320 +2320 @@
 
 
+        RegisterOption("Hierarchy.subdivisionStats",
+                                        optString,
+                                        "hierarchy_subdivision_stats=",
+                                        "hierarchySubdivisionStats.log");
+
         //////////////////////////////////////////////////////////////////////////////////
 }

GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

@@ -28 +28 @@
   KdPvs mKdPvs;
   
+  /// view cell based pvs per object
   ViewCellPvs mViewCellPvs;
 

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

@@ -444 +444 @@
                 mVspTree = new VspTree();
                 mOspTree = new OspTree();
-                // HACK
-                //mOspTree = new OspTree(*mKdTree);
+                
+                // HACK for testing if per kd evaluation works!!
+                mOspTree = new OspTree(*mKdTree);
 
                 mViewCellsManager = new VspOspViewCellsManager(mVspTree, mOspTree);

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

@@ -1130 +1130 @@
 struct SortableViewCellEntry {
 
-  SortableViewCellEntry() {}
-  SortableViewCellEntry(const float v, ViewCell *cell):mValue(v), mViewCell(cell) {}
-  
-  float mValue;
-  ViewCell *mViewCell;
-
-  friend bool operator<(const SortableViewCellEntry &a, const SortableViewCellEntry &b) {
-        return a.mValue < b.mValue;
-  }
+        SortableViewCellEntry() {}
+        SortableViewCellEntry(const float v, ViewCell *cell):mValue(v), mViewCell(cell) {}
+
+        float mValue;
+        ViewCell *mViewCell;
+
+        friend bool operator<(const SortableViewCellEntry &a, const SortableViewCellEntry &b) {
+                return a.mValue < b.mValue;
+        }
 };
 
-ViewCell *
-ViewCellsManager::ConstructLocalMergeTree2(ViewCell *currentViewCell, 
-                                                                                   const ViewCellContainer &viewCells)
+
+ViewCell * ViewCellsManager::ConstructLocalMergeTree2(ViewCell *currentViewCell, 
+                                                                                                          const ViewCellContainer &viewCells)
 {
   
@@ -2542 +2542 @@
 }
 
+
+
+
 /*******************************************************************/
 /*               BspViewCellsManager implementation                */
@@ -4885 +4888 @@
         if (!mOspTree->GetRoot())
         {
-                cout << "constructing vsp and osp tree" << endl;
+                Debug << "constructing vsp and osp tree" << endl;
                 //mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
                 mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
@@ -4891 +4894 @@
         else // just build view space partition tree
         {
-                cout << "constructing only vsp tree" << endl;
+                Debug << "constructing only vsp tree" << endl;
                 mHierarchyManager->Construct3(constructionRays, objects, &mViewSpaceBox);
         }

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

@@ -637 +637 @@
 
 
-void VspTree::EvalSubdivisionStats(const VspTraversalData &tData,
-                                                                   const VspTraversalData &tFrontData,
-                                                                   const VspTraversalData &tBackData
-                                                                   )
-{
-        const float cFront = (float)tFrontData.mPvs * tFrontData.mProbability;
-        const float cBack = (float)tBackData.mPvs * tBackData.mProbability;
-        const float cData = (float)tData.mPvs * tData.mProbability;
-        
-        const float costDecr = 
-                (cFront + cBack - cData) / mBoundingBox.GetVolume();
-
-        mTotalCost += costDecr;
-        mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
-
+void VspTree::EvalSubdivisionStats(const SplitCandidate &sc)
+{
+        const float costDecr = sc.GetRenderCostDecrease();
+        
         AddSubdivisionStats(mVspStats.Leaves(),
                                                 -costDecr,
@@ -663 +652 @@
                                                         const bool globalCriteriaMet)
 {
-        // doto remove dynamic cast
+        // todo remove dynamic cast
         VspSplitCandidate *sc = dynamic_cast<VspSplitCandidate *>(splitCandidate);
         VspTraversalData &tData = sc->mParentData;
 
         VspNode *newNode = tData.mNode;
+
 
         if (!LocalTerminationCriteriaMet(tData) && !globalCriteriaMet)
@@ -687 +677 @@
                 tBackData.mMaxCostMisses = maxCostMisses;
                         
-        
-                if (1) //-- subdivision statistics
-                        EvalSubdivisionStats(tData, tFrontData, tBackData);
+                mTotalCost -= sc->GetRenderCostDecrease();
+                mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
+
+                // subdivision statistics
+                if (1) EvalSubdivisionStats(*sc);
                 
                 //-- evaluate new split candidates for global greedy cost heuristics
@@ -882 +874 @@
         CreateViewCell(backData, false);
 
-        
+
+#if WORK_WITH_VIEWCELL_PVS
         // create front and back view cell
         // add front and back view cell to "Potentially Visbilie View Cells" 
         // of the objects in front and back pvs
 
-        //AddViewCellReferences(frontLeaf->GetViewCell());
-        //AddViewCellReferences(backLeaf->GetViewCell());
+        AddViewCellReferences(frontLeaf->GetViewCell());
+        AddViewCellReferences(backLeaf->GetViewCell());
+#endif
 
         interior->mTimeStamp = mTimeStamp ++;
@@ -2823 +2817 @@
 {
         ReadEnvironment();
-
         mSplitCandidates = new vector<SortableEntry>;
 }
@@ -2994 +2987 @@
                 
         // TODO matt: compute pvs
-        frontData.mPvs = 999; // ComputePvsSize(*frontData.mRays);
-        backData.mPvs = 999; //ComputePvsSize(*backData.mRays);
+        frontData.mPvs = 999999; // ComputePvsSize(*frontData.mRays);
+        backData.mPvs = 9999999; //ComputePvsSize(*backData.mRays);
 
         frontData.mProbability = frontData.mBoundingBox.GetVolume();
@@ -3089 +3082 @@
                 const int maxCostMisses = sc->mMaxCostMisses;
 
-                // how often was max cost ratio missed in this branch?
+        // how often was max cost ratio missed in this branch?
                 tFrontData.mMaxCostMisses = maxCostMisses;
                 tBackData.mMaxCostMisses = maxCostMisses;
-                        
+                
+                mTotalCost -= sc->GetRenderCostDecrease();
+
+                // subdivision statistics
+                if (1) EvalSubdivisionStats(*sc);
+
                 //-- push the new split candidates on the queue
+                
                 OspSplitCandidate *frontCandidate = new OspSplitCandidate(tFrontData);
                 OspSplitCandidate *backCandidate = new OspSplitCandidate(tBackData);
@@ -3231 +3230 @@
 {
         RayInfoContainer usedRays;
-int mMaxTests = 5000;
+int mMaxTests = 5000; // HACK
         if (mMaxTests < (int)tData.mRays->size())
         {
@@ -3384 +3383 @@
                   << "old rc: " << oldRenderCost / viewSpaceVol << " new rc: " << newRenderCost / viewSpaceVol << endl
                   << "render cost decrease: " << oldRenderCost / viewSpaceVol - newRenderCost / viewSpaceVol << endl;
+
+        if (oldRenderCost < newRenderCost)
+                Debug << "\nwarning!!:\n" << "old rc: " << oldRenderCost * viewSpaceVol << " new rc: " << newRenderCost * viewSpaceVol << endl;
+        
 
         return ratio;
@@ -3747 +3750 @@
 
 
-#if TODO
-void OspTree::EvalSubdivisionStats(const VspTraversalData &tData,
-                                                                   const VspTraversalData &tFrontData,
-                                                                   const VspTraversalData &tBackData
-                                                                   )
-{
-        const float cFront = (float)tFrontData.mPvs * tFrontData.mProbability;
-        const float cBack = (float)tBackData.mPvs * tBackData.mProbability;
-        const float cData = (float)tData.mPvs * tData.mProbability;
-        
-        const float costDecr = 
-                (cFront + cBack - cData) / mBoundingBox.GetVolume();
-
-        mTotalCost += costDecr;
-        mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
-
-        AddSubdivisionStats(mVspStats.Leaves(),
-                                                -costDecr,
-                                                sc->GetPriority(),
-                                                mTotalCost,
-                                                (float)mTotalPvsSize / (float)mVspStats.Leaves());
-}
-#endif
+void OspTree::EvalSubdivisionStats(const SplitCandidate &sc)
+{
+        const float costDecr = sc.GetRenderCostDecrease();
+        Debug << "**********************$$$$$$$$$$$$$$"<< endl;
+Debug << "here78 " << mOspStats.Leaves() << " " << mTotalCost << endl;
+        AddSubdivisionStats(mOspStats.Leaves(),
+                                                costDecr,
+                                                mTotalCost
+                                                );
+}
+
+
+
+void OspTree::AddSubdivisionStats(const int leaves,
+                                                                  const float renderCostDecr,
+                                                                  const float totalRenderCost)
+                                                                  //const float avgRenderCost)
+{Debug << "here64 " << totalRenderCost << " " << renderCostDecr << endl;
+        mSubdivisionStats 
+                        << "#Leaves\n" << leaves << endl
+                        << "#RenderCostDecrease\n" << renderCostDecr << endl 
+                        << "#TotalRenderCost\n" << totalRenderCost << endl;
+                        //<< "#AvgRenderCost\n" << avgRenderCost << endl;
+}
 
 
@@ -3809 +3813 @@
         float pvsFront = 0;
         float pvsBack = 0;
-        float totalPvs = 0;
 
         // probability that view point lies in back / front node
@@ -3823 +3826 @@
 
         KdLeaf *leaf = tData.mNode;
+        int totalPvs = (int)leaf->mObjects.size();
+
         ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
 
@@ -3829 +3834 @@
         for (oit = leaf->mObjects.begin(); oit != oit_end; ++ oit)
         {
+                int pvsContri = 0;
+
                 Intersectable *obj = *oit;
                 const AxisAlignedBox3 box = obj->GetBox();
-                
-                ++ totalPvs;
 
                 //cout << "totalpvs " << totalPvs << endl;
 
                 // test if box falls in left / right child node
-                if (box.Max(candidatePlane.mAxis) > candidatePlane.mPosition)
+                if (box.Max(candidatePlane.mAxis) >= candidatePlane.mPosition)
                 {
                         ++ pvsFront;
                 }
+
                 if (box.Min(candidatePlane.mAxis) < candidatePlane.mPosition)
                 {
@@ -3846 +3852 @@
                 }
         }
-
 
         // sum up volume seen from the objects of left and right children
@@ -3889 +3894 @@
         const float renderCostDecrease = (oldRenderCost - newRenderCost) / viewSpaceVol;
 
-        Debug << "\n==== eval render cost decrease ===" << endl
+        Debug << "\n==== eval render cost decrease ====" << endl
                   << "back pvs: " << pvsBack << " front pvs " << pvsFront << " total pvs: " << totalPvs << endl 
                   << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol << " p: " << pOverall / viewSpaceVol << endl
@@ -3896 +3901 @@
 
         normalizedOldRenderCost = oldRenderCost / viewSpaceVol;
+
+        if (oldRenderCost < newRenderCost)
+                Debug << "\nwarning2!!:\n" << "old rc: " << oldRenderCost * viewSpaceVol << " new rc: " << newRenderCost * viewSpaceVol << endl;
+        else
+                Debug << "here4" << endl;
+
+        if (pBack + pFront < pOverall * 0.9)
+                Debug << "\nwarning3!!:\n" << "p new: " << pBack + pFront << " p old: " << pOverall << endl;
+        else
+                Debug << "here55" << endl;
+
+        if (pvsBack + pvsFront < totalPvs)
+                Debug << "\nwarning4!!:\n" << "pvs new: " << pvsBack + pvsFront << " pvs old: " << totalPvs << endl;
+        else
+                Debug << "here25" << endl;
 
         return renderCostDecrease;
@@ -4290 +4310 @@
         mVspTree.mOspTree = &ospTree;
         mOspTree.mVspTree = &vspTree;
+
+        char subdivisionStatsLog[100];
+        Environment::GetSingleton()->GetStringValue("Hierarchy.subdivisionStats", subdivisionStatsLog);
+        mSubdivisionStats.open(subdivisionStatsLog);
 }
 
@@ -4345 +4369 @@
                                                                         mVspTree.mBoundingBox);
 
-
+#if WORK_WITH_VIEWCELL_PVS
+        
         // create first view cell
         mVspTree.CreateViewCell(vData, false);
@@ -4359 +4384 @@
                 obj->mViewCellPvs.AddSample(leaf->GetViewCell(), 1);
         }
+#endif
 
         // compute first split candidate
@@ -4365 +4391 @@
     mVspTree.EvalSplitCandidate(*splitCandidate);
 
+        mVspTree.mTotalCost = (float)pvsSize;
+        mVspTree.EvalSubdivisionStats(*splitCandidate);
+
         return splitCandidate;
 }
@@ -4370 +4399 @@
 
 OspTree::OspSplitCandidate * HierarchyManager::PrepareOsp(const VssRayContainer &sampleRays,
-                                                                                          const ObjectContainer &objects,
-                                                                                          AxisAlignedBox3 *forcedObjectSpace,
-                                                                                          RayInfoContainer &rays)
+                                                                                                                  const ObjectContainer &objects,
+                                                                                                                  AxisAlignedBox3 *forcedObjectSpace,
+                                                                                                                  RayInfoContainer &rays)
 {
         // store pointer to this tree
@@ -4410 +4439 @@
                 new OspTree::OspSplitCandidate(oData);
 
-    mOspTree.EvalSplitCandidate(*oSplitCandidate);
+        mOspTree.EvalSplitCandidate(*oSplitCandidate);
+
+        mOspTree.mTotalCost = (float)objects.size();
+        Debug << "total cost here553: " << mOspTree.mTotalCost << endl;
+        mOspTree.EvalSubdivisionStats(*oSplitCandidate);
 
         return oSplitCandidate;
@@ -4433 +4466 @@
 
 
+void HierarchyManager::EvalSubdivisionStats(const SplitCandidate &tData)
+{
+        const float costDecr = tData.GetRenderCostDecrease();
+
+        //mTotalCost -= costDecr;
+        // mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
+
+        AddSubdivisionStats(mOspTree.mOspStats.Leaves() + mVspTree.mVspStats.Leaves(),
+                                                costDecr,
+                                                mTotalCost
+                                                );
+}
+
+
+void HierarchyManager::AddSubdivisionStats(const int splits,
+                                                                                   const float renderCostDecr,
+                                                                                   const float totalRenderCost)
+{
+        mSubdivisionStats 
+                        << "#Splits\n" << splits << endl
+                        << "#RenderCostDecrease\n" << renderCostDecr << endl 
+                        << "#TotalRenderCost\n" << totalRenderCost << endl;
+                        //<< "#AvgRenderCost\n" << avgRenderCost << endl;
+}
+
+
 bool HierarchyManager::GlobalTerminationCriteriaMet(SplitCandidate *candidate) const
 {
@@ -4473 +4532 @@
         if (vspSplit)
         {
-                mVspTree.Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-                return true;
+                VspNode *n = mVspTree.Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
         }
         else
         {
-                mOspTree.Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-                return false;
-        }
+                KdNode *n = mOspTree.Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
+        }
+        
+        return !globalTerminationCriteriaMet;
 }
 
@@ -4492 +4551 @@
                 SplitCandidate *splitCandidate = NextSplitCandidate();
             
-                cout << "nodes: " << ++ numNodes << endl;
-
                 mTotalCost -= splitCandidate->GetRenderCostDecrease();
-
                 // cost ratio of cost decrease / totalCost
                 const float costRatio = splitCandidate->GetRenderCostDecrease() / mTotalCost;
-                
+
+                if (costRatio < mTermMinGlobalCostRatio)
+                        ++ mGlobalCostMisses;
+
+                /*              cout << "nodes: " << ++ numNodes << endl;
                 Debug << "\n**********" << endl
                           << "total cost: " << mTotalCost << " render cost decr: " 
                           << splitCandidate->GetRenderCostDecrease() 
                           << " cost ratio: " << costRatio << endl << endl;
-
+*/
                 //-- subdivide leaf node
-                SubdivideSplitCandidate(splitCandidate);
-
-                if (costRatio < mTermMinGlobalCostRatio)
-                        ++ mGlobalCostMisses;
-
-                // reevaluate candidates affected by the split
-                // for view space splits, this would be object space splits
-                // and other way round
-                if (repair)
-                        RepairQueue();
+                if (SubdivideSplitCandidate(splitCandidate))
+                {
+                        EvalSubdivisionStats(*splitCandidate);
+                
+                        // reevaluate candidates affected by the split
+                        // for view space splits, this would be object space splits
+                        // and other way round
+                        if (repair)
+                                RepairQueue();
+                }
 
                 DEL_PTR(splitCandidate);
@@ -4544 +4604 @@
         VspTree::VspSplitCandidate *vsc = 
                 PrepareVsp(sampleRays, forcedViewSpace, *viewSpaceRays);
+
         // add to queue
         mTQueue.Push(vsc);
@@ -4590 +4651 @@
         // note: only true for view space = object space
         mTotalCost = (float)osc->mParentData.mNode->mObjects.size();//(float)sc->mParentData.mPvs;
-
+        
         Debug << "reseting cost, new total cost: " << mTotalCost << endl;
 

GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h

@@ -66 +66 @@
         int mMaxCostMisses;
 
-        SplitCandidate()
+        SplitCandidate(): mRenderCostDecrease(0)
         {};
 
-        SplitCandidate(const AxisAlignedPlane &plane): mSplitPlane(plane)
+        SplitCandidate(const AxisAlignedPlane &plane): mSplitPlane(plane), mRenderCostDecrease(0)
         {}
 
@@ -1039 +1039 @@
                 RayInfoContainer &rays);
 
-        void EvalSubdivisionStats(const VspTraversalData &tData,
-                                                          const VspTraversalData &tFrontData,
-                                                          const VspTraversalData &tBackData);
+        void EvalSubdivisionStats(const SplitCandidate &tData);
 protected:
 
@@ -1668 +1666 @@
         int ClassifyRay(VssRay *ray, KdLeaf *leaf, const AxisAlignedPlane &plane) const;
 
+        void EvalSubdivisionStats(const SplitCandidate &tData);
+
+        void AddSubdivisionStats(const int viewCells,
+                const float renderCostDecr,
+                const float totalRenderCost);
+
 protected:
 
@@ -1844 +1848 @@
                 RayInfoContainer &rays);
 
+        void EvalSubdivisionStats(const SplitCandidate &tData);
+
+        void AddSubdivisionStats(const int splits,
+                const float renderCostDecr,
+                const float totalRenderCost);
+
 
 protected:
@@ -1860 +1870 @@
         /// keeps track of cost during subdivision
         float mTotalCost;
+
+        ofstream mSubdivisionStats;
 };