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

Timestamp:

11/09/06 03:35:58 (18 years ago)

Author:

mattausch

Message:

implemented several accelleration svhemes for the gradient method

File:

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

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

@@ -149 +149 @@
                 "Hierarchy.Termination.maxMemory", mTermMaxMemory);
 
+        Environment::GetSingleton()->GetIntValue(
+                "Hierarchy.Construction.maxRepairs", mMaxRepairs);
+
         if (1 && mConsiderMemory2)
         {
@@ -177 +180 @@
         Debug << "min steps of same kind: " << mMinStepsOfSameType << endl;
         Debug << "max steps of same kind: " << mMaxStepsOfSameType << endl;
+        Debug << "max repairs: " << mMaxRepairs << endl;
 
         switch (mConstructionType)
@@ -418 +422 @@
         const int maxSteps = mMaxStepsOfSameType;
 
-        SubdivisionCandidate *osc = PrepareObjectSpaceSubdivision(sampleRays, objects);
+        SubdivisionCandidate *osc = 
+                PrepareObjectSpaceSubdivision(sampleRays, objects);
         objectSpaceQueue.Push(osc);
-
 
         /////////////////////////
@@ -430 +434 @@
         // for first round, use sah splits. Once view space partition
         // has started, use render cost heuristics instead
-        ospSteps = RunConstruction(objectSpaceQueue, dirtyList, NULL, minSteps, maxSteps);
+        ospSteps = RunConstruction(objectSpaceQueue, 
+                                                           dirtyList, 
+                                                           NULL, 
+                                                           minSteps, 
+                                                           maxSteps);
+
         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
 
@@ -474 +483 @@
         {
                 // decide upon next split type
+                if (viewSpaceQueue.Top()->IsDirty())
+                        viewSpaceQueue.Top()->EvalCandidate();
+
+                if (objectSpaceQueue.Top()->IsDirty())
+                        objectSpaceQueue.Top()->EvalCandidate();
+
                 const float vspPriority = viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
                 const float ospPriority = objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
@@ -489 +504 @@
                         SubdivisionCandidateContainer dirtyVspList;
 
-                        // subdivide object space first
-                        // for first round, use sah splits. Once view space partition
+                        // subdivide object space first for first round, 
+                        // use sah splits. Once view space partition
                         // has started, use render cost heuristics instead
-                        const int ospSteps = 
-                                RunConstruction(objectSpaceQueue, dirtyVspList, viewSpaceQueue.Top(), minSteps, maxSteps);
+                        const int ospSteps = RunConstruction(objectSpaceQueue, 
+                                                                                                 dirtyVspList, 
+                                                                                                 viewSpaceQueue.Top(), 
+                                                                                                 minSteps, 
+                                                                                                 maxSteps);
 
                         cout << "\n" << ospSteps << " object space partition steps taken" << endl;
@@ -501 +519 @@
                         cout << "repairing queue ... " << endl;
                         RepairQueue(dirtyVspList, viewSpaceQueue, true);
+            
                         cout << "\nrepaired " << (int)dirtyVspList.size() << " candidates" << endl;
                 }
@@ -515 +534 @@
 
                         // process view space candidates
-                        const int vspSteps = 
-                                RunConstruction(viewSpaceQueue, dirtyOspList, objectSpaceQueue.Top(), minSteps, maxSteps);
+                        const int vspSteps = RunConstruction(viewSpaceQueue, 
+                                                                                                 dirtyOspList, 
+                                                                                                 objectSpaceQueue.Top(), 
+                                                                                                 minSteps, 
+                                                                                                 maxSteps);
 
                         cout << "\n" << vspSteps << " view space partition steps taken" << endl;
@@ -527 +549 @@
                         cout << "repairing queue ... " << endl;
                         RepairQueue(dirtyOspList, objectSpaceQueue, true);
+
                         cout << "repaired " << (int)dirtyOspList.size() << " candidates" << endl;
                 }
@@ -965 +988 @@
         while (!splitQueue.Empty())
         {
+                // reevaluate current candidate
+                if (splitQueue.Top()->IsDirty())
+                        splitQueue.Top()->EvalCandidate();
+                
                 const float priority = splitQueue.Top()->GetPriority();
                 const float threshold = oldCandidate ? oldCandidate->GetPriority() : 1e20f;
@@ -975 +1002 @@
                 }
                 
-                SubdivisionCandidate *sc = NextSubdivisionCandidate(splitQueue); 
-                                
                 ////////
                 //-- subdivide leaf node of either type
 
+                SubdivisionCandidate *sc = NextSubdivisionCandidate(splitQueue); 
+                        
                 const bool repairQueue = false;
                 const bool success = ApplySubdivisionCandidate(sc, splitQueue, repairQueue);
@@ -1323 +1350 @@
         const long startTime = GetTime();
         if (0) cout << "repairing " << (int)dirtyList.size() << " candidates ... ";
-        
+
+        const float prop = (float)mMaxRepairs / (float)dirtyList.size();
 
         ///////////////////////////
@@ -1332 +1360 @@
         for (sit = dirtyList.begin(); sit != sit_end; ++ sit)
         {
+                // only repair a certain number of candidates
+                if ((mMaxRepairs < (int)dirtyList.size()) && (Random(1.0f) >= prop))
+                        continue;
+
                 SubdivisionCandidate* sc = *sit;
                 const float rcd = sc->GetRenderCostDecrease();