Changeset 1710 for GTP/trunk/Lib

Timestamp:

11/02/06 19:27:48 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (3 diffs)
• HierarchyManager.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)

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

@@ -1827 +1827 @@
         }
 
-        return (viewCells.size() + bvhNodes.size() < mHierarchyStats.Leaves());
+        return ((int)(viewCells.size() + bvhNodes.size()) < mHierarchyStats.Leaves());
 }
 
@@ -1997 +1997 @@
         while (1)
         {
-                if (!ExtractStatistics(i, 99999999, renderCost, memory, pvsEntries))
+                if (!ExtractStatistics(splits, 99999.0, renderCost, memory, pvsEntries))
                         break;
 
                 UpdateStats(splitsStats, splits, renderCost, pvsEntries, memory, 0);
 
-                splits += splitsStepSize
+                splits += splitsStepSize;
         }
 
@@ -2012 +2012 @@
                 UpdateStats(splitsStats, splits, renderCost, pvsEntries, memory, 0);
 
-                mem += memStepSize
-        }
-
-}
-
-}
+                mem += memStepSize;
+        }
+
+}
+
+}

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

@@ -240 +240 @@
                                                          const string &filename);
 
-        void EvaluateSubdivision2(ofstream &stats);
+        void EvaluateSubdivision2(ofstream &splitsStats,
+                                                          ofstream &memStats,
+                                                          const int splitsStepSize,
+                                                          const float memStepSize);
 
 

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

@@ -5822 +5822 @@
                 //-- output stats
 
-                sprintf(str, "-%09d-eval.log", castSamples);
-                string filename = string(statsPrefix) + string(str);
-                ofstream ofstr(filename.c_str());
-                mHierarchyManager->EvaluateSubdivision2(ofstr);
+                const int splitsStepSize = 500;
+                const float memStepSize = 1.0f;
+
+                sprintf(str, "-splits-%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);
 
                 timeDiff = TimeDiff(startTime, GetTime());