Changeset 1736 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

11/09/06 19:05:09 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (7 diffs)

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

@@ -151 +151 @@
         Environment::GetSingleton()->GetIntValue(
                 "Hierarchy.Construction.maxRepairs", mMaxRepairs);
+
         // compare to bytes
         mTermMaxMemory *= (1024.0f * 1024.0f);
@@ -504 +505 @@
                         /// Repair split queue, i.e., affected view space candidates
                         cout << "repairing queue ... " << endl;
-                        RepairQueue(dirtyVspList, viewSpaceQueue, true);
+                        const int repaired = RepairQueue(dirtyVspList, viewSpaceQueue, true);
             
-                        cout << "\nrepaired " << (int)dirtyVspList.size() << " candidates" << endl;
+                        cout << "\nrepaired " << repaired << " candidates from " << (int)dirtyVspList.size() << " dirtied candidates" << endl;
                 }
                 else
@@ -534 +535 @@
                         /// Repair split queue
                         cout << "repairing queue ... " << endl;
-                        RepairQueue(dirtyOspList, objectSpaceQueue, true);
-
-                        cout << "repaired " << (int)dirtyOspList.size() << " candidates" << endl;
+                        const int repaired = RepairQueue(dirtyOspList, objectSpaceQueue, true);
+
+                        cout << "\nrepaired " << repaired << " candidates from " << (int)dirtyOspList.size() << " dirtied candidates" << endl;
                 }
         }
@@ -1310 +1311 @@
 
 
-void HierarchyManager::RepairQueue(const SubdivisionCandidateContainer &dirtyList, 
-                                                                   SplitQueue &splitQueue,
-                                                                   const bool recomputeSplitPlaneOnRepair)
+int HierarchyManager::RepairQueue(const SubdivisionCandidateContainer &dirtyList,
+                                                                  SplitQueue &splitQueue,
+                                                                  const bool recomputeSplitPlaneOnRepair)
 {
         // for each update of the view space partition:
@@ -1330 +1331 @@
         // split candidate
 
+        int repaired = 0;
+
         // collect list of "dirty" candidates
         const long startTime = GetTime();
@@ -1356 +1359 @@
                  // reinsert
                 splitQueue.Push(sc);
-
+                
+                ++ repaired;
                 cout << ".";
 
@@ -1371 +1375 @@
         mHierarchyStats.mRepairTime += timeDiff;
 
-        if (0) cout << "repaired in " << timeDiff * 1e-3f << " secs" << endl;
+        return repaired;
 }