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

Timestamp:

11/06/06 18:48:22 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -3384 +3384 @@
                 
         // evaluate merge cost for priority traversal
-        const float mergeCost = 1.0f / (float)root->mTimeStamp;
+        const float mergeCost =  -(float)root->mTimeStamp;
         vcRoot->SetMergeCost(mergeCost);
 
@@ -3428 +3428 @@
                 
         // evaluate merge cost for priority traversal
-        float mergeCost = 1.0f / (float)root->mTimeStamp;
+        const float mergeCost = -(float)root->mTimeStamp;
         viewCellInterior->SetMergeCost(mergeCost);
 
@@ -5048 +5048 @@
                 
         // evaluate merge cost for priority traversal
-        float mergeCost = 1.0f / (float)root->mTimeStamp;
+        const float mergeCost = -(float)root->mTimeStamp;
         viewCellInterior->SetMergeCost(mergeCost);
 
@@ -5747 +5747 @@
         int numSamples;
         int castSamples = 0;
+        int splitsStepSize;
+
         char str[64]; 
-
+        
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass);
         Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samples", numSamples);
+        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.stepSize", splitsStepSize);
 
         char statsPrefix[100];
@@ -5782 +5785 @@
     cout << "Evaluating view cell partition ... " << endl;
 
-        VssRayContainer evaluationSamples;
-
         while (castSamples < numSamples)
         {               
+                VssRayContainer evaluationSamples;
+
                 ///////////////
                 //-- we have to use uniform sampling strategy for construction rays
@@ -5822 +5825 @@
                 //-- output stats
 
-                const int splitsStepSize = 500;
-                const float memStepSize = 1.0f;
-
-                sprintf(str, "-splits-%09d-eval.log", castSamples);
+                sprintf(str, "-%09d-eval.log", castSamples);
                 const string splitsFilename = string(statsPrefix) + string(str);
-                
-                sprintf(str, "-mem-%09d-eval.log", castSamples);
-                const string memFilename = string(statsPrefix) + string(str);
 
                 ofstream splitsStr(splitsFilename.c_str());
-                ofstream memStr(memFilename.c_str());
-                
-                mHierarchyManager->EvaluateSubdivision2(splitsStr, memStr, splitsStepSize, memStepSize);
+                mHierarchyManager->EvaluateSubdivision2(splitsStr, splitsStepSize);
 
                 timeDiff = TimeDiff(startTime, GetTime());
                 cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-                Debug << "statistis compted in " << timeDiff * 1e-3 << " secs" << endl;
+                Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
         
                 disposeRays(evaluationSamples, NULL);