Changeset 1444 for GTP/trunk/Lib

Timestamp:

09/21/06 12:16:04 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• Environment.cpp (modified) (2 diffs)
• HierarchyManager.cpp (modified) (4 diffs)
• OspTree.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (32 diffs)
• VspTree.cpp (modified) (9 diffs)

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

@@ -529 +529 @@
                 );
 
-        if (0 && terminationCriteriaMet)
+        if (1 && terminationCriteriaMet)
         {
                 Debug << "bvh global termination criteria met:" << endl;

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

@@ -1670 +1670 @@
         RegisterOption("Preprocessor.pvsRenderErrorSamples",
                                    optInt,
-                                   "pvsRenderErrorSamples=",
+                                   "preprocessor_pvs_rendererror_samples=",
                                    "10000");
         
@@ -2427 +2427 @@
                                         optFloat,
                                         "hierarchy_term_min_global_cost_ratio=",
-                                        "0.9");
+                                        "0.000000001");
 
         RegisterOption("Hierarchy.Termination.globalCostMissTolerance",

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

@@ -234 +234 @@
                 (0
                 || (mHierarchyStats.Leaves() >= mTermMaxLeaves) 
-                //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 ||(candidate->GlobalTerminationCriteriaMet())
                 );
 
-        if (0 && terminationCriteriaMet)
+        if (1 && terminationCriteriaMet)
         {
                 Debug << "hierarchy global termination criteria met:" << endl;
@@ -382 +382 @@
         const bool vspSplit = (sc->Type() == SubdivisionCandidate::VIEW_SPACE);
 
+        if (!globalTerminationCriteriaMet)
+        {
+                // cost ratio of cost decrease / totalCost
+                const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
+                Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+        
+                if (costRatio < mTermMinGlobalCostRatio)
+                {
+                        ++ mGlobalCostMisses;
+                }
+
+                mTotalCost -= mCurrentCandidate->GetRenderCostDecrease();
+        }
+
         if (vspSplit)
         {
@@ -481 +495 @@
         {
                 mCurrentCandidate = NextSubdivisionCandidate();    
-                mTotalCost -= mCurrentCandidate->GetRenderCostDecrease();
-
-                // cost ratio of cost decrease / totalCost
-                const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
-
-                //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
-                if (costRatio < mTermMinGlobalCostRatio)
-                {
-                        ++ mGlobalCostMisses;
-                }
-                
+                        
                 ///////////////////
                 //-- subdivide leaf node
@@ -498 +502 @@
                 {
                         cout << mCurrentCandidate->Type() << " ";
-                        if (0) cout << "subdividing candidate " << ++ i << " of type " << mCurrentCandidate->Type() << endl;
+                        if (0) cout << "subdividing candidate " << ++ i << " of type " 
+                                                << mCurrentCandidate->Type() << endl;
                         mHierarchyStats.nodes += 2;
 

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

@@ -537 +537 @@
 {
         // matt: TODO
-        return (
-                (mOspStats.Leaves() >= mTermMaxLeaves)
-                //mOutOfMemory || 
-                //(mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+        return (0
+                || (mOspStats.Leaves() >= mTermMaxLeaves) 
+                //|| mOutOfMemory
+                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 );
 }

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

@@ -348 +348 @@
                   << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-
-        ///////////////////////////////////////////
-        //-- Initial hierarchy construction finished
+        // collect view cells and compute statistics
+        ResetViewCells();
+
+
+        ///////////////////
+        //-- Initial hierarchy construction finished.
         //-- We can do some stats and visualization
         
-        ResetViewCells();
-                
-        if (0) //-- optionally export initial view cell partition
-        {
-        Debug << "\nView cells after initial sampling:\n" << mCurrentViewCellsStats << endl;
+        if (0)
+        {
+                //-- export initial view cell partition
+                Debug << "\nView cells after initial sampling:\n" 
+                          << mCurrentViewCellsStats << endl;
 
                 const string filename("viewcells.wrl");
@@ -400 +403 @@
 
                 const int samplingType = mSamplingType;
-                        /*dirSamples ? 
-                                                Preprocessor::DIRECTION_BASED_DISTRIBUTION :
-                                                Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;*/
+                        //dirSamples ? Preprocessor::DIRECTION_BASED_DISTRIBUTION :     Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
 
                 if (0) dirSamples = !dirSamples; // toggle sampling method
@@ -445 +446 @@
         //-- post processing of the initial construction
         //-- We can bottom-up merge the view cells in this step
-
-
-        // we can additionally cast some post processing sample rays.
-        // These rays can be used to store the view cells with the rays
+        //-- We can additionally cast some post processing sample rays.
+        //-- These rays can be used to store the view cells with the rays
+
         VssRayContainer postProcessSamples;
         cout << "casting " << mPostProcessSamples << " post processing samples ... ";
@@ -457 +457 @@
         cout << "starting post processing and visualization" << endl;
 
-        // store view cells for post processing?
+        // store view cells with rays for post processing?
         const bool storeViewCells = true;
 
@@ -480 +480 @@
                 EvalViewCellPartition();
         }
-
         
         /////////////////
@@ -497 +496 @@
                         ComputeSampleContributions(visualizationSamples, true, storeViewCells);
 
-                // different visualizations
+                // various visualizations
                 Visualize(preprocessor->mObjects, visualizationSamples);
 
                 disposeRays(visualizationSamples, outRays);
         }
+
+        // recalculate view cells
+        EvaluateViewCellsStats();
 
         return numSamples;
@@ -614 +616 @@
                 long startTime = GetTime();
 
-                //vm->PrepareLoadedViewCells();
                 vm->ResetViewCells();
 
@@ -620 +621 @@
                 vm->mMaxPvsSize = (int)objects->size();
 
-                // create the meshes and compute volumes
                 if (finalizeViewCells)
                 {
+                        // create the meshes and compute volumes
                         vm->FinalizeViewCells(true);
                         vm->mViewCellsTree->AssignRandomColors();
@@ -901 +902 @@
                 startTime = GetTime();
 
-                cout << "compute new statistics ... ";
-                Debug << "compute new statistics ... ";
-
+                cout << "compute new statistics ... " << endl;
+        
                 //-- propagate pvs or pvs size information
                 ObjectPvs pvs;
@@ -916 +916 @@
                 timeDiff = TimeDiff(startTime, GetTime());
                 cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-                Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                Debug << "statistis compted in " << timeDiff * 1e-3 << " secs" << endl;
         
                 disposeRays(evaluationSamples, NULL);
@@ -922 +922 @@
         
 
+        ////////////7
         //-- histogram
 
@@ -1286 +1287 @@
 bool ViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
-  if (!ViewCellsConstructed())
-          return mViewSpaceBox.IsInside(viewPoint);
-  else 
-  {
-          if (!mViewSpaceBox.IsInside(viewPoint))
-                  return false;
-          
-          ViewCell *viewcell = GetViewCell(viewPoint);
-          
-          if (!viewcell || !viewcell->GetValid())
-                  return false;
-  }
-
-  return true;
-}
-
-
-float
-ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
-                                                                                         const bool addRays,                                                                    
-                                                                                         const bool storeViewCells
-                                                                                         )
-{
-  // view cells not yet constructed
-  if (!ViewCellsConstructed())
-        return 0.0f;
-
-  VssRayContainer::const_iterator it, it_end = rays.end();
-
-  float sum = 0.0f;
-
-  for (it = rays.begin(); it != it_end; ++ it) 
-  {
-          sum += ComputeSampleContribution(*(*it), addRays, storeViewCells);
-  }
-
-  return sum;
+        if (!ViewCellsConstructed())
+        {
+                return mViewSpaceBox.IsInside(viewPoint);
+        }
+        else 
+        {
+                if (!mViewSpaceBox.IsInside(viewPoint))
+                        return false;
+
+                ViewCell *viewcell = GetViewCell(viewPoint);
+
+                if (!viewcell || !viewcell->GetValid())
+                        return false;
+        }
+
+        return true;
+}
+
+
+float ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
+                                                                                                   const bool addRays,                                                                  
+                                                                                                   const bool storeViewCells)
+{
+        // view cells not yet constructed
+        if (!ViewCellsConstructed())
+                return 0.0f;
+        
+        float sum = 0.0f;
+
+        VssRayContainer::const_iterator it, it_end = rays.end();
+        
+        for (it = rays.begin(); it != it_end; ++ it) 
+        {
+                sum += ComputeSampleContribution(*(*it), addRays, storeViewCells);
+        }
+
+        return sum;
 }
 
@@ -1345 +1346 @@
                                                                                                 float &avgRenderCost)
 {
-        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-
+        ////////////
         //-- compute expected value
+
         totalRenderCost = 0;
         totalPvs = 0;
+
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
 
         for (it = mViewCells.begin(); it != it_end; ++ it)
@@ -1364 +1367 @@
 
 
+        ///////////
         //-- compute standard defiation
+
         variance = 0;
         deviation = 0;
@@ -1727 +1732 @@
         CollectViewCells();
         
-        
         // stats are computed once more
-        mCurrentViewCellsStats.Reset();
         EvaluateViewCellsStats();
 
@@ -2554 +2557 @@
 
         Debug << mBspTree->GetStatistics() << endl;
-
-        //EvaluateViewCellsStats();
         Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
 
@@ -2630 +2631 @@
     int vcSize = 0;
         int pvsSize = 0;
-
-        
-        ///////////////////////
+        
+
+        //////////////////
         //-- merge leaves of the view cell hierarchy    
         
@@ -2668 +2669 @@
         
         ////////////////////////
-        //-- visualization and statistics
-
-        // export statistics after merge
+        //-- visualization and statistics after merge
+
         if (1)
         {
@@ -2686 +2686 @@
         if (1) // export merged view cells
         {
-                mColorCode = 0; // hack color code
+                mColorCode = 0; // use random colors
                 Exporter *exporter = Exporter::GetExporter("merged_view_cells.wrl");
                 
-
                 cout << "exporting view cells after merge ... ";
 
@@ -3241 +3240 @@
         // create the view cells
         mKdTree->CreateAndCollectViewCells(mViewCells);
-
         // cast rays
         ComputeSampleContributions(rays, true, false);
@@ -3623 +3621 @@
     cout << "finished" << endl;
 
+        /////////////////
         //-- stats after construction
 
@@ -3631 +3630 @@
 
 
+        //////////////////////
+        //-- recast rest of rays
         startTime = GetTime();
 
         cout << "Computing remaining ray contributions ... ";
 
-        // recast rest of rays
         if (SAMPLE_AFTER_SUBDIVISION)
                 ComputeSampleContributions(savedRays, true, false);
@@ -3646 +3646 @@
         cout << "construction finished" << endl;
 
-        
         if (0)
         {
@@ -3696 +3695 @@
         }
 
-        //-- stats and visualizations
-        cout << "finished merging" << endl;
         cout << "merged view cells in "
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
@@ -3704 +3701 @@
                   << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl << endl;
         
+
+        //////////////////
+        //-- stats and visualizations
 
         int savedColorCode = mColorCode;
@@ -3710 +3710 @@
         ResetViewCells();
         Debug << "\nView cells after merge:\n" << mCurrentViewCellsStats << endl;
-
-        //BspLeaf::NewMail();
+        
         if (1) // export merged view cells
         {
@@ -3892 +3891 @@
         if (0) FinalizeViewCells(false);
                 
-        //////////////////
+        //////////
         //-- merge the individual view cells
         MergeViewCells(postProcessRays, objects);
         
-        /////////////////////////////////
-        //-- refines the merged view cells
+        // refines the merged view cells
         if (0) RefineViewCells(postProcessRays, objects);
 
-        //////////////////
+
+        ///////////
         //-- render simulation after merge + refine
 
@@ -3934 +3933 @@
         // compute final meshes and volume / area
         if (1) FinalizeViewCells(true);
-cout << "here09*******************" << endl;
+
         // write view cells to disc
         if (0 && mExportViewCells)
-        {cout << "here77*******************" << endl;
+        {
                 char filename[100];
                 Environment::GetSingleton()->GetStringValue("ViewCells.filename", filename);
@@ -4793 +4792 @@
         }
 
-        // print subdivision statistics
+        ////////////
+        //-- print satistics for subdivision and view cells
+
         Debug << endl << endl << *mHierarchyManager << endl;
-        //mHierarchyManager->PrintHierarchyStatistics(Debug);
+
+        ResetViewCells();
+        Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
 
         if (0)
@@ -4803 +4806 @@
         }       
 
-        // print view cell statistics
-        ResetViewCells();
-        Debug << "\nView cells after construction:\n" << mCurrentViewCellsStats << endl;
-
-
+
+        //////////
+        //-- recast rest of rays
+        
         const long startTime = GetTime();
         cout << "Computing remaining ray contributions ... ";
 
-        // recast rest of rays
         if (SAMPLE_AFTER_SUBDIVISION)
                 ComputeSampleContributions(savedRays, true, false);
@@ -5487 +5488 @@
 
                         // for directional sampling it is important to count only contributions
-                        // made in one direction!!!
-                        // the other contributions of this sample will be counted for the oposite ray!
+                        // made in one direction!
+                        // the other contributions of this sample will be counted for the opposite ray!
 #if SAMPLE_ORIGIN_OBJECTS
                         if (ray.mOriginObject && 
@@ -5590 +5591 @@
                 mViewCellsTree->ResetPvs();
         }
-        else // start from current sampless
-        {
+        else 
+        {
+                // start from current sampless
                 // statistics before casting more samples
                 cout << "compute new statistics ... ";

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

@@ -62 +62 @@
 {
         MailablePvsData *vdata = obj->mViewCellPvs.Find(vc);
-//return false;
+
         if (vdata)
         {
@@ -128 +128 @@
 
         app << "#N_RAYS (number of rays / leaf)\n" << AvgRays() << endl;
-        //app << "#N_PVS: " << pvs << endl;
-
-        //app << "#N_MAXOBJECTREFS  ( Max number of object refs / leaf )\n" << maxObjectRefs << "\n";
+        
 
         app << "========== END OF VspTree statistics ==========\n";
@@ -202 +200 @@
         mTreeValid = v;
 }
+
 
 
@@ -372 +371 @@
 mHierarchyManager(NULL)
 {
+        mLocalSubdivisionCandidates = new vector<SortableEntry>;
+
         bool randomize = false;
         Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
@@ -377 +378 @@
                 Randomize(); // initialise random generator for heuristics
 
+        char subdivisionStatsLog[100];
+        Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
+        mSubdivisionStats.open(subdivisionStatsLog);
+
+        /////////////
         //-- termination criteria for autopartition
+
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxDepth", mTermMaxDepth);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.minPvs", mTermMinPvs);
@@ -386 +393 @@
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxViewCells", mMaxViewCells);
-
-        //-- max cost ratio for early tree termination
+        // max cost ratio for early tree termination
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxCostRatio", mTermMaxCostRatio);
 
@@ -393 +399 @@
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
 
+        Environment::GetSingleton()->GetFloatValue("VspTree.maxStaticMemory", mMaxMemory);
+
+
+        //////////////
         //-- factors for bsp tree split plane heuristics
+
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.ct_div_ci", mCtDivCi);
-
-        //-- partition criteria
         Environment::GetSingleton()->GetFloatValue("VspTree.Construction.epsilon", mEpsilon);
+        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.minBand", mMinBand);
+        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.maxBand", mMaxBand);
+        Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
+
         Environment::GetSingleton()->GetFloatValue("VspTree.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
-
+        
         // if only the driving axis is used for axis aligned split
         Environment::GetSingleton()->GetBoolValue("VspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
-        
-        Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
-        Environment::GetSingleton()->GetFloatValue("VspTree.maxStaticMemory", mMaxMemory);
-
         Environment::GetSingleton()->GetBoolValue("VspTree.useCostHeuristics", mUseCostHeuristics);
         Environment::GetSingleton()->GetBoolValue("VspTree.simulateOctree", mCirculatingAxis);
-        
-        //Environment::GetSingleton()->GetBoolValue("VspTree.useKdPvsForHeuristics", mUseKdPvsForHeuristics);
-
-        char subdivisionStatsLog[100];
-        Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
-        mSubdivisionStats.open(subdivisionStatsLog);
-
-        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.minBand", mMinBand);
-        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.maxBand", mMaxBand);
-        
-
+
+
+        //////////////
         //-- debug output
 
@@ -445 +446 @@
         Debug << "maxband: " << mMaxBand << endl;
 
-        mLocalSubdivisionCandidates = new vector<SortableEntry>;
-
         Debug << endl;
 }
@@ -565 +564 @@
                 );
 
-        if (0 && terminationCriteriaMet)
+        if (1 && terminationCriteriaMet)
         {
                 Debug << "vsp global termination criteria met:" << endl;