Changeset 1408 for GTP

Timestamp:

09/18/06 03:15:56 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (3 diffs)
• BvHierarchy.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -512 +512 @@
         // matt: TODO
         return ( 0
-                || ((int)data.mNode->mObjects.size() < mTermMinObjects)
+                || ((int)data.mNode->mObjects.size() <= mTermMinObjects)
                 || (data.mProbability <= mTermMinProbability)
                 || (data.mDepth >= mTermMaxDepth)
@@ -570 +570 @@
         {
              ++ mBvhStats.minObjectsNodes;
+        }
+
+        if (leaf->mObjects.empty())
+        {
+                ++ mBvhStats.emptyNodes;
         }
 
@@ -1808 +1813 @@
 
         app << "#N_MINOBJECTREFS  ( Min number of object refs / leaf )\n" << minObjectRefs << "\n";
+
+        app << "#N_EMPTYLEAFS ( Empty leafs )\n" << emptyNodes << "\n";
         
         app << "#N_PAVGOBJECTSLEAVES  ( average object refs / leaf)\n" << AvgObjectRefs() << endl;

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

@@ -80 +80 @@
                 minObjectRefs = 999999999;
                 objectRefs = 0;
+                emptyNodes = 0;
 
                 ///////////////////
@@ -118 +119 @@
         /// object references
         int objectRefs;
-
+        // leaves with no objects
+        int emptyNodes;
 
         //////////////////////////

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

@@ -176 +176 @@
         }
 
-        //-- build kd tree from scene geometry
-        preprocessor->BuildKdTree();
-        preprocessor->KdTreeStatistics(cout);
+        bool loadKdTree, exportKdTree;
+
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.loadKdTree", loadKdTree);
+
+        if (!loadKdTree)
+        {
+                //-- build kd tree from scene geometry
+                preprocessor->BuildKdTree();
+                preprocessor->KdTreeStatistics(cout);
+        }
+        else
+        {
+                cout << "loading kd tree ... ";
+                const long startTime = GetTime();
+                preprocessor->mKdTree->LoadBinTree("kd.bin.gz", preprocessor->mObjects);
+                        
+                cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        }
+
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.exportKdTree", exportKdTree);
+
+        if (exportKdTree)
+        {
+                cout << "exporting kd tree ... ";
+                preprocessor->mKdTree->ExportBinTree("kd.bin.gz");
+                cout << "finished" << endl;
+        }
+
 
         // parse view cells related options