Changeset 1695 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

10/29/06 15:20:18 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (13 diffs)

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

@@ -38 +38 @@
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
-const static bool CLAMP_TO_BOX = false;
+const static bool CLAMP_TO_BOX = true;
 
 template <typename T> class myless
@@ -72 +72 @@
 
         mViewCellsTree->SetViewCellsManager(this);
-        //mViewCellsTree = new ViewCellsTree(this);
 }
 
@@ -112 +111 @@
         
         // sampling type for view cells construction samples
-        if (strcmp(buf, "box") == 0)
+        if (strcmp(buf, "object") == 0)
+        {
+                mSamplingType = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
+        }
+        else if (strcmp(buf, "box") == 0)
         {
                 mSamplingType = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
@@ -123 +126 @@
         {
                 mSamplingType = SamplingStrategy::OBJECT_DIRECTION_BASED_DISTRIBUTION;
+        }
+        else if (strcmp(buf, "reverse_object") == 0)
+        {
+                mSamplingType = SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION;
         }
         /*else if (strcmp(buf, "interior") == 0)
@@ -137 +144 @@
         Environment::GetSingleton()->GetStringValue("ViewCells.Evaluation.samplingType", buf);
         
-        if (strcmp(buf, "box") == 0)
+        if (strcmp(buf, "object") == 0)
+        {
+                mEvaluationSamplingType = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
+        }
+        else if (strcmp(buf, "box") == 0)
         {
                 mEvaluationSamplingType = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
@@ -148 +159 @@
         {
                 mEvaluationSamplingType = SamplingStrategy::OBJECT_DIRECTION_BASED_DISTRIBUTION;
+        }
+        else if (strcmp(buf, "reverse_object") == 0)
+        {
+                mEvaluationSamplingType = SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION;
         }
         /*else if (strcmp(buf, "interior") == 0)
@@ -155 +170 @@
         else
         {
+                mEvaluationSamplingType = -1;
                 Debug << "error! wrong sampling type" << endl;
                 exit(0);
@@ -868 +884 @@
         int castSamples = 0;
         char str[64]; 
+        int oldSamples = 0;
+
+        int samplesForStats;
 
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass);
+        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesForStats", samplesForStats);
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samples", numSamples);
 
@@ -924 +944 @@
 
                 Real timeDiff = TimeDiff(startTime, GetTime());
-                Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-                cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-
+                
+                cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
                 cout << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
+                
+                Debug << "finished in " << timeDiff * 1e-3f << " secs" << endl;
                 Debug << "computing sample contributions of " << (int)evaluationSamples.size()  << " samples ... ";
 
@@ -938 +959 @@
                 Debug << "finished in " << timeDiff * 1e-3 << " secs" << endl;
 
-                startTime = GetTime();
-                cout << "compute new statistics ... " << endl;
-
-                ///////////
-                //-- output stats
-
-                sprintf(str, "-%09d-eval.log", castSamples);
-                string fileName = string(statsPrefix) + string(str);
-
-                ///////////////
-                //-- propagate pvs or pvs size information
-
-                ObjectPvs pvs;
-                UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
-
-                ExportStats(fileName);
-
-                timeDiff = TimeDiff(startTime, GetTime());
-                cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-                Debug << "statistis compted in " << timeDiff * 1e-3 << " secs" << endl;
-        
+                if ((castSamples >= samplesForStats + oldSamples) || (castSamples >= numSamples))
+                {
+                        oldSamples += samplesForStats;
+
+                        ///////////
+                        //-- output stats
+
+                        sprintf(str, "-%09d-eval.log", castSamples);
+                        string fileName = string(statsPrefix) + string(str);
+
+                        ///////////////
+                        //-- propagate pvs or pvs size information
+
+                        startTime = GetTime();
+                        ObjectPvs pvs;
+
+                        cout << "updating pvs for contribution ... " << endl;
+
+                        UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
+
+                        timeDiff = TimeDiff(startTime, GetTime());
+                        cout << "finished updating the pvs in " << timeDiff * 1e-3 << " secs" << endl;
+                        Debug << "pvs evaluated in " << timeDiff * 1e-3 << " secs" << endl;
+                
+                        startTime = GetTime();
+                        cout << "compute new statistics ... " << endl;
+
+                        ExportStats(fileName);
+
+                        timeDiff = TimeDiff(startTime, GetTime());
+                        cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                        Debug << "statistis computed in " << timeDiff * 1e-3 << " secs" << endl;
+                }
+
                 disposeRays(evaluationSamples, NULL);
         }
@@ -966 +1000 @@
         //-- histogram
 
+        const int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
         bool useHisto;
         int histoStepSize;
@@ -971 +1006 @@
         Environment::GetSingleton()->GetBoolValue("ViewCells.Evaluation.histogram", useHisto);
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.histoStepSize", histoStepSize);
-
-        const int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
-
 
         if (useHisto)
@@ -2529 +2561 @@
         // reset recursive pvs
         pvs.Clear();
+
+        // pvss of child nodes
         vector<ObjectPvs> pvsList;
 
         ViewCellContainer::const_iterator vit, vit_end = interior->mChildren.end();
-
-        for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit)
-        {
-                ObjectPvs objPvs;
+        pvsList.resize((int)interior->mChildren.size());
+        int i = 0;
+        for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit, ++ i)
+        {
+                //ObjectPvs objPvs;
                 
                 //////////////////
                 //-- recursivly compute child pvss
 
-                UpdatePvsForEvaluation(*vit, objPvs);
+                UpdatePvsForEvaluation(*vit, pvsList[i]/*objPvs*/);
 
                 // store pvs in vector
-                pvsList.push_back(objPvs);
+                //pvsList.push_back(objPvs);
         }