Changeset 1653 for GTP/trunk/Lib/Vis

Timestamp:

10/19/06 16:45:37 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

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

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

@@ -2529 +2529 @@
         RegisterOption("Hierarchy.Termination.maxMemory",
                                         optFloat,
-                                        "hierarchy_construction_max_memory=",
+                                        "hierarchy_term_max_memory=",
                                         "1");
 

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

@@ -122 +122 @@
                 "Hierarchy.Termination.maxMemory", mTermMaxMemory);
 
+        mTermMaxMemory *= (1024.0f * 1024.0f);
+
         Debug << "******** Hierachy Manager Options ***********" << endl;
         Debug << "max leaves: " << mTermMaxLeaves << endl;
@@ -283 +285 @@
                 );
 
-//#if _DEBUG
+#if _DEBUG
         if (terminationCriteriaMet)
         {
@@ -291 +293 @@
                 Debug << "memory: " << mHierarchyStats.mMemory << " " << mTermMaxMemory << endl;
         }
-//#endif
+#endif
 
         return terminationCriteriaMet;

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

@@ -1501 +1501 @@
                                                                 const int totalPvs,
                                                                 const int entriesInPvs,
+                                                                const float memoryCost,
                                                                 const int pvsSizeDecr,
                                                                 const float volume)
 {
          stats << "#Pass\n" << pass << endl
-                << "#ViewCells\n" << viewCells << endl 
-        << "#RenderCostDecrease\n" << renderCostDecrease << endl // TODO
-                << "#TotalRenderCost\n" << totalRenderCost << endl
-                << "#CurrentPvs\n" << currentPvs << endl
-                << "#ExpectedCost\n" << expectedCost << endl
-                << "#AvgRenderCost\n" << avgRenderCost << endl
-                << "#Deviation\n" << deviation << endl
-                << "#TotalPvs\n" << totalPvs << endl
-                << "#TotalEntriesInPvs\n" << entriesInPvs << endl
-                << "#PvsSizeDecrease\n" << pvsSizeDecr << endl // TODO
-                << "#Volume\n" << volume << endl
-                << endl;
+                   << "#ViewCells\n" << viewCells << endl 
+                   << "#RenderCostDecrease\n" << renderCostDecrease << endl // TODO
+                   << "#TotalRenderCost\n" << totalRenderCost << endl
+                   << "#CurrentPvs\n" << currentPvs << endl
+                   << "#ExpectedCost\n" << expectedCost << endl
+                   << "#AvgRenderCost\n" << avgRenderCost << endl
+                   << "#Deviation\n" << deviation << endl
+                   << "#TotalPvs\n" << totalPvs << endl
+                   << "#TotalEntriesInPvs\n" << entriesInPvs << endl
+                   << "#Memory\n" << memoryCost << endl
+                   << "#PvsSizeDecrease\n" << pvsSizeDecr << endl
+                   << "#Volume\n" << volume << endl
+                   << endl;
 }
 
@@ -1546 +1548 @@
         stats.open(mergeStats.c_str());
 
+        const float entrySize = sizeof(PvsData) + sizeof(Intersectable *);
+        const float memoryCost = (float)entriesInPvs *  entrySize / (1024.0f * 1024.0f);
+
         /////////////
         //-- first view cell
 
         UpdateStats(stats,
-                                0, numViewCells, 0, totalRenderCost, 
-                                rootPvs, expectedCost, avgRenderCost, deviation,
-                                totalPvs, entriesInPvs, 0, mRoot->GetVolume());
+                                0, 
+                                numViewCells, 
+                                0, 
+                                totalRenderCost, 
+                                rootPvs, 
+                                expectedCost, 
+                                avgRenderCost, 
+                                deviation,
+                                totalPvs, 
+                                entriesInPvs,
+                                memoryCost,
+                                0, 
+                                mRoot->GetVolume());
                 
 
@@ -1606 +1621 @@
                         avgRenderCost = (float)totalPvs / (float)numViewCells;
 
+                        const float entrySize = sizeof(PvsData) + sizeof(Intersectable *);
+                        const float memoryCost = (float)entriesInPvs * entrySize / (1024.0f * 1024.0f);
+
                         UpdateStats(stats,
-                                                0, numViewCells, costDecr, totalRenderCost,
-                                                parentPvs, expectedCost, avgRenderCost, deviation,
-                        totalPvs, entriesInPvs, childPvs - parentPvs,
+                                                0, 
+                                                numViewCells, 
+                                                costDecr, 
+                                                totalRenderCost,
+                                                parentPvs, 
+                                                expectedCost, 
+                                                avgRenderCost, 
+                                                deviation,
+                        totalPvs, 
+                                                entriesInPvs, 
+                                                memoryCost,
+                                                childPvs - parentPvs,
                                                 vc->GetVolume());
-
                 }
         }

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

@@ -629 +629 @@
         /** Update stats for the log.
         */
-        void UpdateStats(
-                ofstream &stats,
-                const int pass,
-                const int viewCells,
-                const float renderCostDecrease,
-                const float totalRenderCost,
-                const int currentPvs,
-                const float expectedCost,
-                const float avgRenderCost,
-                const float deviation,
-                const int totalPvs,
-                const int entriesInPvs,
-                const int pvsSizeDecr,
-                const float volume);
+        void UpdateStats(ofstream &stats,
+                                         const int pass,
+                                         const int viewCells,
+                                         const float renderCostDecrease,
+                                         const float totalRenderCost,
+                                         const int currentPvs,
+                                         const float expectedCost,
+                                         const float avgRenderCost,
+                                         const float deviation,
+                                         const int totalPvs,
+                                         const int entriesInPvs,
+                                         const float memoryCost,
+                                         const int pvsSizeDecr,
+                                         const float volume);