Changeset 2670 for GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.h

Timestamp:

04/30/08 13:24:45 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.h (modified) (5 diffs)

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

@@ -69 +69 @@
   int Leaves() const { return (nodes / 2) + 1; }
 
-  void Reset() {
-    nodes = 0;
-    for (int i=0; i<7; i++)
-      splits[i] = 0;
-    rays = queryDomains = 0;
-    rayRefs = rayRefsNonZeroQuery = objectRefs = 0;
-    zeroQueryNodes = 0;
-    maxDepthNodes = 0;
-    minCostNodes = 0;
-    maxObjectRefs = 0;
-    addedRayRefs = removedRayRefs = 0;
+  void Reset() 
+  {
+          nodes = 0;
+          for (int i=0; i<7; i++)
+                  splits[i] = 0;
+          rays = queryDomains = 0;
+          rayRefs = rayRefsNonZeroQuery = objectRefs = 0;
+          zeroQueryNodes = 0;
+          maxDepthNodes = 0;
+          minCostNodes = 0;
+          maxObjectRefs = 0;
+          addedRayRefs = removedRayRefs = 0;
   }
 
@@ -94 +95 @@
   
 class KdInterior;
-/** Abstract class for kd-tree node */
-class KdNode {
+
+/** Abstract class for kd-tree node 
+*/
+class KdNode 
+{
 
 public:  
@@ -112 +116 @@
   bool Mailed() const { return mMailbox == sMailId; }
  
-  static void NewMail(const int reserve = 1) {
-    sMailId += sReservedMailboxes;
-    sReservedMailboxes = reserve;
-  }
+  static void NewMail(const int reserve = 1) 
+  {
+          sMailId += sReservedMailboxes;
+          sReservedMailboxes = reserve;
+  }
+
   void Mail(const int mailbox) { mMailbox = sMailId + mailbox; }
   bool Mailed(const int mailbox) const { return mMailbox == sMailId + mailbox; }
 
 
-  static void NewMail2(const int reserve = 1) {
-    sMailId2 += sReservedMailboxes;
-    sReservedMailboxes2 = reserve;
+  ////////////
+  //-- hack!!: second mail for a machine with 2 cores
+
+  static void NewMail2(const int reserve = 1) 
+  {
+          sMailId2 += sReservedMailboxes;
+          sReservedMailboxes2 = reserve;
   }
 
@@ -130 +140 @@
   void Mail2(const int mailbox) { mMailbox2 = sMailId2 + mailbox; }
   bool Mailed2(const int mailbox) const { return mMailbox2 == sMailId2 + mailbox; }
+
+  /////////////////////////////////////
 
 
@@ -154 +166 @@
 };
 
-/** Implementation of the kd-tree interior node */
+
+/** Implementation of the kd-tree interior node. 
+*/
 class KdInterior : public KdNode {