Changeset 2130 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp

Timestamp:

02/20/07 13:05:26 (17 years ago)

Author:

mattausch

Message:

runs also under debug mode now

File:

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

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

@@ -403 +403 @@
   cout<<"Dirr Bbox = "<<dirBBox<<endl;
   
-  stat.rays = rays.size();
+  stat.rays = (int)rays.size();
   stat.initialPvsSize = 0;
   for (int i=0; i < mRoots.size(); i++) {
@@ -862 +862 @@
         info.axis = axis;
         info.costRatio = 0.5f; // not true but good for speeding up the subdivision at the top levels!
-        info.raysBack = info.raysFront = leaf->rays.size()/2;
+        info.raysBack = info.raysFront = (int)leaf->rays.size()/2;
         return;
   }
@@ -953 +953 @@
 
   currInfo.raysBack = 0;
-  currInfo.raysFront = leaf->rays.size();
+  currInfo.raysFront = (int)leaf->rays.size();
   
   currInfo.pvsBack = 0;
@@ -1135 +1135 @@
   splitCandidates->clear();
   
-  int requestedSize = 2*(node->rays.size());
+  int requestedSize = 2*((int)node->rays.size());
   // creates a sorted split candidates array
   if (splitCandidates->capacity() > 500000 &&
@@ -1195 +1195 @@
   }
 
-  if ( (int)(leaf->rays.size()) > stat.maxRayRefs)
-    stat.maxRayRefs = leaf->rays.size();
+  if ((int)leaf->rays.size() > stat.maxRayRefs)
+    stat.maxRayRefs = (int)leaf->rays.size();
 
 }
@@ -1321 +1321 @@
   // update stats
   stat.rayRefs -= (int)leaf->rays.size();
-  stat.rayRefs += back->rays.size() + front->rays.size();
+  stat.rayRefs += (int)(back->rays.size() + front->rays.size());
 
   
@@ -1461 +1461 @@
   Debug<<"done."<<endl<<flush;
 
-  stat.rayRefs += add.size() - remove.size();
+  stat.rayRefs += (int)add.size() - (int)remove.size();
 
   Debug<<"Updating statistics..."<<endl<<flush;
@@ -1817 +1817 @@
         }
   }
-  return pvs.size();
+  return (int)pvs.size();
 }
 
@@ -2021 +2021 @@
                                           )
 {
-  int nrays = leaf->rays.size();
+  int nrays = (int)leaf->rays.size();
 
   if (nrays == 2) {
@@ -2040 +2040 @@
 
   if (r1 == r2)
-        r2 = (r1+1)%leaf->rays.size();
+        r2 = (r1+1)%(int)leaf->rays.size();
 
 #else
@@ -2158 +2158 @@
   int indices[3];
 
-  int size = rays.size();
+  int size = (int)rays.size();
   // use russian roulete selection for the tripple
   // number of free positions for the bullet
@@ -2230 +2230 @@
         for (; ri != rays.end(); ++ri, ++rayIndex) {
           RssTreeNode::RayInfo *ray = *ri;
-          int tries = rays.size();
+          int tries = (int)rays.size();
           for (int i = 0; i < tries; i++) {
                 int r1, r2, r3;
@@ -2648 +2648 @@
   }
   
-  return rays.size();
+  return (int)rays.size();
   
 }