Changeset 1900 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

Timestamp:

12/15/06 23:40:27 (18 years ago)

Author:

bittner

Message:

experiments with different contribution computations

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp (modified) (3 diffs)

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

@@ -495 +495 @@
   float r;
   sHalton.GetNext(1, &r);
-
+  int i;
   // pickup a distribution
-  for (int i=0; i < mDistributions.size()-1; i++)
+  for (i=0; i < mDistributions.size()-1; i++)
         if (r < mDistributions[i]->mRatio)
           break;
@@ -528 +528 @@
         mDistributions[i]->mContribution += contribution;
         mDistributions[i]->mRays ++;
-
+        
         mDistributions[i]->mTotalContribution += contribution;
         mDistributions[i]->mTotalRays ++;
@@ -553 +553 @@
         float importance = 0.0f;
         if (mDistributions[i]->mRays != 0) {
-          importance = pow(mDistributions[i]->mContribution/mDistributions[i]->mRays, 3);
-        }
-        if (importance < Limits::Small)
-          importance = Limits::Small;
+          //      importance = pow(mDistributions[i]->mContribution/mDistributions[i]->mRays, 3);
+          importance = mDistributions[i]->mContribution/mDistributions[i]->mRays;
+        }
         mDistributions[i]->mRatio = importance;
         sum += importance;
   }
 
-  const float minratio = 0.05f;
+  const float minratio = 0.02f;
   float threshold = minratio*sum;
   for (i=0; i < mDistributions.size(); i++) {