Changeset 2066 for GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

Timestamp:

01/31/07 01:51:57 (17 years ago)

Author:

mattausch

Message:

worked on integration manual

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp (modified) (4 diffs)

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

@@ -16 +16 @@
 int KdNode::sMailId = 1;
 int KdNode::sReservedMailboxes = 1;
+
 
 inline static bool ilt(Intersectable *obj1, Intersectable *obj2)
@@ -178 +179 @@
 
 
-
 bool
 KdTree::TerminationCriteriaMet(const KdLeaf *leaf)
 {
-  //  cerr<<"\n OBJECTS="<<leaf->mObjects.size()<<endl;
-  return
-    ((int)leaf->mObjects.size() <= mTermMinCost) ||
-    (leaf->mDepth >= mTermMaxDepth);
-  
+        const bool criteriaMet =
+                ((int)leaf->mObjects.size() <= mTermMinCost) ||
+                 (leaf->mDepth >= mTermMaxDepth);
+ 
+        if (criteriaMet)
+                cerr<<"\n OBJECTS="<<leaf->mObjects.size()<<endl;
+
+        return criteriaMet;
 }
 
@@ -462 +465 @@
 {
         CLEAR_CONTAINER(*splitCandidates);
-  //splitCandidates->clear();
-  
-  int requestedSize = 2*(int)node->mObjects.size();
-  // creates a sorted split candidates array
-  if (splitCandidates->capacity() > 500000 &&
-      requestedSize < (int)(splitCandidates->capacity()/10) ) {
-    delete splitCandidates;
-    splitCandidates = new vector<SortableEntry *>;
+        //splitCandidates->clear();
+
+    int requestedSize = 2*(int)node->mObjects.size();
+        
+        // creates a sorted split candidates array
+        if (splitCandidates->capacity() > 500000 &&
+                requestedSize < (int)(splitCandidates->capacity()/10) ) {               
+                        delete splitCandidates;
+                        splitCandidates = new vector<SortableEntry *>;
   }
   
@@ -477 +481 @@
   for(ObjectContainer::const_iterator mi = node->mObjects.begin();
       mi != node->mObjects.end();
-      mi++) {
-    AxisAlignedBox3 box = (*mi)->GetBox();
-
-    splitCandidates->push_back(new SortableEntry(SortableEntry::BOX_MIN,
-                                                                                         box.Min(axis),
-                                                                                         *mi)
-                                                           );
+      mi++) 
+  {
+          AxisAlignedBox3 box = (*mi)->GetBox();
+
+          splitCandidates->push_back(new SortableEntry(SortableEntry::BOX_MIN,
+                                                                 box.Min(axis),
+                                                                 *mi)
+                                                                 );
     
-    
-    splitCandidates->push_back(new SortableEntry(SortableEntry::BOX_MAX,
-                                                                                         box.Max(axis),
-                                                                                         *mi)
-                                                           );
-  }
-  
-  stable_sort(splitCandidates->begin(), splitCandidates->end());
+      splitCandidates->push_back(new SortableEntry(SortableEntry::BOX_MAX,
+                                                                 box.Max(axis),
+                                                                 *mi)
+                                                                 );
+  }
+  
+  stable_sort(splitCandidates->begin(), splitCandidates->end(), iltS);
 }