Changeset 1297 for GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.cpp

Timestamp:

08/30/06 04:39:53 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.cpp (modified) (5 diffs)

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

@@ -543 +543 @@
         float sum = pvsBack*(position - minBox) + pvsFront*(maxBox - position);
         float newCost = ct_div_ci + sum/sizeBox;
-        float oldCost = pvsSize;
+        float oldCost = (float)pvsSize;
         ratio = newCost/oldCost;
+
   } else {
         // importance based cost
@@ -559 +560 @@
 #else
 #if 1
-        float newCost = raysBack*pvsBack  + raysFront*pvsFront;
+        float newCost = float(raysBack*pvsBack  + raysFront*pvsFront);
         float oldCost = (float)leaf->rays.size()*pvsSize;
         ratio = newCost/oldCost;
@@ -807 +808 @@
   float maxBand = minBox + 0.9*(maxBox - minBox);
         
-  float minRatio = 1e20;
+  float minRatio = 1e20f;
         
   Intersectable::NewMail();
@@ -1663 +1664 @@
           VssTreeLeaf *leaf = (VssTreeLeaf *)node;
           float c = leaf->GetImportance();
-          int num = (c*ratioPerLeaf + 0.5);
+          int num = (c*ratioPerLeaf + 0.5f);
           //                    cout<<num<<" ";
 
@@ -1720 +1721 @@
 {
   int nrays = (int)leaf->rays.size();
-  for (int i=0; i < numberOfRays; i++) {
+  for (int i = 0; i < numberOfRays; ++ i) {
         // pickup 3 random rays
-        int r1 = (int)RandomValue(0, nrays-1);
-        int r2 = (int)RandomValue(0, nrays-1);
-        int r3 = (int)RandomValue(0, nrays-1);
+        int r1 = (int)RandomValue(0, (float)(nrays-1));
+        int r2 = (int)RandomValue(0, (float)(nrays-1));
+        int r3 = (int)RandomValue(0, (float)(nrays-1));
                 
         Vector3 o1 = leaf->rays[r1].Extrap(RandomValue(leaf->rays[r1].GetMinT(),